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
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
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
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
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
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
eee0b414f8
made trackpoints cap at 50. This fixes fps issues with the minimap. #fix #story[1295]
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
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
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
ac5423263c
Merge remote-tracking branch 'origin/scale_maps_spike' into newHostServer
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
Jessica Syder
fjc40
Joseph
Fan-Wu Yang
hba56
zwu18
Connor Taylor Brown