Connor Taylor-Brown
246d6bcc71
CSS now works on startup
...
#story[1301]
8 years ago
Connor Taylor-Brown
315bb64bb3
Boat on start screen now follows infinite loop
...
- Removed non-resizable property on TitleController
#story[1301]
8 years ago
Connor Taylor-Brown
4f229ad01c
Implemented basic 3D start screen with no background race
...
#story[1301]
8 years ago
Connor Taylor-Brown
51413257b2
Modified title screen to use View3D with skybox and ambient lighting
...
#story[1301]
8 years ago
Connor Taylor Brown
49c08f5687
Merge branch 'story1298_boat_highlight' into 'master'
...
Story1298 - Boat highlighting
ACs:
- Current players boat is highlighted
See merge request !56
8 years ago
Joseph
322d7b38b6
Merge remote-tracking branch 'origin/master' into story1298_boat_highlight
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
8 years ago
hba56
dacaf58271
Merge remote-tracking branch 'remotes/origin/master' into minimap_test
8 years ago
hba56
afc42cf2ab
lowered opacity
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
30087ed9bd
Merge branch 'master' into newHostServer
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
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
hba56
f7d866144a
Map now only shows annotations when in full screen
...
#story[1295]
8 years ago
Joseph Gardner
a82d3081fc
Replace the class use of highlight with shockwave. #story[1298]
8 years ago
Joseph Gardner
9fbd5df626
Highlighting no longer goes over other boats. Player boat is highlighted in lobby. #story[1298]
8 years ago
Joseph Gardner
3ca62e6c2b
Added basic highlighting to player boat. #story[1298]
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
hba56
f3f60acac6
resize map
8 years ago
hba56
731be68831
test for a minimap
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
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
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
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
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
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
004aebceb5
fix null pointer when playing tutorial
8 years ago
cbt24
02b4146fa3
Amended collision effect radius
...
#story[1195]
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
fjc40
43a1fbcb64
Spectate mode can be selected by clients when they join a game.
...
#story[1194]
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
afd923c9fb
Revert "Appears to fix wind arrow direction."
...
This reverts commit 8e6a720558 .
8 years ago
Connor Taylor-Brown
f2370485a0
RaceController can now set up collision listeners on each boat.
...
#story[1195]
8 years ago