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
915d61b9f3
Map can be zoomed out in birds eye view only to a specified distance.
...
#story[1312]
8 years ago
ab49d62c0d
Map can be zoomed in / out at all times.
...
- map can be zoomed when object is not selected
#story[1312]
8 years ago
34789ce3b5
mailmap
8 years ago
327c052b1d
Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction
8 years ago
9212ec91f0
mailmap
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
e64e6ddbdb
Boat scaling is correct.
...
- scaling changes as a user zooms in or out to
- 3rd person view defaults to life size scale
#story[1312]
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
d280c0bdae
Merged master and added a few comments
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
4f229ad01c
Implemented basic 3D start screen with no background race
...
#story[1301]
8 years ago
51413257b2
Modified title screen to use View3D with skybox and ambient lighting
...
#story[1301]
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
45b2f0b6db
Created more fire instances. #story[1292]
8 years ago
46192af628
Race now has a 10 minute delay before starting (which is increased whenever it falls below 5 minutes).
...
The start button (visible to host) starts the race in whatever the prepatory time is.
#story[1352]
8 years ago
1070842ada
Fire is now rotated and standing up-write. Found problem with fire not being directly on the boat. #story[1292]
8 years ago
4f838a3598
Fire follows boat. TODO: rotate fire. #story[1292]
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
Fan-Wu Yang
zwu18
Hamish Ball
Jessica Syder
Joseph
fjc40
Connor Taylor-Brown