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
8120b1bbab
Upgraded marks and how to look rounded #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
affbb69029
Merge remote-tracking branch 'origin/story1299_next_mark_direction' into story1299_next_mark_direction
8 years ago
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
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
ba82328c42
Removed souts for speedometer. #story[1311]
8 years ago
f4001e0ae3
Added visual display when boat dies. Added sound when boat dies. #story[1311]
8 years ago
1ca276ec62
Fixed some issue after merge as well as set the minimum race time to 2 minutes. #story[1323]
8 years ago
d6884a6981
Deprecated a method that shouldn't be used but is still being used, and merged in most recent master #story[1323]
8 years ago
d599df3901
Merge branch 'master' into raceLength
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/Event.java
8 years ago
a33583d67d
Fixed racescaling a mark twice and removed println statements #story[1323]
8 years ago
11d6d3a880
Documentation added. Master merged. #story[1311]
8 years ago
1d95004811
Merge branch 'master' into story_speedometer
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
8 years ago
e53d7d894b
Warning sound added. Sound synced with visual display. #story[1292]
8 years ago
5ed1bc1737
Merge branch 'story1306_wind_arrow' into 'master'
...
Story1306 wind arrow
AC's:
-Re-vamp current wind arrow to be a new 3D arrow
-Arrow moves depending on the view of the race
See merge request !61
8 years ago
967bdb394f
Merged in master and realigned center of the boat #story[1306]
8 years ago
cd99492467
Merge branch 'master' into story1306_wind_arrow
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/layout/Assets3D.java
8 years ago
7d3ec940eb
Merge branch 'story1297_sails' into 'master'
...
Story1297 sails && sails in and out collision issue
ACs:
+ Boats stop / slow after colliding when their sails are out
+ Boats with sails out and are slowing down can still collide
+ Visual representation of the sails
+ Sails are angled to depending on the wind
See merge request !60
8 years ago
3f04485b78
Added manual connections works while also receiving available games from the server. #story[1352]
8 years ago
5ebee27baa
Merge remote-tracking branch 'origin/master' into issue61_manual_connection_fix
8 years ago
980d1d7977
Merge remote-tracking branch 'origin/issue58_sails_collision_fix' into story1297_sails
8 years ago
a14307a6bf
Merge branch 'master' into story1297_sails
8 years ago
13e0b4bd5c
Merge branch 'game_start_button_1352' into 'master'
...
Game start button 1352
AC's:
- Host can start a race on button press
- The race doesn't start until start button is pressed.
- Non-hosts can't start the race.
See merge request !58
8 years ago
76dff8009c
Removed countdown timer from lobby screen.
8 years ago
9763150e85
Merge remote-tracking branch 'origin/master' into game_start_button_1352
8 years ago
3007fe1ee5
Everyone has a single email address according to mailmap
8 years ago
8e4f7e8b04
Fixed mailmap
8 years ago
9da0d238c2
Removed printlns ready for DoD
8 years ago
44268cc30b
Fixed not being able to add custom connections. Still need to test if it works with the http match browser (can't test it atm. #story[1352]
8 years ago
6cfb076fef
Merge branch 'master' into story1297_sails
8 years ago
a1b6de5638
Merge branch 'master' into story1306_wind_arrow
8 years ago
eca921cb11
Removed println's ready for DoD
8 years ago
7d789c04bb
Fixed sails out / colliding issue. #story[1297]
8 years ago
332722e099
Attempt to fix sails in / out colliding issue. Going to test on dev for a better visual representation. #story[1297]
8 years ago
f9f5cfef7d
Chanegd next mark arrow to fit with new UI. #story[1299]
8 years ago
5a1dbc83b5
Merge branch 'zoomzoom' into 'master'
...
Zoomzoom
As a player I want to see a natural zoom motion
AC's:
-Upper limit of camera will always reset to the centre of the race
-Camera motion doesn't snap and will move smoothly
Note: it 'snaps' when returning to the original view when not following a boat, as intended (think google maps), but each zoom key press is not 'snapped'.
See merge request !57
8 years ago
Joseph Gardner
Connor Taylor-Brown
hba56
David Wu
Fan-Wu Yang
Jessica Syder
fjc40