fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 2cda5ea70d Lobby no longer glitches out when a person disconnects and reconnects without restarting the program #story[1188] Fan-Wu Yang 2017-09-11 20:34:34 +12:00
  • 5e35cd4195 Removed empty java files Connor Taylor-Brown 2017-09-11 20:31:20 +12:00
  • 54a9140f31 lobby listener is added and removed so that the program doesn't drasticaly slow down when the lobby is connected to multiple times #story[1188] Fan-Wu Yang 2017-09-11 20:29:15 +12:00
  • 669a303e9b 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 Jessica Syder 2017-09-11 20:19:10 +12:00
  • 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 Jessica Syder 2017-09-11 20:05:24 +12:00
  • df04cdf87c Boats are now visualy removed when they leave the lobby. Fan-Wu Yang 2017-09-11 19:54:43 +12:00
  • 0da6931f8f Have structure for skybox, still need to play around with it a bit more to make it fit. #story[1261] Joseph Gardner 2017-09-11 18:24:21 +12:00
  • d92410b9b4 Fixed XML Issue where sometimes the last boat would not display itself #story[1188] Fan-Wu Yang 2017-09-11 18:14:26 +12:00
  • b976186c7d Merged current master in. Made changes to classes so tutorial again due to merge. #story[1189] David Wu 2017-09-11 15:31:18 +12:00
  • c97706d86e Merge branch 'master' into story70 David Wu 2017-09-11 14:27:12 +12:00
  • a123bfb7e8 Merge branch 'Story_76' into 'master' Jessica Syder 2017-09-11 12:06:27 +12:00
  • 346aa148ef Added some debug statements, and WIP MarkRoundingSequence class. Temporarily disabled source id allocator time checks. Added mark rounding stuff to race canvas to help debug. #story[1185] fjc40 2017-09-11 11:35:11 +12:00
  • ae75bb86d3 Resized models to a similar size of the collision detectors. #story[1261] Fan-Wu Yang 2017-09-11 02:48:00 +12:00
  • 08ca42f786 Wrote some missing java docs #story[1261] Fan-Wu Yang 2017-09-11 01:05:58 +12:00
  • 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] Fan-Wu Yang 2017-09-11 00:54:11 +12:00
  • c6594a0e20 Tutorial text now displays on screen when in tutorial. #story[1189] David Wu 2017-09-10 19:31:56 +12:00
  • 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] David Wu 2017-09-10 18:11:52 +12:00
  • bad6422ca9 Implemented tutorial for zooming as it was left out from the last commit. Refactored updating tutorial state. #story[1189] David Wu 2017-09-10 17:38:48 +12:00
  • 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] David Wu 2017-09-10 17:11:20 +12:00
  • 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] Fan-Wu Yang 2017-09-10 16:15:37 +12:00
  • 28ec4b9246 Merge branch 'master' into story70 David Wu 2017-09-10 15:19:03 +12:00
  • e2b868d815 Added boundaries to the map, which are drawn by the race #story[1261] Fan-Wu Yang 2017-09-10 14:49:16 +12:00
  • 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 cbt24 2017-09-09 17:09:14 +12:00
  • ddc3a6ae47 boxes in lobby are now boats hba56 2017-09-09 16:26:17 +12:00
  • e5d8a4028d Merge remote-tracking branch 'remotes/origin/master' into story77 hba56 2017-09-09 16:20:00 +12:00
  • ae8fa312a3 removed sout and added a longer startup time. Also fixed race xmls to remove set boats hba56 2017-09-09 15:37:35 +12:00
  • ea1594a839 Merge remote-tracking branch 'remotes/origin/master' into Story_76 hba56 2017-09-09 15:35:02 +12:00
  • 2508b847b8 Merge branch 'master' into storyD-3D cbt24 2017-09-09 15:26:33 +12:00
  • 643f145407 Added mark radius 3D annotation to improve bird's eye visibility cbt24 2017-09-09 14:44:58 +12:00
  • 14aaf26b73 Merge branch 'story40-zoom' into 'master' Jessica Syder 2017-09-09 10:47:37 +12:00
  • 1ed7ccf146 Minor changes preparing to merge in 3D Jessica Syder 2017-09-09 10:44:19 +12:00
  • 93883ee8b7 Added more descriptive documentation to new classes and functionality Connor Taylor-Brown 2017-09-08 23:48:47 +12:00
  • 6a302841c0 Minor changes preparing to merge in 3D Jessica Syder 2017-09-08 22:24:06 +12:00
  • 0dff85006a Changes to code to use new controller structure. Jessica Syder 2017-09-08 22:07:16 +12:00
  • e149255240 Tried to get multiple boats working but.... it's not #story[1196] Fan-Wu Yang 2017-09-08 20:10:45 +12:00
  • 5bc382304b Created and linked up bouy to race, and added keybindings to git ignore #story[1196] Fan-Wu Yang 2017-09-08 19:15:39 +12:00
  • 5e516b0508 re added the standard race #story[1193] hba56 2017-09-08 18:12:51 +12:00
  • a5050b8ea8 Adding back lost changes and finishing splitting last controllers. Jessica Syder 2017-09-08 18:08:58 +12:00
  • 4c2ab9cc9a Merge branch 'master' into story77 hba56 2017-09-08 17:28:17 +12:00
  • 0c9e55093c Set lobby anchor pane to invisible to allow races to start Connor Taylor-Brown 2017-09-08 17:11:21 +12:00
  • a5d3434a70 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit Jessica Syder 2017-09-08 16:50:28 +12:00
  • 4780354452 Errors in this commit: mock threads get interrupted #story[#1188] hba56 2017-09-08 16:35:36 +12:00
  • b034a452b6 Fixed problem with race pane registering non-control keys Connor Taylor-Brown 2017-09-08 16:30:03 +12:00
  • 2868f921e2 Only one angular command can be active at a time. Only one velocity command can be active at a time. #story[1196] Joseph Gardner 2017-09-08 15:55:29 +12:00
  • 68f434b6b6 Bound zooming action to zoom keys - View3D subject selection is no longer enabled by default - Added documentation Connor Taylor-Brown 2017-09-08 15:49:53 +12:00
  • df624a8437 Angular movement when auto vmg is pressed is smoothed. #story[1196] Joseph Gardner 2017-09-08 15:34:22 +12:00
  • 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 Connor Taylor-Brown 2017-09-08 14:21:03 +12:00
  • d2c8ccd98e Course image for a type M2 course has been made. #story[1193] Joseph Gardner 2017-09-08 14:20:14 +12:00
  • ec82e65ae7 Fixed javadocs in xml creation classes. fjc40 2017-09-08 13:45:36 +12:00
  • 63e2cc1fd0 Merge remote-tracking branch 'remotes/origin/story77_lobby' into story77 hba56 2017-09-08 13:34:48 +12:00
  • 3157ac88b5 Course layout for a type M2 course has been made. #story[1193] Joseph Gardner 2017-09-08 13:27:30 +12:00
  • 23eabed3ff View3D tracks selected boat at fixed distance, pitch, and relative yaw Connor Taylor-Brown 2017-09-08 12:58:06 +12:00
  • b59eca1a8b Added Subject3D selection to View3D - Changed how View3D is added to canvasBase to allow events to get through Connor Taylor-Brown 2017-09-08 12:43:36 +12:00
  • a494eb4a6d games are now added on the correct port hba56 2017-09-08 12:04:54 +12:00
  • d3ddff8bf1 host game start button added margins hba56 2017-09-08 11:52:21 +12:00
  • 64ed1f9aa6 Improved map layout image. #story[1193] zwu18 2017-09-08 02:58:57 +12:00
  • 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 Connor Taylor-Brown 2017-09-07 23:22:27 +12:00
  • a2b3ba44c0 RaceController scene separating Jessica Syder 2017-09-07 22:47:45 +12:00
  • 7bad0e53ff The boat is now viewable in top down view (60 degrees for isometric) and the race is playable #story[1261] Fan-Wu Yang 2017-09-07 22:03:24 +12:00
  • 9f3cc53a63 Finished Arrow, Title and StartController scene splitting Jessica Syder 2017-09-07 21:40:10 +12:00
  • 55cfda33d0 Merge branch 'Story_76' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into Story_76 David Wu 2017-09-07 21:15:50 +12:00
  • 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] David Wu 2017-09-07 21:15:41 +12:00
  • 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] Fan-Wu Yang 2017-09-07 19:29:08 +12:00
  • d302a08a14 fix for ci builds #story[1193] hba56 2017-09-07 19:25:49 +12:00
  • e82c59a8a4 New css for the host game window #story[1193] hba56 2017-09-07 19:21:08 +12:00
  • cbfcd3aa0d Images #story[1193] hba56 2017-09-07 17:17:40 +12:00
  • 8c7345a30d Documented command classes cbt24 2017-09-07 17:01:47 +12:00
  • 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 cbt24 2017-09-07 16:57:07 +12:00
  • 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 cbt24 2017-09-07 14:50:53 +12:00
  • eba70ab2d4 Sails command now listens to race to check if goal velocity is met cbt24 2017-09-07 14:27:20 +12:00
  • b62344261a Merge remote-tracking branch 'remotes/origin/master' into storyB-) cbt24 2017-09-07 13:29:23 +12:00
  • 844b48a81a Resolved issue #42 - "putting sails out changes boat bearing to face target gate" cbt24 2017-09-07 13:23:56 +12:00
  • e3e61e5b28 Merge remote-tracking branch 'remotes/origin/master' into storyD-3D Connor Taylor-Brown 2017-09-06 23:51:46 +12:00
  • 321359be07 Merge branch 'vmg_fix' into 'master' Hamish Ball 2017-09-06 20:10:42 +12:00
  • dfd3cb96f3 removed System.out.println hba56 2017-09-06 20:05:54 +12:00
  • ae1526c457 Merge branch 'master' into vmg_fix Fan-Wu Yang 2017-09-06 17:48:11 +12:00
  • ba13713ba1 Merge branch 'wind_(story53)' into 'master' Fan-Wu Yang 2017-09-06 17:45:09 +12:00
  • 7024cac426 Rotated image of arrow direction #story[1187] Fan-Wu Yang 2017-09-06 17:41:48 +12:00
  • 8eee282977 Merge branch 'wind_(story53)' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into wind_(story53) Fan-Wu Yang 2017-09-06 17:13:39 +12:00
  • 0886a60911 arrow Flip hba56 2017-09-06 17:08:53 +12:00
  • 86f495a551 javaDoc hba56 2017-09-06 17:04:15 +12:00
  • 5bb8ba44b8 Fixed Javadoc and also made some variables private #story[1187] Fan-Wu Yang 2017-09-06 17:00:56 +12:00
  • 2382585c15 Fixed Javadoc and also made some variables private #story[1187] Fan-Wu Yang 2017-09-06 16:58:27 +12:00
  • 00cedf4d4d TackGybeCommand now smooths the rotation of the boat. #story[1196] Joseph Gardner 2017-09-06 15:19:30 +12:00
  • 4ec2a50d20 Image Scales #story[1193] hba56 2017-09-06 14:53:02 +12:00
  • 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 Connor Taylor-Brown 2017-09-06 14:36:24 +12:00
  • 4eac3ea8b5 Updated the HostGame now has images for the maps and the map can be picked #story[1193] hba56 2017-09-06 13:49:18 +12:00
  • 9560486248 Merge branch 'Story_76' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into Story_76 hba56 2017-09-06 11:57:04 +12:00
  • 6b9c041c6b Merge remote-tracking branch 'remotes/origin/master' into wind_(story53) hba56 2017-09-05 23:37:17 +12:00
  • dbd4703e74 javadoc fix hba56 2017-09-05 23:21:49 +12:00
  • 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] Fan-Wu Yang 2017-09-05 21:37:33 +12:00
  • d602c1ec6f VMG is now working and fixed, however, it feels a bit odd #story[1182] Fan-Wu Yang 2017-09-05 21:03:19 +12:00
  • b22c5c5cd6 Created xml for new course layout. Marks and such are all added. Need to set up boundary when I have time. #story[1193] David Wu 2017-09-05 20:09:56 +12:00
  • 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] Fan-Wu Yang 2017-09-05 19:26:06 +12:00
  • 19f4d0fc06 Added marks back to the race view cbt24 2017-09-05 16:50:26 +12:00
  • 05a0614246 Boats now rotate correctly in position rather than about the origin cbt24 2017-09-05 16:02:20 +12:00
  • 3ecf203cba Recovered stable rotation of the player's boat - Uses AnimationTimer rather than listeners - Reduced pre-start time to speed up testing cbt24 2017-09-05 15:19:04 +12:00
  • 8b5a5506e7 Boat collisions now play a sound when user collides and a quieter sound when others collide. #story[1195] David Wu 2017-09-05 14:00:15 +12:00
  • 7aaa880f40 VMG now works with some edge cases issues #story[1182] Fan-Wu Yang 2017-09-05 13:05:37 +12:00
  • f4cb1a3ac4 Made ObserverCommands and made racestate an observable. ObserverCommands observes the race passes in the params. #story[1196] Joseph 2017-09-05 12:40:34 +12:00