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
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
hba56
86de4e7c0c
Merge remote-tracking branch 'origin/master'
8 years ago
hba56
004aebceb5
fix null pointer when playing tutorial
8 years ago
cbt24
02b4146fa3
Amended collision effect radius
...
#story[1195]
8 years ago
David Wu
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
cbt24
7d58b05e38
Fixed collision not fading to zero
...
#story[1195]
8 years ago
cbt24
cdc7b642db
Boat now shows a fading collision effect
...
#story[1195]
8 years ago
Fan-Wu Yang
f541a13235
Tried to get lobby working #story[1188]
8 years ago
Joseph Gardner
1166c0a4fb
Merged sounds. #story[1196]
8 years ago
David Wu
550180f286
Removed countdown pane.
8 years ago
Joseph Gardner
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
Joseph Gardner
c23fcfcaa3
new skybox textures. Still need to fix two planes having a small gap between them. #story[1196]
8 years ago
hba56
083eb5a4bc
updated race view that does not use a split pane
8 years ago
fjc40
b59d36f4e5
Actually fixed the wind arrow direction.
8 years ago
fjc40
afd923c9fb
Revert "Appears to fix wind arrow direction."
...
This reverts commit 8e6a720558 .
8 years ago
hba56
87f3265640
pushed branch
...
#story[1195]
8 years ago
Connor Taylor-Brown
f2370485a0
RaceController can now set up collision listeners on each boat.
...
#story[1195]
8 years ago
fjc40
e0278fdb85
Merge remote-tracking branch 'origin/master' into wind_arrow_direction_5
8 years ago