fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,599 Commits 1 Branch 0 Tags
d4c355fcb55dc5b1a0365e7c7c1467ba5b57b7c4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Fan-Wu Yang d4c355fcb5 Merge branch 'master' into upgradeStartBoat 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
 2017-09-28 16:41:17 +13:00
Fan-Wu Yang 3c58c3fc09 Assest are loaded in loading place 2017-09-28 16:38:12 +13:00
Fan-Wu Yang 08e6f726cc Added 8 seagulls to the game 2017-09-28 16:36:06 +13:00
Fan-Wu Yang 767a65f649 Boat now used updated textures 2017-09-28 16:32:44 +13:00
Fan-Wu Yang 68dfa2d27a Fixed case sensitivity problems #story[1301] 2017-09-28 15:30:32 +13:00
Fan-Wu Yang 3956affa01 removed timescale, and merged master 2017-09-28 14:26:33 +13:00
Fan-Wu Yang fbb9d0910b Merge branch 'master' into new_3d_assets 2017-09-28 14:26:08 +13:00
Fan-Wu Yang 6003bdf771 Fixed issue where finishing boats order could be be changed 2017-09-28 14:23:09 +13:00
Fan-Wu Yang 4ddc369dbc Changed Collisions, and merged master 2017-09-28 13:49:27 +13:00
Fan-Wu Yang 6ec75e6ed7 Merge branch 'master' into new_3d_assets 2017-09-28 13:42:58 +13:00
Fan-Wu Yang 3b4ff51bff Created race background for ingame lobby. #user[zwu18] #story[1301] 2017-09-28 12:51:08 +13:00
Fan-Wu Yang c08cbb01d6 removed println messages 2017-09-28 11:39:06 +13:00
Fan-Wu Yang 3c15cf9d02 Fixed up sharks size and spinning speed 2017-09-28 11:29:53 +13:00
Fan-Wu Yang 3d605db924 Seagulls are spawnable and have semi-random motion, no sounds yets 2017-09-28 09:59:59 +13:00
Fan-Wu Yang 98240532f0 Sharks are now seeable 2017-09-28 07:31:47 +13:00
Fan-Wu Yang c582a66f9a Added new Highlight 2017-09-28 06:58:40 +13:00
Fan-Wu Yang 63fbffdbc1 lots of trying seagull stuff but translate y doesn't want to work for some stupid reason. 2017-09-28 06:43:44 +13:00
Fan-Wu Yang b48b83ab8e single mark rounding arrow now works 2017-09-28 02:49:19 +13:00
Fan-Wu Yang 1b6197e0ac removed some files for seng teams sanity sake and moved the seasurface down a bit. 2017-09-28 01:01:01 +13:00
Fan-Wu Yang 8a6997f29b Merge branch 'master' into new_3d_assets 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
 2017-09-28 00:57:06 +13:00
Fan-Wu Yang c1422d9a98 Changed Sea Surface to new Sea Surface and optimised some assets to load at the beginning 2017-09-28 00:50:53 +13:00
Fan-Wu Yang 8120b1bbab Upgraded marks and how to look rounded #story[1299] 2017-09-27 02:20:29 +13:00
Fan-Wu Yang 1ca276ec62 Fixed some issue after merge as well as set the minimum race time to 2 minutes. #story[1323] 2017-09-26 16:48:23 +13:00
Fan-Wu Yang d6884a6981 Deprecated a method that shouldn't be used but is still being used, and merged in most recent master #story[1323] 2017-09-26 16:41:31 +13:00
Fan-Wu Yang d599df3901 Merge branch 'master' into raceLength 
# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java
 2017-09-26 16:40:03 +13:00
Fan-Wu Yang a33583d67d Fixed racescaling a mark twice and removed println statements #story[1323] 2017-09-26 16:38:03 +13:00
Fan-Wu Yang 967bdb394f Merged in master and realigned center of the boat #story[1306] 2017-09-26 15:21:30 +13:00
Fan-Wu Yang cd99492467 Merge branch 'master' into story1306_wind_arrow 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/layout/Assets3D.java
 2017-09-26 15:04:02 +13:00
Fan-Wu Yang 980d1d7977 Merge remote-tracking branch 'origin/issue58_sails_collision_fix' into story1297_sails 2017-09-26 00:24:05 +13:00
Fan-Wu Yang a14307a6bf Merge branch 'master' into story1297_sails 2017-09-26 00:23:38 +13:00
Fan-Wu Yang 9da0d238c2 Removed printlns ready for DoD 2017-09-25 15:33:33 +13:00
Fan-Wu Yang 6cfb076fef Merge branch 'master' into story1297_sails 2017-09-25 15:30:18 +13:00
Fan-Wu Yang a1b6de5638 Merge branch 'master' into story1306_wind_arrow 2017-09-25 15:29:04 +13:00
Fan-Wu Yang eca921cb11 Removed println's ready for DoD 2017-09-25 15:28:37 +13:00
Fan-Wu Yang 5a1dbc83b5 Merge branch 'zoomzoom' into 'master' 
Zoomzoom

As a player I want to see a natural zoom motion  

AC's:  
-Upper limit of camera will always reset to the centre of the race  
-Camera motion doesn't snap and will move smoothly  

Note: it 'snaps' when returning to the original view when not following a boat, as intended (think google maps), but each zoom key press is not 'snapped'.

See merge request !57
 2017-09-25 12:37:50 +13:00
Fan-Wu Yang 6d55168c61 Added Textures to boats as well as added texture to arrow #story[1306] 2017-09-25 03:31:38 +13:00
Fan-Wu Yang 45ba3ae6ac Added 3D wind arrow and it also rotates #story[1306] 2017-09-25 02:35:52 +13:00
Fan-Wu Yang d280c0bdae Merged master and added a few comments 2017-09-25 01:44:31 +13:00
Fan-Wu Yang 12b7d10f24 Merge branch 'master' into story1297_sails 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
#	racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
 2017-09-25 01:43:23 +13:00
Fan-Wu Yang 088e73414b Fixed small bug where the sail never stopps jittering after moving #story[1297] 2017-09-24 00:36:35 +12:00
Fan-Wu Yang 2b8ca9265f Sails now slowly spin to the correct position #story[1297] 2017-09-23 23:36:21 +12:00
Fan-Wu Yang d3a6b82031 Commit before checking out developement 2017-09-22 21:39:48 +12:00
Fan-Wu Yang cf9acabd97 Boat sails now luff and stay when in the direction of the wind #story[1297] 2017-09-21 02:35:01 +12:00
Fan-Wu Yang c9177da85c Deleted another dead line #story[1297] 2017-09-21 02:22:34 +12:00
Fan-Wu Yang ed11f7d56c forgot to removed a dead line #story[1297] 2017-09-21 02:22:04 +12:00
Fan-Wu Yang 2389aa361c Boats sails can luff and are now two piece. #story[1297] 2017-09-21 02:21:02 +12:00
Fan-Wu Yang 1ffef51d7c Changed local ip detection to use regex 2017-09-20 22:07:46 +12:00
Fan-Wu Yang ffa1d8b0c4 Deleted Print Statement 2017-09-20 21:39:33 +12:00
Fan-Wu Yang 52271d580f CHanged ip to local ip because port forwarding may be subjective to change. 2017-09-20 21:38:49 +12:00
Fan-Wu Yang 3d292f784b Users can now resee the lobby after exit and reentering, and fixed concurrent alteration issue which was stopping players from exiting the lobby. 2017-09-20 18:46:33 +12:00
Fan-Wu Yang fec421da00 Removed println messages 2017-09-20 15:16:32 +12:00
Fan-Wu Yang 30087ed9bd Merge branch 'master' into newHostServer 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
 2017-09-20 15:14:19 +12:00
Fan-Wu Yang 3c9e520d9f Merged in null pointer issue. 2017-09-20 15:07:22 +12:00
Fan-Wu Yang bb0c1d1780 Merge branch 'nullptr_finish_race_arrow' into newHostServer 2017-09-20 15:06:20 +12:00
Fan-Wu Yang b0857debeb Merge remote-tracking branch 'origin/nullptr_finish_race_arrow' into newHostServer 2017-09-20 15:05:26 +12:00
Fan-Wu Yang b550afcca7 Merged race scaling with Http Match Discovery. 2017-09-20 15:05:08 +12:00
Fan-Wu Yang ac5423263c Merge remote-tracking branch 'origin/scale_maps_spike' into newHostServer 2017-09-20 14:29:44 +12:00
Fan-Wu Yang 928f5e31f0 Hopefully final version of Hosting #story[1188] 2017-09-19 02:15:34 +12:00
Fan-Wu Yang f7da497743 Resizing maps to time taking now works #story[1323] 2017-09-18 18:22:20 +12:00
Fan-Wu Yang 9d1145b298 Changed back to CI IP to test on CI 2017-09-18 02:03:25 +12:00
Fan-Wu Yang d660cd9e78 Merge branch 'network_on_VPS' into 'master' 
Network on vps

Can connect to host network

See merge request !52
 2017-09-15 02:59:14 +12:00
Fan-Wu Yang 0348b0c642 Merged in master 2017-09-15 02:50:06 +12:00
Fan-Wu Yang c91c4e5d7c Merge branch 'master' into network_on_VPS 2017-09-15 02:47:50 +12:00
Fan-Wu Yang 4970f52c3a Merge remote-tracking branch 'origin/master' into network_on_VPS 2017-09-15 02:45:56 +12:00
Fan-Wu Yang 34a803f92e More changes 2017-09-15 02:39:47 +12:00
Fan-Wu Yang 22e9db473e Removed test that took a manditory socket 2017-09-15 02:28:09 +12:00
Fan-Wu Yang 2383915c78 Merged #story[1195] 2017-09-14 16:42:23 +12:00
Fan-Wu Yang d70f556741 Changed arrow to next mark appearance #story[1195] 2017-09-14 16:36:17 +12:00
Fan-Wu Yang f541a13235 Tried to get lobby working #story[1188] 2017-09-14 15:54:48 +12:00
Fan-Wu Yang e4a8bd08e7 Merge branch 'story77' into 'master' 
Story77



See merge request !44
 2017-09-13 21:37:57 +12:00
Fan-Wu Yang 92500e13ee Added in windangle for rotated map as it had been lost through merge. #story[1188] 2017-09-13 21:30:16 +12:00
Fan-Wu Yang 1b946b6807 Removed/commented out unecessary print messages #story[1188] 2017-09-13 21:21:19 +12:00
Fan-Wu Yang 7b97e93d3a Merge branch 'merge_fix_story51' 
# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java
 2017-09-13 15:51:59 +12:00
Fan-Wu Yang 54fe37fd3a Merge branch 'story_51_rounding_fix' into 'master' 
Story 51 rounding fix

Acceptance criteria:

- The layout must be sent over the API in a race.xml message, plus boat location messages for the marks as required, before any other boat location messages are sent.
- Each mark must be defined using boat "SourceID"s (see definition of race.xml) so their positions can be adjusted later.
- The course must meet the requirements given in the AC35 Protocol.
- The course limits should be set to clear all marks by at least several boat-lengths.
- The entire race area within the limits must be on the water.


(Work with rounding)

Tested by playing the first map with a variety of rotation angles.

See merge request !43
 2017-09-13 15:40:55 +12:00
Fan-Wu Yang 1cbb24e9fd Merged in master #story[1185] 2017-09-13 15:05:36 +12:00
Fan-Wu Yang 3760a43cfc Merge branch 'master' into HEAD 
# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java
 2017-09-13 14:56:52 +12:00
Fan-Wu Yang e87173ee39 Fixed Tutorial not being able to run #story[1185] 2017-09-13 14:29:48 +12:00
Fan-Wu Yang 3a6070a645 Fixed Merge and added back some merge changes #story[1196] 2017-09-12 22:10:13 +12:00
Fan-Wu Yang 3301798411 Fixed boats not rotating in lobby #story[1188] 2017-09-12 21:35:10 +12:00
Fan-Wu Yang 2cda5ea70d Lobby no longer glitches out when a person disconnects and reconnects without restarting the program #story[1188] 2017-09-11 20:34:34 +12:00
Fan-Wu Yang 54a9140f31 lobby listener is added and removed so that the program doesn't drasticaly slow down when the lobby is connected to multiple times #story[1188] 2017-09-11 20:29:15 +12:00
Fan-Wu Yang df04cdf87c Boats are now visualy removed when they leave the lobby. 2017-09-11 19:54:43 +12:00
Fan-Wu Yang d92410b9b4 Fixed XML Issue where sometimes the last boat would not display itself #story[1188] 2017-09-11 18:14:26 +12:00
Fan-Wu Yang ae75bb86d3 Resized models to a similar size of the collision detectors. #story[1261] 2017-09-11 02:48:00 +12:00
Fan-Wu Yang 08ca42f786 Wrote some missing java docs #story[1261] 2017-09-11 01:05:58 +12:00
Fan-Wu Yang 9ac9c25923 Made sea surface look like a sea surface which is randomly generated each time, size may need to be altered a bit else it will cause the program to slow #story[1261] 2017-09-11 00:54:11 +12:00
Fan-Wu Yang a7eefca13a Work in progress, the perlin noise is now generated, however, a good colour should be selected as well as using a subject3d instead of a imageview #story[1261] 2017-09-10 16:15:37 +12:00
Fan-Wu Yang e2b868d815 Added boundaries to the map, which are drawn by the race #story[1261] 2017-09-10 14:49:16 +12:00
Fan-Wu Yang e149255240 Tried to get multiple boats working but.... it's not #story[1196] 2017-09-08 20:10:45 +12:00
Fan-Wu Yang 5bc382304b Created and linked up bouy to race, and added keybindings to git ignore #story[1196] 2017-09-08 19:15:39 +12:00
Fan-Wu Yang 7bad0e53ff The boat is now viewable in top down view (60 degrees for isometric) and the race is playable #story[1261] 2017-09-07 22:03:24 +12:00
Fan-Wu Yang 18a689b110 Changed a constant to be using the one in the constants file (prepartory start time) and temporarily made it so that the race can start in 3 seconds. #story[1261] 2017-09-07 19:30:51 +12:00
Fan-Wu Yang ae1526c457 Merge branch 'master' into vmg_fix 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/MainController.java
 2017-09-06 17:48:11 +12:00
Fan-Wu Yang ba13713ba1 Merge branch 'wind_(story53)' into 'master' 
Wind (story53)

AC:

Note: "Back" means that the wind shifts counterclockwise while "veer" means clockwise. Shifts should follow the following patterns:

1. The wind should usually oscillate regularly around a mean (several minutes per oscillation and no more than 5 degrees either way.)
2. Occasionally it will either "back" or "veer" (a few degrees a minute, up to 180 degrees shift), and then return to oscillations.

Acceptance criteria:

- The wind direction follows the above patterns during a race.

* Test wind works at 0 to small degree amounts.


See merge request !36
 2017-09-06 17:45:09 +12:00
Fan-Wu Yang 7024cac426 Rotated image of arrow direction #story[1187] 2017-09-06 17:41:48 +12:00
Fan-Wu Yang 8eee282977 Merge branch 'wind_(story53)' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into wind_(story53) 2017-09-06 17:13:39 +12:00
Fan-Wu Yang 5bb8ba44b8 Fixed Javadoc and also made some variables private #story[1187] 2017-09-06 17:00:56 +12:00
Fan-Wu Yang 2382585c15 Fixed Javadoc and also made some variables private #story[1187] 2017-09-06 16:58:27 +12:00
Fan-Wu Yang 06517b7b47 Tidied up code 
- Removed prints from tests
- Added Javadocs in necessary places
- Reenabled boat status message to send
- Added boat average angle
- pulled out modulateAngle function
- Commented harder to read loops
- Disabled toggled VMG
#story[1182]
 2017-09-05 21:37:33 +12:00
Fan-Wu Yang d602c1ec6f VMG is now working and fixed, however, it feels a bit odd #story[1182] 2017-09-05 21:03:19 +12:00