Commit Graph
1436 Commits
Author SHA1 Message Date
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
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
2017-09-09 15:26:33 +12:00
cbt24 643f145407 Added mark radius 3D annotation to improve bird's eye visibility
#story[1261]
2017-09-09 14:44:58 +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
Jessica Syder 1ed7ccf146 Minor changes preparing to merge in 3D
#story[1261]
2017-09-09 10:44:19 +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
Jessica Syder 6a302841c0 Minor changes preparing to merge in 3D
#story[1261]
2017-09-08 22:24:06 +12:00
Jessica Syder 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]
2017-09-08 22:07:16 +12:00
Fan-Wu Yang e149255240 Tried to get multiple boats working but.... it's not #story[1196] 2017-09-08 20:10:45 +12:00
Fan-Wu Yang 5bc382304b Created and linked up bouy to race, and added keybindings to git ignore #story[1196] 2017-09-08 19:15:39 +12:00
hba56 5e516b0508 re added the standard race
#story[1193]
2017-09-08 18:12:51 +12:00
Jessica Syder 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]
2017-09-08 18:08:58 +12:00
hba56 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
2017-09-08 17:28:17 +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
Jessica Syder 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
2017-09-08 16:50:28 +12:00
hba56 4780354452 Errors in this commit: mock threads get interrupted
#story[#1188]
2017-09-08 16:35:36 +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
Joseph Gardner 2868f921e2 Only one angular command can be active at a time. Only one velocity command can be active at a time. #story[1196] 2017-09-08 15:55:29 +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
Joseph Gardner df624a8437 Angular movement when auto vmg is pressed is smoothed. #story[1196] 2017-09-08 15:34:22 +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
fjc40 ec82e65ae7 Fixed javadocs in xml creation classes. 2017-09-08 13:45:36 +12:00
hba56 63e2cc1fd0 Merge remote-tracking branch 'remotes/origin/story77_lobby' into story77
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
2017-09-08 13:34:48 +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 a494eb4a6d games are now added on the correct port
#story[1188]
2017-09-08 12:04:54 +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
Jessica Syder 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]
2017-09-07 22:47:45 +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
Jessica Syder 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]
2017-09-07 21:40:10 +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
cbt24 8c7345a30d Documented command classes
#story[1196]
2017-09-07 17:01:47 +12:00
cbt24 a6db06a82c Boats now reverse smoothly when colliding
- Collision objects specify which boat is colliding
- RaceLogic sets up an observable CollisionCommand when collision bubbles up
- Boats now selectively identify observers of collision

#story[1196]
2017-09-07 16:57:07 +12:00
cbt24 9cba3934ea Sails command now applies acceleration to boat
- Race only has control over speed while Sails command is not in action
- This is governed by a default velocity property on the boat
- Sails command returns control when sails are out and boat is up to speed
- Speed never falls below 0
- Speed never goes above VMG velocity to prevent exploitation

#story[1196]
2017-09-07 14:50:53 +12:00
cbt24 eba70ab2d4 Sails command now listens to race to check if goal velocity is met
#story[1196]
2017-09-07 14:27:20 +12:00
cbt24 b62344261a Merge remote-tracking branch 'remotes/origin/master' into storyB-) 2017-09-07 13:29:23 +12:00
cbt24 844b48a81a Resolved issue #42 - "putting sails out changes boat bearing to face target gate"
#story[1196]
2017-09-07 13:23:56 +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