fjc40
|
e77208aea1
|
MarkRoundingSequence now stores data using the leg number, rather than the leg object itself. This was an issue as leg objects would be recreated when race xml files are received.
Fixes issue #64
|
8 years ago |
|
fjc40
|
5ea4200e67
|
Some javadoc warning fixes.
|
8 years ago |
David Wu
|
1a672e8ac8
|
Merge branch 'master' into story1292_hp_punish
|
8 years ago |
Joseph Gardner
|
7ac181f33d
|
Fixed null pointer when race finishes #story[1299]
|
8 years ago |
|
Joseph Gardner
|
13f3f595d2
|
Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction
|
8 years ago |
|
Joseph Gardner
|
08c097f153
|
Merge remote-tracking branch 'origin/issue61_manual_connection_fix' into story1299_next_mark_direction
|
8 years ago |
|
Joseph Gardner
|
6e913d6c45
|
Merge remote-tracking branch 'origin/third-person-default' into story1299_next_mark_direction
|
8 years ago |
Connor Taylor-Brown
|
73bffb35e3
|
Removed stutter
|
8 years ago |
|
Joseph Gardner
|
ea1170a48e
|
Merge remote-tracking branch 'origin/master' into raceLength
|
8 years ago |
|
Connor Taylor-Brown
|
d6b0fec6d3
|
Start race in third person by default
- Third person zoom limit has been lowered
- Next mark highlighting and arrow only follows player boat
|
8 years ago |
|
David Wu
|
48e7b6970c
|
Merged master in. Added documentation. #story[1292]
|
8 years ago |
|
David Wu
|
3adc5330b4
|
Merge branch 'master' into story1292_hp_punish
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
# racevisionGame/src/main/resources/visualiser/scenes/raceView.fxml
|
8 years ago |
|
Joseph Gardner
|
26e2035ea2
|
Changed 3d arrow to point downwards #story[1299]
|
8 years ago |
|
zwu18
|
416eb1e6bf
|
On death a menu will pop up telling the user he is dead. #story[1292]
|
8 years ago |
|
Joseph
|
569204b771
|
New skin for 2d next mark arrow. #story[1299]
|
8 years ago |
|
Joseph
|
699df2e775
|
Using new arrow / arrow textures. Made sails not clickable.
|
8 years ago |
|
zwu18
|
1b8fa59f0e
|
Having 0 hp now removes the boat from being an active boat. #story[1292]
|
8 years ago |
|
Joseph
|
affbb69029
|
Merge remote-tracking branch 'origin/story1299_next_mark_direction' into story1299_next_mark_direction
|
8 years ago |
|
Joseph
|
d86d043992
|
Merge branch 'master' into story1299_next_mark_direction
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
|
8 years ago |
|
zwu18
|
ba82328c42
|
Removed souts for speedometer. #story[1311]
|
8 years ago |
|
zwu18
|
f4001e0ae3
|
Added visual display when boat dies. Added sound when boat dies. #story[1311]
|
8 years ago |
Fan-Wu Yang
|
1ca276ec62
|
Fixed some issue after merge as well as set the minimum race time to 2 minutes. #story[1323]
|
8 years ago |
|
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]
|
8 years ago |
|
Fan-Wu Yang
|
d599df3901
|
Merge branch 'master' into raceLength
# Conflicts:
# racevisionGame/src/main/java/mock/app/Event.java
|
8 years ago |
|
Fan-Wu Yang
|
a33583d67d
|
Fixed racescaling a mark twice and removed println statements #story[1323]
|
8 years ago |
|
zwu18
|
11d6d3a880
|
Documentation added. Master merged. #story[1311]
|
8 years ago |
|
zwu18
|
1d95004811
|
Merge branch 'master' into story_speedometer
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
|
8 years ago |
|
zwu18
|
e53d7d894b
|
Warning sound added. Sound synced with visual display. #story[1292]
|
8 years ago |
|
Fan-Wu Yang
|
967bdb394f
|
Merged in master and realigned center of the boat #story[1306]
|
8 years ago |
|
Fan-Wu Yang
|
cd99492467
|
Merge branch 'master' into story1306_wind_arrow
# Conflicts:
# racevisionGame/src/main/java/visualiser/layout/Assets3D.java
|
8 years ago |
|
Joseph
|
3f04485b78
|
Added manual connections works while also receiving available games from the server. #story[1352]
|
8 years ago |
|
Joseph
|
5ebee27baa
|
Merge remote-tracking branch 'origin/master' into issue61_manual_connection_fix
|
8 years ago |
|
Fan-Wu Yang
|
980d1d7977
|
Merge remote-tracking branch 'origin/issue58_sails_collision_fix' into story1297_sails
|
8 years ago |
|
Fan-Wu Yang
|
a14307a6bf
|
Merge branch 'master' into story1297_sails
|
8 years ago |
|
fjc40
|
76dff8009c
|
Removed countdown timer from lobby screen.
|
8 years ago |
|
fjc40
|
9763150e85
|
Merge remote-tracking branch 'origin/master' into game_start_button_1352
|
8 years ago |
|
Fan-Wu Yang
|
9da0d238c2
|
Removed printlns ready for DoD
|
8 years ago |
|
Joseph Gardner
|
44268cc30b
|
Fixed not being able to add custom connections. Still need to test if it works with the http match browser (can't test it atm. #story[1352]
|
8 years ago |
|
Fan-Wu Yang
|
6cfb076fef
|
Merge branch 'master' into story1297_sails
|
8 years ago |
|
Fan-Wu Yang
|
a1b6de5638
|
Merge branch 'master' into story1306_wind_arrow
|
8 years ago |
|
Fan-Wu Yang
|
eca921cb11
|
Removed println's ready for DoD
|
8 years ago |
|
Joseph Gardner
|
7d789c04bb
|
Fixed sails out / colliding issue. #story[1297]
|
8 years ago |
|
Joseph Gardner
|
332722e099
|
Attempt to fix sails in / out colliding issue. Going to test on dev for a better visual representation. #story[1297]
|
8 years ago |
|
Joseph Gardner
|
f9f5cfef7d
|
Chanegd next mark arrow to fit with new UI. #story[1299]
|
8 years ago |
Jessica Syder
|
915d61b9f3
|
Map can be zoomed out in birds eye view only to a specified distance.
#story[1312]
|
8 years ago |
|
Jessica Syder
|
ab49d62c0d
|
Map can be zoomed in / out at all times.
- map can be zoomed when object is not selected
#story[1312]
|
8 years ago |
|
Joseph Gardner
|
327c052b1d
|
Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction
|
8 years ago |
|
fjc40
|
20702f352b
|
Lobby start button is hidden/disabled by default, to avoid it being visible to non-host clients for a split seconds while loading screen.
|
8 years ago |
|
Jessica Syder
|
e64e6ddbdb
|
Boat scaling is correct.
- scaling changes as a user zooms in or out to
- 3rd person view defaults to life size scale
#story[1312]
|
8 years ago |
|
Fan-Wu Yang
|
6d55168c61
|
Added Textures to boats as well as added texture to arrow #story[1306]
|
8 years ago |
