 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
|
38bcc9fa66
|
Sailer tom 8)
|
2017-09-28 14:53:21 +13:00 |
|
|
Joseph Gardner
|
c0e00899ef
|
Merge branch 'master' into tom
|
2017-09-28 14:51:54 +13:00 |
|
 Fan-Wu Yang
|
3956affa01
|
removed timescale, and merged master
|
2017-09-28 14:26:33 +13:00 |
|
|
Fan-Wu Yang
|
fbb9d0910b
|
Merge branch 'master' into new_3d_assets
|
2017-09-28 14:26:08 +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 |
|
 hba56
|
817b71339d
|
updated images to show the arrows better aganst the wood
|
2017-09-28 13:43:06 +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 |
|
|
hba56
|
6187b83524
|
Merge remote-tracking branch 'origin/ac35_map_boundary' into ac35_map_boundary
|
2017-09-28 12:42:09 +13:00 |
|
|
hba56
|
c2de45ce01
|
Merge remote-tracking branch 'remotes/origin/boat_collision_fix' into ac35_map_boundary
|
2017-09-28 12:42:03 +13:00 |
|
|
hba56
|
9b30877b5a
|
Merge remote-tracking branch 'remotes/origin/master' into pretty_tomato
|
2017-09-28 12:32:11 +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 |
|
 zwu18
|
ca5b344181
|
Visual improvements made to tomato health bar. #story[1301]
|
2017-09-28 03:54:07 +13:00 |
|
|
Fan-Wu Yang
|
b48b83ab8e
|
single mark rounding arrow now works
|
2017-09-28 02:49:19 +13:00 |
|
|
Joseph
|
e434af0728
|
fixed boat collisions. Increased boat collision radius 15 -> 50
|
2017-09-28 01:29:58 +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
|
e8886d70de
|
Merge branch 'zoom_in_clipping_fix' into ac35_map_boundary
|
2017-09-28 00:50:43 +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 |
|
|
Connor Taylor-Brown
|
f2a0f56cf0
|
Merge remote-tracking branch 'remotes/origin/boat_speed_issue_54' into ac35_map_boundary
|
2017-09-27 22:46:53 +13:00 |
|
|
Connor Taylor-Brown
|
4415a501be
|
Merge remote-tracking branch 'remotes/origin/minimap_crash_first_leg' into ac35_map_boundary
|
2017-09-27 22:46:31 +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
|
c7f59b73d5
|
Expanded the boundary for ac35MapLayout.xml slightly.
Fixes issue #63
|
2017-09-27 16:56:20 +13:00 |
|
|
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
|
2017-09-27 16:08:02 +13:00 |
|
|
fjc40
|
abfa3ea863
|
Race now uses a 1 for timescale, which effectively disables time/speed scaling.
|
2017-09-27 15:51:00 +13:00 |
|
|
fjc40
|
3e04ed12ad
|
Removed raceSinglePlayer.xml and raceThreePlayers.xml as they are identical to raceSixPlayers.xml.
Renamed raceSixPlayers.xml to ac35MapLayout.xml to be more consistent with other map names.
Issue #63
|
2017-09-27 15:41:24 +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 |
|