 hba56
|
fb8f1640ac
|
Merge remote-tracking branch 'remotes/origin/master' into raceView_UI
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
|
2017-09-28 11:32:39 +13:00 |
|
|
hba56
|
58cde8ce44
|
Merge remote-tracking branch 'remotes/origin/master' into raceView_UI
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
|
2017-09-28 11:32:25 +13:00 |
|
|
hba56
|
a8cd7755b8
|
color fix for multiple boats
#story[1306]
|
2017-09-27 22:47:33 +13:00 |
|
|
hba56
|
1783e73caf
|
color fix for first leg
#story[1306]
|
2017-09-27 22:39:47 +13:00 |
|
 fjc40
|
5ea4200e67
|
Some javadoc warning fixes.
|
2017-09-27 14:47:51 +13:00 |
|
|
hba56
|
7b5460abc5
|
info full screen map shows on top of hud
#story[1306]
|
2017-09-27 14:17:22 +13:00 |
|
|
hba56
|
2ac3bad6e1
|
info table shows on top of hud
#story[1306]
|
2017-09-27 13:54:02 +13:00 |
|
|
hba56
|
4e8f1a2b19
|
Placed the waypoint arrow in the HUD
#story[1306]
|
2017-09-27 13:39:27 +13:00 |
|
 David Wu
|
1a672e8ac8
|
Merge branch 'master' into story1292_hp_punish
|
2017-09-27 13:36:24 +13:00 |
|
|
hba56
|
2f6fa73349
|
Merge remote-tracking branch 'remotes/origin/master' into raceView_UI
|
2017-09-27 13:21:41 +13:00 |
|
 Joseph Gardner
|
7ac181f33d
|
Fixed null pointer when race finishes #story[1299]
|
2017-09-27 13:08:29 +13:00 |
|
|
Joseph Gardner
|
13f3f595d2
|
Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction
|
2017-09-27 12:52:50 +13:00 |
|
|
Joseph Gardner
|
08c097f153
|
Merge remote-tracking branch 'origin/issue61_manual_connection_fix' into story1299_next_mark_direction
|
2017-09-27 12:38:40 +13:00 |
|
|
Joseph Gardner
|
6e913d6c45
|
Merge remote-tracking branch 'origin/third-person-default' into story1299_next_mark_direction
|
2017-09-27 12:38:29 +13:00 |
|
 Connor Taylor-Brown
|
73bffb35e3
|
Removed stutter
|
2017-09-27 12:15:13 +13:00 |
|
|
Joseph Gardner
|
ea1170a48e
|
Merge remote-tracking branch 'origin/master' into raceLength
|
2017-09-27 12:05:09 +13:00 |
|
|
hba56
|
173b4444da
|
Placed the wind arrow in the HUD
#story[1306]
|
2017-09-27 12:04:56 +13:00 |
|
|
hba56
|
fc267a6a49
|
Merge remote-tracking branch 'remotes/origin/master' into raceView_UI
# Conflicts:
# racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
|
2017-09-27 12:04:03 +13:00 |
|
|
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
|
2017-09-27 12:02:56 +13:00 |
|
|
David Wu
|
48e7b6970c
|
Merged master in. Added documentation. #story[1292]
|
2017-09-27 11:59:54 +13:00 |
|
|
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
|
2017-09-27 11:48:06 +13:00 |
|
|
Joseph Gardner
|
26e2035ea2
|
Changed 3d arrow to point downwards #story[1299]
|
2017-09-27 11:39:12 +13:00 |
|
|
zwu18
|
416eb1e6bf
|
On death a menu will pop up telling the user he is dead. #story[1292]
|
2017-09-27 01:09:03 +13:00 |
|
|
Joseph
|
569204b771
|
New skin for 2d next mark arrow. #story[1299]
|
2017-09-27 00:36:05 +13:00 |
|
|
Joseph
|
699df2e775
|
Using new arrow / arrow textures. Made sails not clickable.
|
2017-09-26 18:30:29 +13:00 |
|
|
zwu18
|
1b8fa59f0e
|
Having 0 hp now removes the boat from being an active boat. #story[1292]
|
2017-09-26 18:20:11 +13:00 |
|
|
Joseph
|
affbb69029
|
Merge remote-tracking branch 'origin/story1299_next_mark_direction' into story1299_next_mark_direction
|
2017-09-26 17:54:49 +13:00 |
|
|
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
|
2017-09-26 17:53:46 +13:00 |
|
|
zwu18
|
ba82328c42
|
Removed souts for speedometer. #story[1311]
|
2017-09-26 17:09:00 +13:00 |
|
|
zwu18
|
f4001e0ae3
|
Added visual display when boat dies. Added sound when boat dies. #story[1311]
|
2017-09-26 17:05:22 +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 |
|
|
zwu18
|
11d6d3a880
|
Documentation added. Master merged. #story[1311]
|
2017-09-26 16:20:48 +13:00 |
|
|
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
|
2017-09-26 16:11:14 +13:00 |
|
|
zwu18
|
e53d7d894b
|
Warning sound added. Sound synced with visual display. #story[1292]
|
2017-09-26 16:03:35 +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 |
|
|
Joseph
|
3f04485b78
|
Added manual connections works while also receiving available games from the server. #story[1352]
|
2017-09-26 13:16:09 +13:00 |
|
|
Joseph
|
5ebee27baa
|
Merge remote-tracking branch 'origin/master' into issue61_manual_connection_fix
|
2017-09-26 13:11:39 +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 |
|
|
fjc40
|
76dff8009c
|
Removed countdown timer from lobby screen.
|
2017-09-25 23:48:00 +13:00 |
|
|
fjc40
|
9763150e85
|
Merge remote-tracking branch 'origin/master' into game_start_button_1352
|
2017-09-25 22:39:29 +13:00 |
|
|
Fan-Wu Yang
|
9da0d238c2
|
Removed printlns ready for DoD
|
2017-09-25 15:33:33 +13:00 |
|
|
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]
|
2017-09-25 15:30:49 +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 |
|