fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,544 Commits 1 Branch 0 Tags
817b71339d992dfea5586e67fb631dff47635f12
Commit Graph
1544 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Connor Taylor-Brown b0bc7f50f2 Updated FXMLs to add depleting tomato 
- Tab view now contains health column
- BoatStateCommand now fails silently if command is received before race state is set up

#story[1291]
 2017-09-20 18:22:14 +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
Connor Taylor-Brown 23040ecff4 Created separate listeners for all boats' and player boat health 
#story[1291]
 2017-09-20 14:34:22 +12:00
Fan-Wu Yang ac5423263c Merge remote-tracking branch 'origin/scale_maps_spike' into newHostServer 2017-09-20 14:29:44 +12:00
Connor Taylor-Brown 0d89574c1f RaceViewController listens to health changes on the local player's boat 
#story[1291]
 2017-09-20 14:29:31 +12:00
Connor Taylor-Brown 7eb59cdcfc Allowed fractional health deductions per frame 
- Fixed boundary penalty system

#story[1291]
 2017-09-20 14:18:39 +12:00
Connor Taylor-Brown 50d5dd02a2 BoatState message can be received from mock by visualiser 
- Basic penalties have been made for out of bounds and collisions
- RaceServer packages and sends BoatState messages for each boat
- ServerConnection routes BoatState messages instead of dropping by default
- VisualiserRaceCommandFactory produces BoatStateCommands

#story[1291]
 2017-09-20 14:07:50 +12:00
Connor Taylor-Brown a295728e89 Created encoder and decoder for BoatState messages (HP packets) 
- Added new MessageType.BOATSTATE enum to support new message type
- Modified EncoderFactory and DecoderFactory to support new enum
- Verify that original and decoded messages match

#story[1291]
 2017-09-20 00:52:06 +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
Fan-Wu Yang 22e9db473e Removed test that took a manditory socket 2017-09-15 02:28:09 +12:00
fjc40 2c92102b2a Changed GraphCoordinate to use double instead of int. 
This results in waaaaay smoother movement. Boats no longer jump around.
 2017-09-15 01:34:32 +12:00
Hamish Ball 97aa917403 Merge branch 'boat_color_and_speed' into 'master' 
Boat color and speed

- Boats are colored by their assigned color.
- Boat name is displayed in lobby.
- Boats don't move quite so fast.

See merge request !50
 2017-09-15 01:25:07 +12:00
fjc40 191f249bfb Speed scale is 2, rather than 10. 
Server simulates frames every 16ms rather than 50ms.
 2017-09-15 01:00:26 +12:00
fjc40 5c58ca11ff Boats use their assigned color. 
Boat name is displayed in lobby instead of source ID.
 2017-09-15 00:59:43 +12:00