Commit Graph
1142 Commits
Author SHA1 Message Date
David Wu b976186c7d Merged current master in. Made changes to classes so tutorial again due to merge. #story[1189] 2017-09-11 15:31:18 +12:00
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
2017-09-11 14:27:12 +12:00
Jessica Syder a123bfb7e8 Merge branch 'Story_76' into 'master'
Story 76

AC:  
Note: most sailing races take place on fairly standard courses: windward-leeward, triangular/Olympic, and so on. An (incomplete) list can be found at http://www.rya.org.uk/racing/race-officials/resource-centre/forms-data-diagrams-graphics/Pages/course-diagrams-other-graphics.aspx  
This story is related to Story 51 (generating course layouts). While 51 is concerned with orienting a course to the wind, this one relates to a library of common course layouts which could be adjusted before use by the method in 51   
  
  
  
 DOD:  
 Adheres to relevant architectural decisions.  
 Branch has latest version of master merged in.  
 All acceptance criteria sufficiently met.  
 mvn clean package with no errors.  
 All tests pass on CI.  
 Javadoc compiles without error. 1  
 Code passes our code review (see code quality standard).  
 New tests have been sufficiently written for new functions/classes/components.  
 Existing tests have been modified to correctly use new functions/classes/components.  
 Manual tests have been written and logged.  
 Related issues in the issue tracker should be linked to, and closed once merged.  
 DOD feature check carried out and successfully completed.  
 New step has been added to DOD feature check, if required.  
 All System.out.println() removed from program  

See merge request !39
2017-09-11 12:06:27 +12:00
David Wu c6594a0e20 Tutorial text now displays on screen when in tutorial. #story[1189] 2017-09-10 19:31:56 +12:00
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] 2017-09-10 18:11:52 +12:00
David Wu bad6422ca9 Implemented tutorial for zooming as it was left out from the last commit. Refactored updating tutorial state. #story[1189] 2017-09-10 17:38:48 +12:00
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] 2017-09-10 17:11:20 +12:00
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
2017-09-10 15:19:03 +12:00
hba56 ae8fa312a3 removed sout and added a longer startup time. Also fixed race xmls to remove set boats 2017-09-09 15:37:35 +12:00
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
2017-09-09 15:35:02 +12:00
Jessica Syder 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
2017-09-09 10:47:37 +12:00
Connor Taylor-Brown 93883ee8b7 Added more descriptive documentation to new classes and functionality
#story[1190]
2017-09-08 23:48:47 +12:00
hba56 5e516b0508 re added the standard race
#story[1193]
2017-09-08 18:12:51 +12:00
Connor Taylor-Brown 0c9e55093c Set lobby anchor pane to invisible to allow races to start 2017-09-08 17:11:21 +12:00
Connor Taylor-Brown b034a452b6 Fixed problem with race pane registering non-control keys
#story[1190]
2017-09-08 16:30:03 +12:00
Connor Taylor-Brown 68f434b6b6 Bound zooming action to zoom keys
- View3D subject selection is no longer enabled by default
- Added documentation

#story[1190]
2017-09-08 15:49:53 +12:00
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]
2017-09-08 14:21:03 +12:00
Joseph Gardner d2c8ccd98e Course image for a type M2 course has been made. #story[1193] 2017-09-08 14:20:14 +12:00
Joseph Gardner 3157ac88b5 Course layout for a type M2 course has been made. #story[1193] 2017-09-08 13:27:30 +12:00
Connor Taylor-Brown 23eabed3ff View3D tracks selected boat at fixed distance, pitch, and relative yaw
#story[1190]
2017-09-08 12:58:06 +12:00
Connor Taylor-Brown b59eca1a8b Added Subject3D selection to View3D
- Changed how View3D is added to canvasBase to allow events to get through

#story[1190]
2017-09-08 12:43:36 +12:00
hba56 d3ddff8bf1 host game start button added margins
#story[1193]
2017-09-08 11:52:21 +12:00
zwu18 64ed1f9aa6 Improved map layout image. #story[1193] 2017-09-08 02:58:57 +12:00
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]
2017-09-07 23:22:27 +12:00
Fan-Wu Yang 7bad0e53ff The boat is now viewable in top down view (60 degrees for isometric) and the race is playable #story[1261] 2017-09-07 22:03:24 +12:00
David Wu 55cfda33d0 Merge branch 'Story_76' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into Story_76 2017-09-07 21:15:50 +12:00
David Wu 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] 2017-09-07 21:15:41 +12:00
Fan-Wu Yang 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] 2017-09-07 19:30:51 +12:00
hba56 d302a08a14 fix for ci builds
#story[1193]
2017-09-07 19:25:49 +12:00
hba56 e82c59a8a4 New css for the host game window
#story[1193]
2017-09-07 19:21:08 +12:00
hba56 cbfcd3aa0d Images
#story[1193]
2017-09-07 17:17:40 +12:00
Connor Taylor-Brown e3e61e5b28 Merge remote-tracking branch 'remotes/origin/master' into storyD-3D 2017-09-06 23:51:46 +12:00
Hamish Ball 321359be07 Merge branch 'vmg_fix' into 'master'
Vmg fix

Note: there should be a small deadzone between upwind and reaching/running where pressing the key has no effect so that issues in judging the exact TWA of the boat don't lead to a surprising direction change.

Turn off toggle

Remember to close Issue#43 when you have finished DoD'ing



See merge request !37
2017-09-06 20:10:42 +12:00
hba56 dfd3cb96f3 removed System.out.println 2017-09-06 20:05:54 +12:00
Fan-Wu Yang ae1526c457 Merge branch 'master' into vmg_fix
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/MainController.java
2017-09-06 17:48:11 +12:00
Fan-Wu Yang ba13713ba1 Merge branch 'wind_(story53)' into 'master'
Wind (story53)

AC:

Note: "Back" means that the wind shifts counterclockwise while "veer" means clockwise. Shifts should follow the following patterns:

1. The wind should usually oscillate regularly around a mean (several minutes per oscillation and no more than 5 degrees either way.)
2. Occasionally it will either "back" or "veer" (a few degrees a minute, up to 180 degrees shift), and then return to oscillations.

Acceptance criteria:

- The wind direction follows the above patterns during a race.

* Test wind works at 0 to small degree amounts.


See merge request !36
2017-09-06 17:45:09 +12:00
Fan-Wu Yang 7024cac426 Rotated image of arrow direction #story[1187] 2017-09-06 17:41:48 +12:00
Fan-Wu Yang 8eee282977 Merge branch 'wind_(story53)' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into wind_(story53) 2017-09-06 17:13:39 +12:00
hba56 0886a60911 arrow Flip 2017-09-06 17:08:53 +12:00
hba56 86f495a551 javaDoc 2017-09-06 17:04:15 +12:00
Fan-Wu Yang 5bb8ba44b8 Fixed Javadoc and also made some variables private #story[1187] 2017-09-06 17:00:56 +12:00
Fan-Wu Yang 2382585c15 Fixed Javadoc and also made some variables private #story[1187] 2017-09-06 16:58:27 +12:00
hba56 4ec2a50d20 Image Scales
#story[1193]
2017-09-06 14:53:02 +12:00
Connor Taylor-Brown 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]
2017-09-06 14:36:24 +12:00
hba56 4eac3ea8b5 Updated the HostGame now has images for the maps and the map can be picked
#story[1193]
2017-09-06 13:49:18 +12:00
hba56 9560486248 Merge branch 'Story_76' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into Story_76 2017-09-06 11:57:04 +12:00
hba56 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
2017-09-05 23:37:17 +12:00
hba56 dbd4703e74 javadoc fix 2017-09-05 23:21:49 +12:00
Fan-Wu Yang 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]
2017-09-05 21:37:33 +12:00
Fan-Wu Yang d602c1ec6f VMG is now working and fixed, however, it feels a bit odd #story[1182] 2017-09-05 21:03:19 +12:00