985f784066
Removed broken stuff from FXML after merge
8 years ago
dc9445a8a6
Merge branch 'master' into story1291-hp
...
# Conflicts:
# racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
8 years ago
4242d05279
fixed issue with being unable to click through minimap
...
#story[1295]
8 years ago
5473fde731
Merge remote-tracking branch 'remotes/origin/master' into story1291-hp
8 years ago
eee0b414f8
made trackpoints cap at 50. This fixes fps issues with the minimap. #fix #story[1295]
8 years ago
6c78e5d0b5
Tomato now depletes as expected
...
#story[1291]
8 years ago
10008f5452
Depleting tomato now watches player health
...
- [BUG] Tomato fills up instead of depleting
#story[1291]
8 years ago
add1d3996d
Set map colour back to a lighter colour as it didnt work as well on lower grade monitors
...
#story[1195]
8 years ago
dacaf58271
Merge remote-tracking branch 'remotes/origin/master' into minimap_test
8 years ago
b787b5a71b
changed map to dodgerblue
8 years ago
afc42cf2ab
lowered opacity
8 years ago
1ffef51d7c
Changed local ip detection to use regex
8 years ago
50125e0151
moved minimap to left so does not overlap with speedo
8 years ago
ffa1d8b0c4
Deleted Print Statement
8 years ago
52271d580f
CHanged ip to local ip because port forwarding may be subjective to change.
8 years ago
3d292f784b
Users can now resee the lobby after exit and reentering, and fixed concurrent alteration issue which was stopping players from exiting the lobby.
8 years ago
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]
8 years ago
fec421da00
Removed println messages
8 years ago
30087ed9bd
Merge branch 'master' into newHostServer
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
8 years ago
3c9e520d9f
Merged in null pointer issue.
8 years ago
bb0c1d1780
Merge branch 'nullptr_finish_race_arrow' into newHostServer
8 years ago
b0857debeb
Merge remote-tracking branch 'origin/nullptr_finish_race_arrow' into newHostServer
8 years ago
b550afcca7
Merged race scaling with Http Match Discovery.
8 years ago
23040ecff4
Created separate listeners for all boats' and player boat health
...
#story[1291]
8 years ago
ac5423263c
Merge remote-tracking branch 'origin/scale_maps_spike' into newHostServer
8 years ago
0d89574c1f
RaceViewController listens to health changes on the local player's boat
...
#story[1291]
8 years ago
7eb59cdcfc
Allowed fractional health deductions per frame
...
- Fixed boundary penalty system
#story[1291]
8 years ago
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]
8 years ago
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]
8 years ago
f7d866144a
Map now only shows annotations when in full screen
...
#story[1295]
8 years ago
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.
8 years ago
d3f1e3baa4
Merge remote-tracking branch 'remotes/origin/master' into spectate_mode_basic
8 years ago
928f5e31f0
Hopefully final version of Hosting #story[1188]
8 years ago
f7da497743
Resizing maps to time taking now works #story[1323]
8 years ago
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).
8 years ago
acd99f58cd
Merge remote-tracking branch 'origin/master' into nullptr_finish_race_arrow
8 years ago
f3f60acac6
resize map
8 years ago
731be68831
test for a minimap
8 years ago
9d1145b298
Changed back to CI IP to test on CI
8 years ago
75c15d492e
There was a null pointer exception when finishing the race, as the finish leg doesn't have compound marks.
8 years ago
eacbe8d8ea
Merge remote-tracking branch 'origin/master' into boat_movement_smooth
8 years ago
0348b0c642
Merged in master
8 years ago
c91c4e5d7c
Merge branch 'master' into network_on_VPS
8 years ago
4970f52c3a
Merge remote-tracking branch 'origin/master' into network_on_VPS
8 years ago
34a803f92e
More changes
8 years ago
22e9db473e
Removed test that took a manditory socket
8 years ago
2c92102b2a
Changed GraphCoordinate to use double instead of int.
...
This results in waaaaay smoother movement. Boats no longer jump around.
8 years ago
191f249bfb
Speed scale is 2, rather than 10.
...
Server simulates frames every 16ms rather than 50ms.
8 years ago
5c58ca11ff
Boats use their assigned color.
...
Boat name is displayed in lobby instead of source ID.
8 years ago
eb2ed45ed2
Merge branch 'master' into spectate_mode_basic
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
8 years ago
Connor Taylor-Brown
hba56
David Wu
Fan-Wu Yang
fjc40