fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,449 Commits 1 Branch 0 Tags
11d6d3a880f8fbf2f8d26927c601730c2e45f9a0
Commit Graph
1449 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
David Wu eee0b414f8 made trackpoints cap at 50. This fixes fps issues with the minimap. #fix #story[1295] 2017-09-21 12:42:09 +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
hba56 add1d3996d Set map colour back to a lighter colour as it didnt work as well on lower grade monitors 
#story[1195]
 2017-09-21 00:04:07 +12:00
hba56 dacaf58271 Merge remote-tracking branch 'remotes/origin/master' into minimap_test 2017-09-20 23:46:02 +12:00
David Wu 951c3771fa Merge branch 'newHostServer' into 'master' 
Nullptr finish race arrow + race xml issues + Host Discovery + Scaling Race

Acceptance Criteria:

When a game starts I should see it reflected in the host lobby within 5 seconds.  
When a game ends it should not remain in the host lobby for more than 5 seconds.  
Changing the windspeed and the milliseconds value on Event.java line 124 should make the race larger or smaller.  
  
This should fix the race xml issues where the player didn't have a boat / last player joining not seeing their boat. Somehow the client was receiving xml files out of order, and it didn't check the order, so it would use race xml file 1, then replace it with race xml file 0, which was out of date.

See merge request !54
 2017-09-20 22:55:42 +12:00
hba56 b787b5a71b changed map to dodgerblue 2017-09-20 22:25:18 +12:00
hba56 afc42cf2ab lowered opacity 2017-09-20 22:22:07 +12:00
Fan-Wu Yang 1ffef51d7c Changed local ip detection to use regex 2017-09-20 22:07:46 +12:00
hba56 50125e0151 moved minimap to left so does not overlap with speedo 2017-09-20 22:03:22 +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
hba56 f7d866144a Map now only shows annotations when in full screen 
#story[1295]
 2017-09-19 22:08:27 +12:00
zwu18 4132b6733b Fixed small display error with current position. #story[1311] 2017-09-19 21:55:38 +12:00
zwu18 051811b97d Merge branch 'master' into story_speedometer 2017-09-19 21:45:00 +12:00
zwu18 be9feff6fd Layout changes to speedometer UI. #story[1311] 2017-09-19 21:39:40 +12:00
Hamish Ball ccbe3f86ea Merge branch 'spectate_mode_basic' into 'master' 
Spectate mode basic

Client can now select spectate when connecting to a race.
- The "Join game" button has been split into "Participate" and "Spectate".
- Selecting spectate should join the game, but not assign a boat.
- Spectator cannot control any boats, or have an effect on game.
- Can spectate a game even if it is full.


See merge request !49
 2017-09-19 21:23:14 +12:00
zwu18 201b9f0051 Linked users boat speed up with speedometer UI. #story[1311] 2017-09-19 21:10:48 +12:00
zwu18 eea394372f Race is now showing a speedometer in the bottom right corner. Next step is to update with speed of boat and improve appearance. #story[1311] 2017-09-19 18:23:45 +12:00
Joseph Gardner a82d3081fc Replace the class use of highlight with shockwave. #story[1298] 2017-09-19 15:43:22 +12:00
Joseph Gardner 9fbd5df626 Highlighting no longer goes over other boats. Player boat is highlighted in lobby. #story[1298] 2017-09-19 15:35:13 +12:00
Joseph Gardner cfdbf5896f Added basic highlighting to player boat. #story[1298] 2017-09-19 14:42:21 +12:00
Joseph Gardner 3ca62e6c2b Added basic highlighting to player boat. #story[1298] 2017-09-19 14:39:25 +12:00
fjc40 db27d673de Another fix for race xml stuff - the xml was fine, but the data sources would sometimes be overridden by empty ones, due to threading stuff. 2017-09-19 13:38:07 +12:00
hba56 d3f1e3baa4 Merge remote-tracking branch 'remotes/origin/master' into spectate_mode_basic 2017-09-19 12:38:51 +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
fjc40 424cd63c59 Should fix the race xml issues where boats get unassigned sometimes. 
This removes the static raceServer stuff.
The Race/Boat/Regatta XML commands only execute if they contain newer data (it checks the sequence number).
 2017-09-18 12:44:10 +12:00
fjc40 acd99f58cd Merge remote-tracking branch 'origin/master' into nullptr_finish_race_arrow 2017-09-18 12:03:15 +12:00
hba56 f3f60acac6 resize map 2017-09-18 10:44:34 +12:00
hba56 731be68831 test for a minimap 2017-09-18 10:22:01 +12:00
Fan-Wu Yang 9d1145b298 Changed back to CI IP to test on CI 2017-09-18 02:03:25 +12:00
fjc40 75c15d492e There was a null pointer exception when finishing the race, as the finish leg doesn't have compound marks. 2017-09-15 11:24:55 +12:00
Fraser Cope 11a50b6f09 Merge branch 'boat_movement_smooth' into 'master' 
Boats move about smoothly instead of jumping about



See merge request !51
 2017-09-15 10:04:00 +12:00
fjc40 eacbe8d8ea Merge remote-tracking branch 'origin/master' into boat_movement_smooth 2017-09-15 09:04:42 +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