Fan-Wu Yang
2389aa361c
Boats sails can luff and are now two piece. #story[1297]
8 years ago
Fan-Wu Yang
1ffef51d7c
Changed local ip detection to use regex
8 years ago
Fan-Wu Yang
ffa1d8b0c4
Deleted Print Statement
8 years ago
Fan-Wu Yang
52271d580f
CHanged ip to local ip because port forwarding may be subjective to change.
8 years ago
Fan-Wu Yang
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
Fan-Wu Yang
fec421da00
Removed println messages
8 years ago
Fan-Wu Yang
30087ed9bd
Merge branch 'master' into newHostServer
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
8 years ago
Fan-Wu Yang
3c9e520d9f
Merged in null pointer issue.
8 years ago
Fan-Wu Yang
bb0c1d1780
Merge branch 'nullptr_finish_race_arrow' into newHostServer
8 years ago
Fan-Wu Yang
b0857debeb
Merge remote-tracking branch 'origin/nullptr_finish_race_arrow' into newHostServer
8 years ago
Fan-Wu Yang
b550afcca7
Merged race scaling with Http Match Discovery.
8 years ago
Fan-Wu Yang
ac5423263c
Merge remote-tracking branch 'origin/scale_maps_spike' into newHostServer
8 years ago
fjc40
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
hba56
d3f1e3baa4
Merge remote-tracking branch 'remotes/origin/master' into spectate_mode_basic
8 years ago
Fan-Wu Yang
928f5e31f0
Hopefully final version of Hosting #story[1188]
8 years ago
Fan-Wu Yang
f7da497743
Resizing maps to time taking now works #story[1323]
8 years ago
fjc40
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
fjc40
acd99f58cd
Merge remote-tracking branch 'origin/master' into nullptr_finish_race_arrow
8 years ago
Fan-Wu Yang
9d1145b298
Changed back to CI IP to test on CI
8 years ago
fjc40
75c15d492e
There was a null pointer exception when finishing the race, as the finish leg doesn't have compound marks.
8 years ago
fjc40
eacbe8d8ea
Merge remote-tracking branch 'origin/master' into boat_movement_smooth
8 years ago
Fan-Wu Yang
0348b0c642
Merged in master
8 years ago
Fan-Wu Yang
c91c4e5d7c
Merge branch 'master' into network_on_VPS
8 years ago
Fan-Wu Yang
4970f52c3a
Merge remote-tracking branch 'origin/master' into network_on_VPS
8 years ago
Fan-Wu Yang
34a803f92e
More changes
8 years ago
Fan-Wu Yang
22e9db473e
Removed test that took a manditory socket
8 years ago
fjc40
2c92102b2a
Changed GraphCoordinate to use double instead of int.
...
This results in waaaaay smoother movement. Boats no longer jump around.
8 years ago
fjc40
191f249bfb
Speed scale is 2, rather than 10.
...
Server simulates frames every 16ms rather than 50ms.
8 years ago
fjc40
5c58ca11ff
Boats use their assigned color.
...
Boat name is displayed in lobby instead of source ID.
8 years ago
fjc40
eb2ed45ed2
Merge branch 'master' into spectate_mode_basic
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
8 years ago
hba56
e0d886ffb2
overlay off by default
...
#story[1195]
8 years ago
hba56
3131d67cf2
Merge remote-tracking branch 'remotes/origin/master' into scoreTable
8 years ago
fjc40
ae9594f8c3
Removed a println and fixed some javadoc warnings.
8 years ago
fjc40
47d013612a
Fix for null pointer exception when finishing race.
8 years ago
hba56
88f1a393f2
Made the info tab into an overlay
...
#story[1195]
8 years ago
fjc40
24b068f249
Collision effect uses color.transparent instead of a custom transparent color.
8 years ago
fjc40
536428ce16
There was a null pointer exception related to going into/leaving third person camera and the arrow annotation.
8 years ago
fjc40
f308f5b8f3
Visualiser model thread was updating GUI instead of fx thread.
8 years ago
Connor Taylor-Brown
8d9624db96
Recovered sails smoothing
...
- Boat default position is now overridden only by collision command
- Sails command overrides boat velocity
#story[1195]
8 years ago
Connor Taylor-Brown
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
hba56
c17900a461
Merge remote-tracking branch 'remotes/origin/master' into scoreTable
8 years ago
David Wu
e345ecdec1
Removed sout statements.
8 years ago
Joseph Gardner
f794aec4c8
boundaries are annotations.
8 years ago
Joseph Gardner
7fa2037753
Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D
8 years ago
Fan-Wu Yang
2383915c78
Merged #story[1195]
8 years ago
Joseph Gardner
c42e25df86
Merge branch 'master' into storyD-3D
8 years ago
Joseph Gardner
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
Fan-Wu Yang
d70f556741
Changed arrow to next mark appearance #story[1195]
8 years ago
Joseph Gardner
7bea2fee73
Merge branch 'storyA_sounds' into storyD-3D
8 years ago
Joseph Gardner
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