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
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
088e73414b
Fixed small bug where the sail never stopps jittering after moving #story[1297]
8 years ago
2b8ca9265f
Sails now slowly spin to the correct position #story[1297]
8 years ago
ff59f7ff9c
Added a new hud for the race view
...
#story[1301]
8 years ago
bb24e13387
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
7418f7b4e6
adding new assets for race view hud
...
#story[1301]
8 years ago
c43633f197
Merge branch 'master' into raceView_UI
8 years ago
67779eb9ad
Same changes to dev. #story[1311]
8 years ago
64ae01113a
Added delay for position update. This fixes fps issue. #story[1311]
8 years ago
d3a6b82031
Commit before checking out developement
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
908f31bcde
Merge branches 'master' and 'zoomzoom' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into zoomzoom
8 years ago
0b02727bf1
Set limits and more appearance changes for speedometer. #story[1311]
8 years ago
49c08f5687
Merge branch 'story1298_boat_highlight' into 'master'
...
Story1298 - Boat highlighting
ACs:
- Current players boat is highlighted
See merge request !56
8 years ago
86fc911f98
Minor changes to improve look of third person view.
...
#story[1312]
8 years ago
62535720d4
Removed commented out code.
...
#story[1312]
8 years ago
fa6543a713
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into zoomzoom
8 years ago
1ecd2dd7b6
Zooming motion is more natural.
...
- added limits for zoom in, zoom out and when to change to birds eye
- zooming smoothed by adjusting pitch each zoom
- when zoom out limit is reached, view returns to original
#story[1312]
8 years ago
e2ea6a5f03
Fixed issue with speedometer and sails interaction. #story[1311]
8 years ago
1b4b980081
Exponentially decrease speed as boat loses health
...
- Boat halves in speed after 90% health loss
#story[1291]
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
322d7b38b6
Merge remote-tracking branch 'origin/master' into story1298_boat_highlight
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
8 years ago
b1657e8bfc
Merge branch 'minimap_test' into 'master'
...
Minimap
AC's:
-Minimap of current map with player boats is shown
-Boats and marks are shown on the minimap
-Minimap can be minimized and maximised
-Some annotations displayed on maximised minimap
See merge request !55
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
2cf0cca157
Can no longer click around the boat highlighting. #fix #story[1298]
8 years ago
5473fde731
Merge remote-tracking branch 'remotes/origin/master' into story1291-hp
8 years ago
eee0b414f8
made trackpoints cap at 50. This fixes fps issues with the minimap. #fix #story[1295]
8 years ago
6c78e5d0b5
Tomato now depletes as expected
...
#story[1291]
8 years ago
cf9acabd97
Boat sails now luff and stay when in the direction of the wind #story[1297]
8 years ago
c9177da85c
Deleted another dead line #story[1297]
8 years ago
ed11f7d56c
forgot to removed a dead line #story[1297]
8 years ago
2389aa361c
Boats sails can luff and are now two piece. #story[1297]
8 years ago
10008f5452
Depleting tomato now watches player health
...
- [BUG] Tomato fills up instead of depleting
#story[1291]
8 years ago
add1d3996d
Set map colour back to a lighter colour as it didnt work as well on lower grade monitors
...
#story[1195]
8 years ago
dacaf58271
Merge remote-tracking branch 'remotes/origin/master' into minimap_test
8 years ago
951c3771fa
Merge branch 'newHostServer' into 'master'
...
Nullptr finish race arrow + race xml issues + Host Discovery + Scaling Race
Acceptance Criteria:
When a game starts I should see it reflected in the host lobby within 5 seconds.
When a game ends it should not remain in the host lobby for more than 5 seconds.
Changing the windspeed and the milliseconds value on Event.java line 124 should make the race larger or smaller.
This should fix the race xml issues where the player didn't have a boat / last player joining not seeing their boat. Somehow the client was receiving xml files out of order, and it didn't check the order, so it would use race xml file 1, then replace it with race xml file 0, which was out of date.
See merge request !54
8 years ago
b787b5a71b
changed map to dodgerblue
8 years ago
afc42cf2ab
lowered opacity
8 years ago
1ffef51d7c
Changed local ip detection to use regex
8 years ago
David Wu
fjc40
Jessica Syder
Joseph
Fan-Wu Yang
hba56
Connor Taylor Brown