Fan-Wu Yang
1b6197e0ac
removed some files for seng teams sanity sake and moved the seasurface down a bit.
8 years ago
Fan-Wu Yang
8a6997f29b
Merge branch 'master' into new_3d_assets
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
8 years ago
Fan-Wu Yang
c1422d9a98
Changed Sea Surface to new Sea Surface and optimised some assets to load at the beginning
8 years ago
fjc40
e8886d70de
Merge branch 'zoom_in_clipping_fix' into ac35_map_boundary
8 years ago
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.
8 years ago
Connor Taylor-Brown
7e1f6284cc
Gave screen and minimap backgrounds uniform colours
...
#story[1301]
8 years ago
Connor Taylor-Brown
246d6bcc71
CSS now works on startup
...
#story[1301]
8 years ago
zwu18
20ae978664
Merge branch 'story1301-start' into custom_buttons
8 years ago
hba56
a8cd7755b8
color fix for multiple boats
...
#story[1306]
8 years ago
Connor Taylor-Brown
f2a0f56cf0
Merge remote-tracking branch 'remotes/origin/boat_speed_issue_54' into ac35_map_boundary
8 years ago
Connor Taylor-Brown
4415a501be
Merge remote-tracking branch 'remotes/origin/minimap_crash_first_leg' into ac35_map_boundary
8 years ago
Jessica Syder
9bb0fa6833
Arrows, Buttons and Title styling added to map selection.
...
- a title added
- some images made transparent
- basic css styling
- some colours added
#story[1301]
8 years ago
hba56
1783e73caf
color fix for first leg
...
#story[1306]
8 years ago
Jessica Syder
0659bc64c8
Arrows, Buttons and Title styling added to map selection.
...
- a title added
- some images made transparent
- basic css styling
- some colours added
#story[1301]
8 years ago
Connor Taylor-Brown
315bb64bb3
Boat on start screen now follows infinite loop
...
- Removed non-resizable property on TitleController
#story[1301]
8 years ago
zwu18
95465285f4
Created custom buttons. #story[1301]
8 years ago
fjc40
c7f59b73d5
Expanded the boundary for ac35MapLayout.xml slightly.
...
Fixes issue #63
8 years ago
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
8 years ago
fjc40
abfa3ea863
Race now uses a 1 for timescale, which effectively disables time/speed scaling.
8 years ago
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
8 years ago
Fraser Cope
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
fjc40
5ea4200e67
Some javadoc warning fixes.
8 years ago
hba56
7b5460abc5
info full screen map shows on top of hud
...
#story[1306]
8 years ago
hba56
2ac3bad6e1
info table shows on top of hud
...
#story[1306]
8 years ago
hba56
4e8f1a2b19
Placed the waypoint arrow in the HUD
...
#story[1306]
8 years ago
David Wu
1a672e8ac8
Merge branch 'master' into story1292_hp_punish
8 years ago
hba56
2f6fa73349
Merge remote-tracking branch 'remotes/origin/master' into raceView_UI
8 years ago
Hamish Ball
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
Joseph Gardner
7ac181f33d
Fixed null pointer when race finishes #story[1299]
8 years ago
Joseph Gardner
13f3f595d2
Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction
8 years ago
Joseph Gardner
5eeb65ad41
Merge branch 'raceLength' into 'master'
...
Race length
AC's:
- Scale map to selected duration of user
See merge request !64
8 years ago
Joseph Gardner
08c097f153
Merge remote-tracking branch 'origin/issue61_manual_connection_fix' into story1299_next_mark_direction
8 years ago
Joseph Gardner
6e913d6c45
Merge remote-tracking branch 'origin/third-person-default' into story1299_next_mark_direction
8 years ago
Connor Taylor-Brown
73bffb35e3
Removed stutter
8 years ago
Joseph Gardner
ea1170a48e
Merge remote-tracking branch 'origin/master' into raceLength
8 years ago
hba56
173b4444da
Placed the wind arrow in the HUD
...
#story[1306]
8 years ago
hba56
fc267a6a49
Merge remote-tracking branch 'remotes/origin/master' into raceView_UI
...
# Conflicts:
# racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
8 years ago
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
8 years ago
David Wu
48e7b6970c
Merged master in. Added documentation. #story[1292]
8 years ago
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
8 years ago
Joseph Gardner
26e2035ea2
Changed 3d arrow to point downwards #story[1299]
8 years ago
Fan-Wu Yang
8120b1bbab
Upgraded marks and how to look rounded #story[1299]
8 years ago
zwu18
416eb1e6bf
On death a menu will pop up telling the user he is dead. #story[1292]
8 years ago
Joseph
569204b771
New skin for 2d next mark arrow. #story[1299]
8 years ago
Joseph
699df2e775
Using new arrow / arrow textures. Made sails not clickable.
8 years ago
zwu18
1b8fa59f0e
Having 0 hp now removes the boat from being an active boat. #story[1292]
8 years ago
Joseph
affbb69029
Merge remote-tracking branch 'origin/story1299_next_mark_direction' into story1299_next_mark_direction
8 years ago
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
8 years ago
Connor Taylor Brown
666e9d0ad9
Merge branch 'story_speedometer' into 'master'
...
Story speedometer
AC's:
-Current speed of boat is displayed on the race UI
-Current placing of boat is displayed
See merge request !62
8 years ago
zwu18
ba82328c42
Removed souts for speedometer. #story[1311]
8 years ago