 Joseph Gardner
|
4f681ced4e
|
Sailer tom 8)
|
2017-09-28 14:18:13 +13:00 |
|
 hba56
|
817b71339d
|
updated images to show the arrows better aganst the wood
|
2017-09-28 13:43:06 +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 |
|
|
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 |
|
 zwu18
|
ca5b344181
|
Visual improvements made to tomato health bar. #story[1301]
|
2017-09-28 03:54:07 +13:00 |
|
|
Joseph
|
e434af0728
|
fixed boat collisions. Increased boat collision radius 15 -> 50
|
2017-09-28 01:29:58 +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 |
|
|
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 |
|