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
Connor Taylor-Brown
f2370485a0
RaceController can now set up collision listeners on each boat.
...
#story[1195]
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
Connor Taylor-Brown
b8c4582d2a
Replaced mark arrow listener with animation timer.
...
#story[1195]
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
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
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
59bd22c2aa
Fixed mark rounding
...
- Returning mark 2 as mark 1 breaks rounding calculations
#story[1195]
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
Connor Taylor-Brown
b902b05e5e
Wrote possible fix for issue #50 (Composite command tries to remove non-existent element)
8 years ago
Connor Taylor-Brown
d90b161d01
Merge branch 'master' into storyA_sounds
...
# Conflicts:
# racevisionGame/src/main/java/mock/model/RaceServer.java
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/java/visualiser/Controllers/MainController.java
# racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
8 years ago
Joseph
49cd19e1a8
Made and textured a skybox, still needs to be fixed on two sides. #story[1261]
8 years ago
zwu18
fc9a4898d6
Made changes based on DoD review. Class documentation and commenting added. Removed annotation features. Removed sout commands. #story[1189]
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
David Wu
b976186c7d
Merged current master in. Made changes to classes so tutorial again due to merge. #story[1189]
8 years ago
David Wu
c97706d86e
Merge branch 'master' into story70
...
# Conflicts:
# dedicatedServer/src/main/java/app/App.java
# racevisionGame/src/main/java/mock/app/Event.java
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/resources/mock/mockXML/raceThreePlayers.xml
8 years ago
Fan-Wu Yang
ae75bb86d3
Resized models to a similar size of the collision detectors. #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
David Wu
c6594a0e20
Tutorial text now displays on screen when in tutorial. #story[1189]
8 years ago
David Wu
9a96131a33
Fixed issue where wind arrow, accordion, time, etc. were not being displayed. Fixed issue where zooming would crash when done outside of tutorial. #story[1189]
8 years ago
David Wu
bad6422ca9
Implemented tutorial for zooming as it was left out from the last commit. Refactored updating tutorial state. #story[1189]
8 years ago
David Wu
d2d5ae62eb
Tutorial states implemented and working. Game currently prints to terminal the "tutorial text". Next step is to create display on application for these text. Game ends when tutorial ends. Fixed game not loading xml issue. #story[1189]
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
David Wu
28ec4b9246
Merge branch 'master' into story70
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
# racevisionGame/src/main/java/visualiser/app/App.java
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
ea1594a839
Merge remote-tracking branch 'remotes/origin/master' into Story_76
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/resources/visualiser/scenes/hostgame.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
Fan-Wu Yang
5bc382304b
Created and linked up bouy to race, and added keybindings to git ignore #story[1196]
8 years ago
Connor Taylor-Brown
b034a452b6
Fixed problem with race pane registering non-control keys
...
#story[1190]
8 years ago
Connor Taylor-Brown
68f434b6b6
Bound zooming action to zoom keys
...
- View3D subject selection is no longer enabled by default
- Added documentation
#story[1190]
8 years ago
Connor Taylor-Brown
1efec06bdc
View3D can untrack objects and zoom in different modes
...
- updateDistance zooms between 0 and infinity
- Camera switches from third person to bird's eye when reaching a set distance
- Only one subject can be tracked at a time
#story[1190]
8 years ago
Joseph Gardner
d2c8ccd98e
Course image for a type M2 course has been made. #story[1193]
8 years ago
Joseph Gardner
3157ac88b5
Course layout for a type M2 course has been made. #story[1193]
8 years ago
Connor Taylor-Brown
23eabed3ff
View3D tracks selected boat at fixed distance, pitch, and relative yaw
...
#story[1190]
8 years ago
Connor Taylor-Brown
b59eca1a8b
Added Subject3D selection to View3D
...
- Changed how View3D is added to canvasBase to allow events to get through
#story[1190]
8 years ago
Connor Taylor-Brown
54baf4f884
Added scroll-wheel zooming
...
- Race pane listens to scroll delta and sets View3D distance accordingly
- GPSConverter has more applicable property names for infinite 3D
#story[1190]
8 years ago