4f681ced4e
Sailer tom 8)
8 years ago
817b71339d
updated images to show the arrows better aganst the wood
8 years ago
0bfe93da06
Merge branch 'master' into story1301-start
8 years ago
e90aeccdef
Merge branch 'master' into story1301-start
8 years ago
05d9eeae01
Merge remote-tracking branch 'remotes/origin/master' into ac35_map_boundary
8 years ago
6187b83524
Merge remote-tracking branch 'origin/ac35_map_boundary' into ac35_map_boundary
8 years ago
c2de45ce01
Merge remote-tracking branch 'remotes/origin/boat_collision_fix' into ac35_map_boundary
8 years ago
9b30877b5a
Merge remote-tracking branch 'remotes/origin/master' into pretty_tomato
8 years ago
0da840a37e
Fixed toggling and application of style
...
#story[1301]
8 years ago
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
8 years ago
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
8 years ago
88d5a60696
Merge branch 'master' into story1301-start
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/layout/View3D.java
8 years ago
ca5b344181
Visual improvements made to tomato health bar. #story[1301]
8 years ago
e434af0728
fixed boat collisions. Increased boat collision radius 15 -> 50
8 years ago
e8886d70de
Merge branch 'zoom_in_clipping_fix' into ac35_map_boundary
8 years ago
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.
8 years ago
a8cd7755b8
color fix for multiple boats
...
#story[1306]
8 years ago
f2a0f56cf0
Merge remote-tracking branch 'remotes/origin/boat_speed_issue_54' into ac35_map_boundary
8 years ago
4415a501be
Merge remote-tracking branch 'remotes/origin/minimap_crash_first_leg' into ac35_map_boundary
8 years ago
1783e73caf
color fix for first leg
...
#story[1306]
8 years ago
315bb64bb3
Boat on start screen now follows infinite loop
...
- Removed non-resizable property on TitleController
#story[1301]
8 years ago
c7f59b73d5
Expanded the boundary for ac35MapLayout.xml slightly.
...
Fixes issue #63
8 years ago
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
abfa3ea863
Race now uses a 1 for timescale, which effectively disables time/speed scaling.
8 years ago
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
8 years ago
75f8231bc5
Merge branch 'story1292_hp_punish' into 'master'
...
Story1292 and Story1291 hp
Story 1291:
AC's:
-Mock sends out HP packets
-Visualiser displays each boat's HP in tab view
-User boat HP is displayed on main UI beside boat
Story 1292:
AC's:
-Boats lose HP when they collide
-Boats lose HP when they are out of bounds
-Indication when HP drops below thresholds (20hp, 10hp, 0hp)
See merge request !65
8 years ago
5ea4200e67
Some javadoc warning fixes.
8 years ago
7b5460abc5
info full screen map shows on top of hud
...
#story[1306]
8 years ago
2ac3bad6e1
info table shows on top of hud
...
#story[1306]
8 years ago
4e8f1a2b19
Placed the waypoint arrow in the HUD
...
#story[1306]
8 years ago
1a672e8ac8
Merge branch 'master' into story1292_hp_punish
8 years ago
2f6fa73349
Merge remote-tracking branch 'remotes/origin/master' into raceView_UI
8 years ago
f9f3213397
Merge branch 'story1299_next_mark_direction' into 'master'
...
Story1299 next mark direction
- Shows a 2d arrow to next mark when zoomed out
- Shows a 3d arrow to next mark when zoomed in
See merge request !63
8 years ago
7ac181f33d
Fixed null pointer when race finishes #story[1299]
8 years ago
13f3f595d2
Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction
8 years ago
5eeb65ad41
Merge branch 'raceLength' into 'master'
...
Race length
AC's:
- Scale map to selected duration of user
See merge request !64
8 years ago
08c097f153
Merge remote-tracking branch 'origin/issue61_manual_connection_fix' into story1299_next_mark_direction
8 years ago
6e913d6c45
Merge remote-tracking branch 'origin/third-person-default' into story1299_next_mark_direction
8 years ago
73bffb35e3
Removed stutter
8 years ago
ea1170a48e
Merge remote-tracking branch 'origin/master' into raceLength
8 years ago
173b4444da
Placed the wind arrow in the HUD
...
#story[1306]
8 years ago
fc267a6a49
Merge remote-tracking branch 'remotes/origin/master' into raceView_UI
...
# Conflicts:
# racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
8 years ago
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
48e7b6970c
Merged master in. Added documentation. #story[1292]
8 years ago
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
26e2035ea2
Changed 3d arrow to point downwards #story[1299]
8 years ago
416eb1e6bf
On death a menu will pop up telling the user he is dead. #story[1292]
8 years ago
569204b771
New skin for 2d next mark arrow. #story[1299]
8 years ago
699df2e775
Using new arrow / arrow textures. Made sails not clickable.
8 years ago
1b8fa59f0e
Having 0 hp now removes the boat from being an active boat. #story[1292]
8 years ago
Joseph Gardner
hba56
Connor Taylor-Brown
zwu18
fjc40