63fbffdbc1
lots of trying seagull stuff but translate y doesn't want to work for some stupid reason.
8 years ago
b48b83ab8e
single mark rounding arrow now works
8 years ago
1b6197e0ac
removed some files for seng teams sanity sake and moved the seasurface down a bit.
8 years ago
8a6997f29b
Merge branch 'master' into new_3d_assets
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
8 years ago
c1422d9a98
Changed Sea Surface to new Sea Surface and optimised some assets to load at the beginning
8 years ago
1a672e8ac8
Merge branch 'master' into story1292_hp_punish
8 years ago
13f3f595d2
Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction
8 years ago
ea1170a48e
Merge remote-tracking branch 'origin/master' into raceLength
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
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
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
f4001e0ae3
Added visual display when boat dies. Added sound when boat dies. #story[1311]
8 years ago
d599df3901
Merge branch 'master' into raceLength
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/Event.java
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
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
a14307a6bf
Merge branch 'master' into story1297_sails
8 years ago
76dff8009c
Removed countdown timer from lobby screen.
8 years ago
f9f5cfef7d
Chanegd next mark arrow to fit with new UI. #story[1299]
8 years ago
20702f352b
Lobby start button is hidden/disabled by default, to avoid it being visible to non-host clients for a split seconds while loading screen.
8 years ago
6d55168c61
Added Textures to boats as well as added texture to arrow #story[1306]
8 years ago
45ba3ae6ac
Added 3D wind arrow and it also rotates #story[1306]
8 years ago
3a966fa6b8
Reworked visual displays for low hp boats. There is now a warning indication under boats that drop below 20hp. TODO: Create sfx and different display when boat is in critical hp/dead. #story[1292]
8 years ago
12b7d10f24
Merge branch 'master' into story1297_sails
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
8 years ago
f1c1fc7063
Race length is affected by slider value.
...
- modified constructor of a race event to take in a scale value
- race is scaled according to minutes selected on the slider
- applied minimal css styling
- playing around with more styling options
- bug exists with 1 minute races, to be fixed
#story[1323]
8 years ago
da901d6e0c
Merge remote-tracking branch 'origin/master' into game_start_button_1352
8 years ago
612b4b455e
Added start button for host on the ingameLobby screen.
...
#story[1352]
8 years ago
c527ad0c52
Forgot to add image file. #story[1292]
8 years ago
45eb557256
Displaying visual effect with imageview. #story[1292]
8 years ago
819cdc49ab
Created a slider on the Host Game screen.
...
- slider has min and max minutes
- a label is updated as the slider is moved
- the value of the slider selection is saved
- slider resizes appropriately with the window
#story[1323]
8 years ago
bf6282c697
3D arrow added for zoomed view. Shows relative direction to mark. #story[1299]
8 years ago
1946bfd658
Added audio indication when the user boat is low on hp. Audio rate changes when hp is critically low. #story[1292]
8 years ago
16da9e009b
Cherry-picked FXML changes from Development
...
#story[1291]
8 years ago
985f784066
Removed broken stuff from FXML after merge
8 years ago
dc9445a8a6
Merge branch 'master' into story1291-hp
...
# Conflicts:
# racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
8 years ago
4cf9b67db8
Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
8 years ago
91c442e465
Set up architecture for next mark arrow and did a 2d template when the camera is zoomed out. #story[1299]
8 years ago
4242d05279
fixed issue with being unable to click through minimap
...
#story[1295]
8 years ago
cf9acabd97
Boat sails now luff and stay when in the direction of the wind #story[1297]
8 years ago
2389aa361c
Boats sails can luff and are now two piece. #story[1297]
8 years ago
dacaf58271
Merge remote-tracking branch 'remotes/origin/master' into minimap_test
8 years ago
afc42cf2ab
lowered opacity
8 years ago
50125e0151
moved minimap to left so does not overlap with speedo
8 years ago
b0bc7f50f2
Updated FXMLs to add depleting tomato
...
- Tab view now contains health column
- BoatStateCommand now fails silently if command is received before race state is set up
#story[1291]
8 years ago
f7d866144a
Map now only shows annotations when in full screen
...
#story[1295]
8 years ago
Fan-Wu Yang
David Wu
Joseph Gardner
fjc40
Jessica Syder
Connor Taylor-Brown
hba56