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
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
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
eea394372f
Race is now showing a speedometer in the bottom right corner. Next step is to update with speed of boat and improve appearance. #story[1311]
8 years ago
a82d3081fc
Replace the class use of highlight with shockwave. #story[1298]
8 years ago
9fbd5df626
Highlighting no longer goes over other boats. Player boat is highlighted in lobby. #story[1298]
8 years ago
cfdbf5896f
Added basic highlighting to player boat. #story[1298]
8 years ago
3ca62e6c2b
Added basic highlighting to player boat. #story[1298]
8 years ago
db27d673de
Another fix for race xml stuff - the xml was fine, but the data sources would sometimes be overridden by empty ones, due to threading stuff.
8 years ago
d3f1e3baa4
Merge remote-tracking branch 'remotes/origin/master' into spectate_mode_basic
8 years ago
928f5e31f0
Hopefully final version of Hosting #story[1188]
8 years ago
f7da497743
Resizing maps to time taking now works #story[1323]
8 years ago
424cd63c59
Should fix the race xml issues where boats get unassigned sometimes.
...
This removes the static raceServer stuff.
The Race/Boat/Regatta XML commands only execute if they contain newer data (it checks the sequence number).
8 years ago
acd99f58cd
Merge remote-tracking branch 'origin/master' into nullptr_finish_race_arrow
8 years ago
f3f60acac6
resize map
8 years ago
731be68831
test for a minimap
8 years ago
9d1145b298
Changed back to CI IP to test on CI
8 years ago
75c15d492e
There was a null pointer exception when finishing the race, as the finish leg doesn't have compound marks.
8 years ago
eacbe8d8ea
Merge remote-tracking branch 'origin/master' into boat_movement_smooth
8 years ago
0348b0c642
Merged in master
8 years ago
c91c4e5d7c
Merge branch 'master' into network_on_VPS
8 years ago
4970f52c3a
Merge remote-tracking branch 'origin/master' into network_on_VPS
8 years ago
34a803f92e
More changes
8 years ago
22e9db473e
Removed test that took a manditory socket
8 years ago
2c92102b2a
Changed GraphCoordinate to use double instead of int.
...
This results in waaaaay smoother movement. Boats no longer jump around.
8 years ago
191f249bfb
Speed scale is 2, rather than 10.
...
Server simulates frames every 16ms rather than 50ms.
8 years ago
5c58ca11ff
Boats use their assigned color.
...
Boat name is displayed in lobby instead of source ID.
8 years ago
eb2ed45ed2
Merge branch 'master' into spectate_mode_basic
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
8 years ago
e0d886ffb2
overlay off by default
...
#story[1195]
8 years ago
3131d67cf2
Merge remote-tracking branch 'remotes/origin/master' into scoreTable
8 years ago
ae9594f8c3
Removed a println and fixed some javadoc warnings.
8 years ago
47d013612a
Fix for null pointer exception when finishing race.
8 years ago
88f1a393f2
Made the info tab into an overlay
...
#story[1195]
8 years ago
24b068f249
Collision effect uses color.transparent instead of a custom transparent color.
8 years ago
536428ce16
There was a null pointer exception related to going into/leaving third person camera and the arrow annotation.
8 years ago
f308f5b8f3
Visualiser model thread was updating GUI instead of fx thread.
8 years ago
8d9624db96
Recovered sails smoothing
...
- Boat default position is now overridden only by collision command
- Sails command overrides boat velocity
#story[1195]
8 years ago
90c258e9e9
Reset collision tag on visualiser boat after displaying collision
...
- Modified View3D to index subjects rather than shapes by source ID
- Enforced one collision per boat on server to reduce rendering load
- Changed collision radius to less than bounce radius
- Fixed game-breaking null command bug
#story[1195]
8 years ago
c17900a461
Merge remote-tracking branch 'remotes/origin/master' into scoreTable
8 years ago
e345ecdec1
Removed sout statements.
8 years ago
f794aec4c8
boundaries are annotations.
8 years ago
7fa2037753
Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D
8 years ago
2383915c78
Merged #story[1195]
8 years ago
c42e25df86
Merge branch 'master' into storyD-3D
8 years ago
55713f14a1
Merge branch 'master' into storyD-3D
...
# Conflicts:
# .gitignore
# racevisionGame/src/main/java/mock/model/RaceServer.java
# racevisionGame/src/main/java/mock/model/collider/Collider.java
# racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
# racevisionGame/src/main/java/shared/model/Boat.java
# racevisionGame/src/main/java/shared/model/Mark.java
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
# racevisionGame/src/main/java/visualiser/Controllers/MainController.java
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
# racevisionGame/src/main/java/visualiser/layout/Plane3D.java
# racevisionGame/src/main/java/visualiser/layout/SeaSurface.java
# racevisionGame/src/main/java/visualiser/layout/View3D.java
# racevisionGame/src/main/java/visualiser/utils/PerlinNoiseGenerator.java
# racevisionGame/src/main/resources/visualiser/scenes/title.fxml
8 years ago
d70f556741
Changed arrow to next mark appearance #story[1195]
8 years ago
7bea2fee73
Merge branch 'storyA_sounds' into storyD-3D
8 years ago
14b5f4bdf1
Merge branch 'master' into storyD-3D
...
# Conflicts:
# .gitignore
# racevisionGame/src/main/java/mock/model/RaceServer.java
# racevisionGame/src/main/java/mock/model/collider/Collider.java
# racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
# racevisionGame/src/main/java/shared/model/Boat.java
# racevisionGame/src/main/java/shared/model/Mark.java
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
# racevisionGame/src/main/java/visualiser/Controllers/MainController.java
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
# racevisionGame/src/main/java/visualiser/layout/Plane3D.java
# racevisionGame/src/main/java/visualiser/layout/SeaSurface.java
# racevisionGame/src/main/java/visualiser/layout/View3D.java
# racevisionGame/src/main/java/visualiser/utils/PerlinNoiseGenerator.java
# racevisionGame/src/main/resources/visualiser/scenes/title.fxml
8 years ago
86de4e7c0c
Merge remote-tracking branch 'origin/master'
8 years ago
004aebceb5
fix null pointer when playing tutorial
8 years ago
02b4146fa3
Amended collision effect radius
...
#story[1195]
8 years ago
43ee92fb95
Created enums and bound them to zoom in, zoom out and sails toggle for key bindings so that something expected shows up for key binding descriptions when changing key bindings. #story[1197]
8 years ago
7d58b05e38
Fixed collision not fading to zero
...
#story[1195]
8 years ago
cdc7b642db
Boat now shows a fading collision effect
...
#story[1195]
8 years ago
f541a13235
Tried to get lobby working #story[1188]
8 years ago
1166c0a4fb
Merged sounds. #story[1196]
8 years ago
43a1fbcb64
Spectate mode can be selected by clients when they join a game.
...
#story[1194]
8 years ago
550180f286
Removed countdown pane.
8 years ago
7b076f3718
Merge branch 'storyA_sounds' into storyD-3D
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/layout/SeaSurface.java
# racevisionGame/src/main/java/visualiser/layout/SkyBox.java
8 years ago
c23fcfcaa3
new skybox textures. Still need to fix two planes having a small gap between them. #story[1196]
8 years ago
083eb5a4bc
updated race view that does not use a split pane
8 years ago
b59d36f4e5
Actually fixed the wind arrow direction.
8 years ago
afd923c9fb
Revert "Appears to fix wind arrow direction."
...
This reverts commit 8e6a720558
8 years ago
87f3265640
pushed branch
...
#story[1195]
8 years ago
Fan-Wu Yang
Joseph Gardner
Jessica Syder
fjc40
David Wu
Connor Taylor-Brown
hba56