Fan-Wu Yang
45ba3ae6ac
Added 3D wind arrow and it also rotates #story[1306]
8 years ago
Fan-Wu Yang
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
Joseph
2cf0cca157
Can no longer click around the boat highlighting. #fix #story[1298]
8 years ago
Fan-Wu Yang
cf9acabd97
Boat sails now luff and stay when in the direction of the wind #story[1297]
8 years ago
Fan-Wu Yang
c9177da85c
Deleted another dead line #story[1297]
8 years ago
Fan-Wu Yang
ed11f7d56c
forgot to removed a dead line #story[1297]
8 years ago
Fan-Wu Yang
2389aa361c
Boats sails can luff and are now two piece. #story[1297]
8 years ago
Joseph Gardner
a82d3081fc
Replace the class use of highlight with shockwave. #story[1298]
8 years ago
Joseph Gardner
cfdbf5896f
Added basic highlighting to player boat. #story[1298]
8 years ago
fjc40
ae9594f8c3
Removed a println and fixed some javadoc warnings.
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
Joseph Gardner
f794aec4c8
boundaries are annotations.
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
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
cbt24
02b4146fa3
Amended collision effect radius
...
#story[1195]
8 years ago
cbt24
cdc7b642db
Boat now shows a fading collision effect
...
#story[1195]
8 years ago
Joseph Gardner
1166c0a4fb
Merged sounds. #story[1196]
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
Connor Taylor-Brown
e354320d74
Replaced camera tracking listeners with animation timer
...
- Documented animation timers and mark arrow
#story[1195]
8 years ago
Fan-Wu Yang
1b946b6807
Removed/commented out unecessary print messages #story[1188]
8 years ago
hba56
4c52673fc1
javadoc fixes
...
#story[1188]
8 years ago
cbt24
de9f4e22eb
Direction to mark arrow is now displayed relative to camera
...
#story[1195]
8 years ago
Connor Taylor-Brown
5f96526fcc
Added "arrow" pointing to next mark on third person view
...
#story[1195]
8 years ago
Connor Taylor-Brown
e657a0cc99
Added tracking for angle between third person boat and next mark
...
#story[1195]
8 years ago
Connor Taylor-Brown
83e696b79e
Committed merge-related bug fixes
8 years ago
Connor Taylor-Brown
70bbc89239
Fixed merge-related bugs
8 years ago
Joseph
0b3ef992bc
Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D
8 years ago
Joseph
253a16a664
Made the sky box use sky box planes they cannot be scaled. #story[1261]
8 years ago
Connor Taylor-Brown
0f846f31c3
Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/layout/SkyBox.java
8 years ago
Connor Taylor-Brown
963c8a43ad
Boats and marks are sized realistically in 3rd person
...
- Changed SeaSurface to Subject3D to suppress scaling
- Cameras can now be selected through View3D interface
#story[1190]
8 years ago
Joseph
771068966e
Just rotated the images to make them look like the plane is rotated properly... #story[1261]
8 years ago
hba56
4dcff5c009
SeaSurface files have been added to display the surface in the lobby. Surface is now drawn in the lobby
8 years ago
Joseph Gardner
bcc827b554
Added lights and managed to get the orientation of one of the skybox walls correct. #story[1261]
8 years ago
Connor Taylor-Brown
0f316afb3c
Added colour indication to next mark
...
- Colour is swapped with end mark in leg when mark is passed
#story[1195]
8 years ago
Joseph
7a8ea7fea7
Made seasurface overlay to enable skybox to be smaller. #story[1261]
8 years ago
Joseph
49cd19e1a8
Made and textured a skybox, still needs to be fixed on two sides. #story[1261]
8 years ago
Joseph Gardner
0da6931f8f
Have structure for skybox, still need to play around with it a bit more to make it fit. #story[1261]
8 years ago
Fan-Wu Yang
08ca42f786
Wrote some missing java docs #story[1261]
8 years ago
Fan-Wu Yang
9ac9c25923
Made sea surface look like a sea surface which is randomly generated each time, size may need to be altered a bit else it will cause the program to slow #story[1261]
8 years ago
Fan-Wu Yang
a7eefca13a
Work in progress, the perlin noise is now generated, however, a good colour should be selected as well as using a subject3d instead of a imageview #story[1261]
8 years ago
Fan-Wu Yang
e2b868d815
Added boundaries to the map, which are drawn by the race #story[1261]
8 years ago
cbt24
70f4a00d12
Scaled down marks and boats to make 3rd person view more realistic
...
- Added boat and mark annotations to support selection at large camera distance
- Reduced collision radius to 15 m
- Fixed event startup and XML files as race was crashing on start
#story[1296]
8 years ago
hba56
ddc3a6ae47
boxes in lobby are now boats
8 years ago
hba56
e5d8a4028d
Merge remote-tracking branch 'remotes/origin/master' into story77
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/java/visualiser/layout/Subject3D.java
# racevisionGame/src/main/java/visualiser/layout/View3D.java
# racevisionGame/src/main/resources/visualiser/scenes/hostlobby.fxml
8 years ago
cbt24
2508b847b8
Merge branch 'master' into storyD-3D
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
# racevisionGame/src/main/java/visualiser/layout/Subject3D.java
8 years ago
cbt24
643f145407
Added mark radius 3D annotation to improve bird's eye visibility
...
#story[1261]
8 years ago
Connor Taylor-Brown
93883ee8b7
Added more descriptive documentation to new classes and functionality
...
#story[1190]
8 years ago
Fan-Wu Yang
e149255240
Tried to get multiple boats working but.... it's not #story[1196]
8 years ago