108643b59d
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/java/visualiser/Controllers/StartController.java
# racevisionGame/src/main/java/visualiser/Controllers/hostgame.fxml
# racevisionGame/src/main/java/visualiser/Controllers/lobbyHosting.fxml
# racevisionGame/src/main/java/visualiser/Controllers/main.fxml
# racevisionGame/src/main/java/visualiser/Controllers/raceView.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
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
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
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
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
b034a452b6
Fixed problem with race pane registering non-control keys
...
#story[1190]
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
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
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
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
e82c59a8a4
New css for the host game window
...
#story[1193]
8 years ago
cbfcd3aa0d
Images
...
#story[1193]
8 years ago
e3e61e5b28
Merge remote-tracking branch 'remotes/origin/master' into storyD-3D
8 years ago
dfd3cb96f3
removed System.out.println
8 years ago
ae1526c457
Merge branch 'master' into vmg_fix
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/MainController.java
8 years ago
7024cac426
Rotated image of arrow direction #story[1187]
8 years ago
8eee282977
Merge branch 'wind_(story53)' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into wind_(story53)
8 years ago
0886a60911
arrow Flip
8 years ago
86f495a551
javaDoc
8 years ago
5bb8ba44b8
Fixed Javadoc and also made some variables private #story[1187]
8 years ago
2382585c15
Fixed Javadoc and also made some variables private #story[1187]
8 years ago
4ec2a50d20
Image Scales
...
#story[1193]
8 years ago
d89186d8bf
Finished playable 3D race with first person camera
...
- Camera pivot must be manually updated
- GPS coordinates are scaled by an arbitrary amount to make movement visible
- Model has to be flipped 180 degrees to move forward
#story[1261]
8 years ago
4eac3ea8b5
Updated the HostGame now has images for the maps and the map can be picked
...
#story[1193]
8 years ago
9560486248
Merge branch 'Story_76' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into Story_76
8 years ago
6b9c041c6b
Merge remote-tracking branch 'remotes/origin/master' into wind_(story53)
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/Event.java
# racevisionGame/src/main/java/mock/model/MockRace.java
8 years ago
dbd4703e74
javadoc fix
8 years ago
06517b7b47
Tidied up code
...
- Removed prints from tests
- Added Javadocs in necessary places
- Reenabled boat status message to send
- Added boat average angle
- pulled out modulateAngle function
- Commented harder to read loops
- Disabled toggled VMG
#story[1182]
8 years ago
d602c1ec6f
VMG is now working and fixed, however, it feels a bit odd #story[1182]
8 years ago
b22c5c5cd6
Created xml for new course layout. Marks and such are all added. Need to set up boundary when I have time. #story[1193]
8 years ago
7331ad1a20
VMG now works however some little bug in the interpolation in some quadrant that is making the speed all the same in the quadrant #story[1182]
8 years ago
19f4d0fc06
Added marks back to the race view
...
#story[1261]
8 years ago
05a0614246
Boats now rotate correctly in position rather than about the origin
...
#story[1261]
8 years ago
Jessica Syder
hba56
Jessica Syder
Connor Taylor-Brown
Joseph Gardner
zwu18
Fan-Wu Yang