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
c6594a0e20
Tutorial text now displays on screen when in tutorial. #story[1189]
8 years ago
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
bad6422ca9
Implemented tutorial for zooming as it was left out from the last commit. Refactored updating tutorial state. #story[1189]
8 years ago
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
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
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
e2b868d815
Added boundaries to the map, which are drawn by the race #story[1261]
8 years ago
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
ddc3a6ae47
boxes in lobby are now boats
8 years ago
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
ae8fa312a3
removed sout and added a longer startup time. Also fixed race xmls to remove set boats
8 years ago
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
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
643f145407
Added mark radius 3D annotation to improve bird's eye visibility
...
#story[1261]
8 years ago
14aaf26b73
Merge branch 'story40-zoom' into 'master'
...
40. [V] As Caleb or Gemma I'd like to zoom the view to follow a boat (my boat) around the course (revised).
Note: in this story we will select a boat and zoom the view to place the boat at the center of a display that shows only the boat's immediate surrounds. The default option will be to zoom on the player's boat.
Acceptance criteria:
- Any particular boat can be chosen (at any time during the race.)
- When a boat is selected for zooming, the view should change to show the boat at the center, with the scale of the view increased.
- The view should remain this way until the boat is unselected, at which point it should revert to the usual display.
- Other information (e.g., the position list) may be removed from the zoomed view.
- Zoomed view follows selected boat as a third person mode
- There must be a keyboard option to zoom in on the player's boat_
- The zoom amount can be fixed (jump between zoom in and zoom out) or scrollable (like control-mousewheel scrolling.)
See merge request !38
8 years ago
1ed7ccf146
Minor changes preparing to merge in 3D
...
#story[1261]
8 years ago
93883ee8b7
Added more descriptive documentation to new classes and functionality
...
#story[1190]
8 years ago
6a302841c0
Minor changes preparing to merge in 3D
...
#story[1261]
8 years ago
0dff85006a
Changes to code to use new controller structure.
...
- renamed javadoc referencing old controllers
- keybindings no longer need to be static
- finished lobby and lobbyhost controllers
#story[1261]
8 years ago
e149255240
Tried to get multiple boats working but.... it's not #story[1196]
8 years ago
5bc382304b
Created and linked up bouy to race, and added keybindings to git ignore #story[1196]
8 years ago
5e516b0508
re added the standard race
...
#story[1193]
8 years ago
a5050b8ea8
Adding back lost changes and finishing splitting last controllers.
...
- renamed fxml and their controllers to match
- removed old controllers
- finished lobby and lobbyhost controllers
#story[1261]
8 years ago
4c2ab9cc9a
Merge branch 'master' into story77
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/Event.java
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/java/visualiser/model/View3D.java
8 years ago
0c9e55093c
Set lobby anchor pane to invisible to allow races to start
8 years ago
a5d3434a70
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/MainController.java
8 years ago
4780354452
Errors in this commit: mock threads get interrupted
...
#story[#1188 ]
8 years ago
b034a452b6
Fixed problem with race pane registering non-control keys
...
#story[1190]
8 years ago
2868f921e2
Only one angular command can be active at a time. Only one velocity command can be active at a time. #story[1196]
8 years ago
68f434b6b6
Bound zooming action to zoom keys
...
- View3D subject selection is no longer enabled by default
- Added documentation
#story[1190]
8 years ago
df624a8437
Angular movement when auto vmg is pressed is smoothed. #story[1196]
8 years ago
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
d2c8ccd98e
Course image for a type M2 course has been made. #story[1193]
8 years ago
ec82e65ae7
Fixed javadocs in xml creation classes.
8 years ago
63e2cc1fd0
Merge remote-tracking branch 'remotes/origin/story77_lobby' into story77
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
8 years ago
3157ac88b5
Course layout for a type M2 course has been made. #story[1193]
8 years ago
23eabed3ff
View3D tracks selected boat at fixed distance, pitch, and relative yaw
...
#story[1190]
8 years ago
b59eca1a8b
Added Subject3D selection to View3D
...
- Changed how View3D is added to canvasBase to allow events to get through
#story[1190]
8 years ago
a494eb4a6d
games are now added on the correct port
...
#story[1188]
8 years ago
d3ddff8bf1
host game start button added margins
...
#story[1193]
8 years ago
64ed1f9aa6
Improved map layout image. #story[1193]
8 years ago
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
a2b3ba44c0
RaceController scene separating
...
- removed a lot of unecessary parameters
- simplified set up functions
- racecontroller works on its own now
- made all the scenes visible by default
#story[1261]
8 years ago
7bad0e53ff
The boat is now viewable in top down view (60 degrees for isometric) and the race is playable #story[1261]
8 years ago
9f3cc53a63
Finished Arrow, Title and StartController scene splitting
...
- scenes do not load in at the same time
- scenes do not rely upon previous abstract controller class
- scenes are not a part of previous main controller class
- unecessary functions and code removed
#story[1261]
8 years ago
55cfda33d0
Merge branch 'Story_76' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into Story_76
8 years ago
002cccd5a0
Reworked iMapLayout as race would either take too long or too short. Added temporary image for iMapLayout. Will be reworked when I have time. #story[1193]
8 years ago
18a689b110
Changed a constant to be using the one in the constants file (prepartory start time) and temporarily made it so that the race can start in 3 seconds. #story[1261]
8 years ago
d302a08a14
fix for ci builds
...
#story[1193]
8 years ago
Fan-Wu Yang
David Wu
cbt24
hba56
Jessica Syder
Jessica Syder
Joseph Gardner
fjc40