 Joseph Gardner
|
55de754164
|
Stuff
|
2017-09-28 15:05:35 +13:00 |
|
|
Joseph Gardner
|
685b508f1e
|
Merge branch 'tom' into nightmode
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
|
2017-09-28 14:58:53 +13:00 |
|
|
Joseph Gardner
|
c0e00899ef
|
Merge branch 'master' into tom
|
2017-09-28 14:51:54 +13:00 |
|
 Fan-Wu Yang
|
6003bdf771
|
Fixed issue where finishing boats order could be be changed
|
2017-09-28 14:23:09 +13:00 |
|
|
Joseph Gardner
|
4f681ced4e
|
Sailer tom 8)
|
2017-09-28 14:18:13 +13:00 |
|
|
Fan-Wu Yang
|
4ddc369dbc
|
Changed Collisions, and merged master
|
2017-09-28 13:49:27 +13:00 |
|
|
Fan-Wu Yang
|
6ec75e6ed7
|
Merge branch 'master' into new_3d_assets
|
2017-09-28 13:42:58 +13:00 |
|
 Connor Taylor-Brown
|
0bfe93da06
|
Merge branch 'master' into story1301-start
|
2017-09-28 13:20:20 +13:00 |
|
|
Connor Taylor-Brown
|
e90aeccdef
|
Merge branch 'master' into story1301-start
|
2017-09-28 13:08:25 +13:00 |
|
 hba56
|
05d9eeae01
|
Merge remote-tracking branch 'remotes/origin/master' into ac35_map_boundary
|
2017-09-28 12:42:26 +13:00 |
|
|
Joseph Gardner
|
fa4a2b28d2
|
Merge remote-tracking branch 'origin/raceView_UI' into nightmode
|
2017-09-28 12:01:08 +13:00 |
|
|
Joseph Gardner
|
a2d605fd5b
|
Added nightmode skybox. Changed how next mark arrow works.
|
2017-09-28 11:56:49 +13:00 |
|
|
Fan-Wu Yang
|
c08cbb01d6
|
removed println messages
|
2017-09-28 11:39:06 +13:00 |
|
|
Connor Taylor-Brown
|
0da840a37e
|
Fixed toggling and application of style
#story[1301]
|
2017-09-28 11:38:19 +13:00 |
|
|
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 |
|
|
Connor Taylor-Brown
|
88d5a60696
|
Merge branch 'master' into story1301-start
# Conflicts:
# racevisionGame/src/main/java/visualiser/layout/View3D.java
|
2017-09-28 11:30:47 +13:00 |
|
|
Fan-Wu Yang
|
3c15cf9d02
|
Fixed up sharks size and spinning speed
|
2017-09-28 11:29:53 +13:00 |
|
|
Fan-Wu Yang
|
3d605db924
|
Seagulls are spawnable and have semi-random motion, no sounds yets
|
2017-09-28 09:59:59 +13:00 |
|
|
Fan-Wu Yang
|
98240532f0
|
Sharks are now seeable
|
2017-09-28 07:31:47 +13:00 |
|
|
Fan-Wu Yang
|
c582a66f9a
|
Added new Highlight
|
2017-09-28 06:58:40 +13:00 |
|
|
Fan-Wu Yang
|
63fbffdbc1
|
lots of trying seagull stuff but translate y doesn't want to work for some stupid reason.
|
2017-09-28 06:43:44 +13:00 |
|
|
Fan-Wu Yang
|
b48b83ab8e
|
single mark rounding arrow now works
|
2017-09-28 02:49:19 +13:00 |
|
|
Fan-Wu Yang
|
1b6197e0ac
|
removed some files for seng teams sanity sake and moved the seasurface down a bit.
|
2017-09-28 01:01:01 +13:00 |
|
|
Fan-Wu Yang
|
8a6997f29b
|
Merge branch 'master' into new_3d_assets
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
|
2017-09-28 00:57:06 +13:00 |
|
|
Fan-Wu Yang
|
c1422d9a98
|
Changed Sea Surface to new Sea Surface and optimised some assets to load at the beginning
|
2017-09-28 00:50:53 +13:00 |
|
 fjc40
|
5d9b574378
|
Zooming in while in birds eye no longer clips through sea surface.
Zooming with mouse wheel is the same speed as zooming with keyboard.
|
2017-09-28 00:00:02 +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 |
|
|
Connor Taylor-Brown
|
315bb64bb3
|
Boat on start screen now follows infinite loop
- Removed non-resizable property on TitleController
#story[1301]
|
2017-09-27 22:37:15 +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 |
|
|
Fan-Wu Yang
|
8120b1bbab
|
Upgraded marks and how to look rounded #story[1299]
|
2017-09-27 02:20:29 +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 |
|