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
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
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
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
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
327c052b1d
Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction
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
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
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
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
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
50125e0151
moved minimap to left so does not overlap with speedo
8 years ago
ffa1d8b0c4
Deleted Print Statement
8 years ago
52271d580f
CHanged ip to local ip because port forwarding may be subjective to change.
8 years ago
3d292f784b
Users can now resee the lobby after exit and reentering, and fixed concurrent alteration issue which was stopping players from exiting the lobby.
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
fec421da00
Removed println messages
8 years ago
30087ed9bd
Merge branch 'master' into newHostServer
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
8 years ago
3c9e520d9f
Merged in null pointer issue.
8 years ago
bb0c1d1780
Merge branch 'nullptr_finish_race_arrow' into newHostServer
8 years ago
b0857debeb
Merge remote-tracking branch 'origin/nullptr_finish_race_arrow' into newHostServer
8 years ago
b550afcca7
Merged race scaling with Http Match Discovery.
8 years ago
23040ecff4
Created separate listeners for all boats' and player boat health
...
#story[1291]
8 years ago
ac5423263c
Merge remote-tracking branch 'origin/scale_maps_spike' into newHostServer
8 years ago
0d89574c1f
RaceViewController listens to health changes on the local player's boat
...
#story[1291]
8 years ago
7eb59cdcfc
Allowed fractional health deductions per frame
...
- Fixed boundary penalty system
#story[1291]
8 years ago
50d5dd02a2
BoatState message can be received from mock by visualiser
...
- Basic penalties have been made for out of bounds and collisions
- RaceServer packages and sends BoatState messages for each boat
- ServerConnection routes BoatState messages instead of dropping by default
- VisualiserRaceCommandFactory produces BoatStateCommands
#story[1291]
8 years ago
a295728e89
Created encoder and decoder for BoatState messages (HP packets)
...
- Added new MessageType.BOATSTATE enum to support new message type
- Modified EncoderFactory and DecoderFactory to support new enum
- Verify that original and decoded messages match
#story[1291]
8 years ago
f7d866144a
Map now only shows annotations when in full screen
...
#story[1295]
8 years ago
4132b6733b
Fixed small display error with current position. #story[1311]
8 years ago
051811b97d
Merge branch 'master' into story_speedometer
8 years ago
be9feff6fd
Layout changes to speedometer UI. #story[1311]
8 years ago
201b9f0051
Linked users boat speed up with speedometer UI. #story[1311]
8 years ago
zwu18
Fan-Wu Yang
Joseph
fjc40
Jessica Syder
hba56
Connor Taylor Brown