fjc40
|
ae9594f8c3
|
Removed a println and fixed some javadoc warnings.
|
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 |
|
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
|
4c52673fc1
|
javadoc fixes
#story[1188]
|
8 years ago |
Connor Taylor-Brown
|
83e696b79e
|
Committed merge-related bug fixes
|
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 |
|
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 |
|
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 |
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 |
