Commit Graph

  • 27e8cddd94 Merge branch 'new_issue#19' into 'master' Hamish Ball 2017-08-17 17:08:55 +1200
  • 37095bfc6c Merged master into branch. David Wu 2017-08-17 17:02:24 +1200
  • 5234cdea66 Merge branch 'master' into new_issue#19 David Wu 2017-08-17 17:00:39 +1200
  • 0490237c0c Merge branch 'story_64_sails' into 'master' Joseph Gardner 2017-08-17 16:59:50 +1200
  • 598275591f Updated javadoc. David Wu 2017-08-17 16:50:51 +1200
  • 5ba6f52669 fixed autovmg. Joseph Gardner 2017-08-17 16:50:13 +1200
  • 79add59375 Unresizable control screen. David Wu 2017-08-17 16:37:31 +1200
  • f1ef75fb81 Merge branch 'master' into new_issue#19 David Wu 2017-08-17 16:34:19 +1200
  • 03dd937713 Change fxml stuff. Added back to menu buttons. David Wu 2017-08-17 16:33:52 +1200
  • dcd1df2999 Merged master. Joseph Gardner 2017-08-17 16:26:00 +1200
  • 014b78f166 Merge branch 'master' into story_64_sails Joseph Gardner 2017-08-17 16:25:40 +1200
  • 83b0c0a6b4 Fixed issue using File from java.io.File which did not like maven Fan-Wu Yang 2017-08-17 16:24:54 +1200
  • 9f813ab7aa Merged in development. David Wu 2017-08-17 16:14:09 +1200
  • e26fb73627 Merged master. Joseph Gardner 2017-08-17 16:08:23 +1200
  • 288979be3b Merge branch 'Development' into new_issue#19 David Wu 2017-08-17 16:05:59 +1200
  • d41e52766b Merge branch 'master' into story_64_sails Joseph Gardner 2017-08-17 16:04:53 +1200
  • 09eaf6d968 Merged master. David Wu 2017-08-17 13:55:49 +1200
  • 37fe7389ff Rounding marks works. Joseph Gardner 2017-08-17 13:55:33 +1200
  • 5a188f0582 Merge branch 'master' into new_issue#19 David Wu 2017-08-17 13:52:04 +1200
  • d2f9bfedcb Merge branch 'issue_18_track_alpha' into 'master' Hamish Ball 2017-08-17 13:50:44 +1200
  • 610aa96241 Merge branch 'MapWindRotation' into 'master' Joseph Gardner 2017-08-17 13:50:21 +1200
  • 2edb6b5249 Merge branch 'issue#40' into 'master' Hamish Ball 2017-08-17 13:49:58 +1200
  • c08bafa566 Fixed most of issue #19 with new master? David Wu 2017-08-17 13:49:43 +1200
  • 2656efcb4d Marks are a bit darker. Wake no longer has circle at end. fjc40 2017-08-17 13:30:10 +1200
  • 2e9c6fe593 Merged most recent master in, #story[1092] Fan-Wu Yang 2017-08-17 13:23:55 +1200
  • 02ab0e8a00 added javadoc hba56 2017-08-17 13:16:47 +1200
  • 3cf50c56f8 added a refresh for the info table so no new values are shown when the game is in full screen hba56 2017-08-17 13:15:33 +1200
  • a50d460222 Merged master. Joseph Gardner 2017-08-17 13:02:14 +1200
  • 0f58270c10 Merge branch 'master' into issue_18_track_alpha fjc40 2017-08-17 13:00:13 +1200
  • 7546c65893 Merge branch 'master' into MapWindRotation Fan-Wu Yang 2017-08-17 12:59:54 +1200
  • 20c9870fea Merge branch 'master' into story_64_sails Joseph Gardner 2017-08-17 12:59:25 +1200
  • fa5992bfb2 added App app to app. David Wu 2017-08-17 12:58:05 +1200
  • 62f400b924 Trackpoint line color fades out. fjc40 2017-08-17 12:56:11 +1200
  • 6bc81f566e Issue 19 changes. David Wu 2017-08-17 12:50:41 +1200
  • a3fe57ed5a Removed print statement. #story[1092] Joseph Gardner 2017-08-17 12:27:59 +1200
  • fa26abe10c Minor tidy. fjc40 2017-08-17 12:18:17 +1200
  • 4cf8846cda Map wind rotation works with multiplayer xml. #story[1092] Joseph Gardner 2017-08-17 12:17:45 +1200
  • 96acb6251e Merge branch 'story66-collision' into 'master' Hamish Ball 2017-08-17 12:14:30 +1200
  • 86d94ef27e javadoc fix hwball 2017-08-17 11:58:13 +1200
  • df2b674b94 update scale for table displaying hwball 2017-08-17 11:51:33 +1200
  • 4b3cc8e126 Created ack number generator for use by multiple services Connor Taylor-Brown 2017-08-17 11:47:54 +1200
  • 1e7ba8cd51 Merge branch 'master' into MapWindRotation Joseph Gardner 2017-08-17 11:46:09 +1200
  • d7e0bfa86c Trackpoints are only shown for the player's boat. #story[1098] Joseph 2017-08-17 10:13:30 +1200
  • 47fc55245c Merged master. Joseph 2017-08-17 09:27:41 +1200
  • f60809bdd4 Merge branch 'master' into story_64_sails Joseph 2017-08-17 09:13:49 +1200
  • 109b291973 Merged issue #20 fix and splash screen into development. zwu18 2017-08-17 01:36:55 +1200
  • 317582aae8 Merge branch 'issue#20fix' into Development zwu18 2017-08-17 01:35:33 +1200
  • 4e8b7d3b5a Merge remote-tracking branch 'origin/master' into issue#20fix zwu18 2017-08-17 01:30:43 +1200
  • 8759ac070e Merge remote-tracking branch 'origin/splashScreen' into issue#20fix zwu18 2017-08-17 01:30:38 +1200
  • f8150ef449 Added YachtEvent message with encoder and decoder - Updated Encoder and Decoder factories for the new message type - Added an enum for handling yacht event types Connor Taylor-Brown 2017-08-17 01:10:55 +1200
  • ee0cc4b704 Merge branch 'issue#40' into Development hba56 2017-08-16 22:41:49 +1200
  • 114c18763b Reduced track point period to 1000ms. issue #18 fjc40 2017-08-16 19:44:42 +1200
  • 20055b1883 Removed redunant calls in VisualiserRaceState.initialiseBoats(). Slightly refactored ResizableRaceCanvas - removed a redundant drawPoint() function, functions which alter the gc stroke call save/restore. Text is drawn black, at 20pts. The drawBoats() function: instead of drawing everything for each boat, one boat at a time, it draws the track points for all boats, then wake for all boats, etc..., to have better layering. issue #18 fjc40 2017-08-16 18:10:30 +1200
  • f7d0e9d466 Boats bounce during collision if pointing into collision cbt24 2017-08-16 17:55:33 +1200
  • eaa0d2e82b Boats bounce away from marks. - Changed onCollisionEnter signature to pass boat info cbt24 2017-08-16 17:22:08 +1200
  • 8113867576 Bubbles collision events to RaceLogic - ColliderRegistry collects and forwards all Collision events - RaceLogic observes the ColliderRegistry of its single Race instance cbt24 2017-08-16 16:56:20 +1200
  • f1e41d5d8f Merge branch 'master' into issue_18_trackpoint fjc40 2017-08-16 16:52:32 +1200
  • 79f3c41d45 Moved generic ray casting to Collider abstract class - Boat is now collider - Collider subclasses specify their own collision ray and collision handler cbt24 2017-08-16 16:21:55 +1200
  • 8498701091 Removed commented-out file from master cbt24 2017-08-16 16:08:38 +1200
  • f44929f376 Spun off Locatable interface to make collision code more reusable cbt24 2017-08-16 16:05:25 +1200
  • ce14e93404 Removed CI-breaking docstring cbt24 2017-08-16 15:17:15 +1200
  • f0d750cae1 Merge remote-tracking branch 'remotes/origin/master' into story66-collision cbt24 2017-08-16 15:09:18 +1200
  • d63641c1e2 Cherry-picked multiple changes from master cbt24 2017-08-16 14:54:55 +1200
  • fdd0b30a51 Added the ability to hide and show info table with a key press -the wind arrow also scales with the new size of the screen hba56 2017-08-16 02:04:07 +1200
  • 3d953362a6 Merge branch 'story_61' into 'master' Jessica Syder 2017-08-16 00:00:08 +1200
  • 85e703cba5 RaceController/info table now makes a copy of the boat list, to avoid race conditions. #story[1095] fjc40 2017-08-15 23:10:32 +1200
  • 9f7c5d8c0c Fixed other javadocs that were causing the build to fail #story[1092] Fan-Wu Yang 2017-08-15 22:48:35 +1200
  • 9e6bd10870 Merge branch 'master' into MapWindRotation Fan-Wu Yang 2017-08-15 22:45:01 +1200
  • 8d87da6206 fixed java doc issues on my side #story[1092] Fan-Wu Yang 2017-08-15 22:44:56 +1200
  • bcb6b79f8d Fixed player boat not being highlighted. #story[1095] fjc40 2017-08-15 22:41:43 +1200
  • 5e0bcd2af5 Added control menu to title screen. Pressing control button will open a pop-up window showing game controls. zwu18 2017-08-15 21:26:23 +1200
  • a4755ed88b Maybe fixed updating boat list on FX thread. fjc40 2017-08-15 21:08:56 +1200
  • a4e1dfb3d7 Fixed import that was messing up the build #story[1092] Fan-Wu Yang 2017-08-15 20:46:10 +1200
  • 0483859c40 Fixed sparkline y axis labelling. Reverted it to how it previously worked (negative data values instead of negative scale). issue #32 fjc40 2017-08-15 20:40:29 +1200
  • 9ab12a9c58 MockBoat: Removed redundant isAutoVMG() function. TackGybeCommand now disables autoVMG. Removed print statements from VMGCommand. fjc40 2017-08-15 18:48:14 +1200
  • dc4610d6eb Fixed sparkline not updating. #story[1095] fjc40 2017-08-15 18:41:28 +1200
  • 5ae8393126 Fixed null pointer exception when a boat finishes the race. Boats now default to have position (0, 0). Added mark rounding data to single player race.xml fjc40 2017-08-15 17:13:12 +1200
  • 3a0bd10a57 Merge remote-tracking branch 'origin/master' into story_61 fjc40 2017-08-15 14:49:58 +1200
  • c9875f3987 RaceLogic no longer uses AnimationTimer for its main loop (since that ran in javafx thread). fjc40 2017-08-15 14:37:36 +1200
  • 9ca50aa66c Ray casting now only supports distance specification. cbt24 2017-08-15 14:26:43 +1200
  • 7d64a43350 Allow collision checking to provide collision parameters to ray casting method - Added tests for MockBoat collision direction and distance cbt24 2017-08-15 13:47:59 +1200
  • 2fbb96afd7 Created ray casting methods for MockBoat and CompoundMark - Added ColliderRegistry to Race - Added collision triggering to RaceLogic - Created basic collision handlers for MockBoat and CompoundMark cbt24 2017-08-15 12:57:26 +1200
  • ab9aeeb58f Merge branch 'CommandFactory' into 'master' Connor Taylor Brown 2017-08-15 12:06:20 +1200
  • da52082d70 Deleted duplicate method (again -.-) cbt24 2017-08-15 11:40:22 +1200
  • 847cd1251e Merge remote-tracking branch 'remotes/origin/master' into CommandFactory Connor Taylor-Brown 2017-08-15 01:01:06 +1200
  • b97bfe62a6 Fixed documentation bugs not relevant to story. Connor Taylor-Brown 2017-08-15 00:52:50 +1200
  • cdcd326b7c Merge branch 'story68' into 'master' Fan-Wu Yang 2017-08-14 13:05:26 +1200
  • 5a03d97713 Added comment. fjc40 2017-08-14 13:01:27 +1200
  • b07c30704a The trackpoint line is now a line (poly-line) instead of a sequence of circles. A point along the poly-line is added every 250ms. issue #18 fjc40 2017-08-14 12:58:05 +1200
  • 7d4f1cd925 Fixed first key press not working. #story[1098] Joseph Gardner 2017-08-14 12:41:21 +1200
  • 1bdf80417d javadoc #story[1087] hba56 2017-08-14 12:14:55 +1200
  • 0ff4e9871d Merge remote-tracking branch 'remotes/origin/master' into story68 hba56 2017-08-14 12:13:24 +1200
  • 0558629dc6 Added luffing sails image. Jessica Syder 2017-08-14 10:42:28 +1200
  • a5b21799d3 Fixed java doc issue #story[1092] Fan-Wu Yang 2017-08-14 04:10:24 +1200
  • eebdd3806e Added .idea/codeStyleSettings.xml to the git ignore Fan-Wu Yang 2017-08-14 04:06:14 +1200
  • ac42c07c69 Merge branch 'master' into MapWindRotation Fan-Wu Yang 2017-08-14 03:54:02 +1200
  • b5e414f97a Made all the model classes extend off the schema xml classes for race, and made xml builder, validator and reader utility class. #story[1092] Fan-Wu Yang 2017-08-14 03:47:42 +1200
  • 175fb11178 Javadoc fixes. #story[1095] fjc40 2017-08-14 01:02:58 +1200
  • 7366aba5ec Added empty data sources, to be used by VisualiserRace. Created FrameRateTracker which can be used to track framerate. Updated RequestToJoinEnum and JoinAcceptanceEnum to match the agreed connection API. Added AssignPlayerBoat message, which is used internally on the client to assign the player a source ID once they have connected. Fixed some race conditions in the MessageRouter. Updated ConnectionAcceptor.CheckClientConnection to wait slightly longer before removing connection (there was a slight race condition before). Race no longer has a reference to LatestMessages. LatestMessages no longer has specific messages types in it. Created RaceState class, which contains the state that is shared between VisualiserRaceState and MockRaceState (currently only used on visualiser). Split VisualiserRace into VisualiserRaceState and VisualiserRaceService. Added the VisualiserRace commands (BoatLocatonCommand, RaceStatusCommand, etc...). Slightly increased the preferred width of race.fxml table columns. issues #27 #37 #35 #story[1095] fjc40 2017-08-14 00:53:05 +1200
  • 70d5447e88 Moving stuff from school pc to home Fan-Wu Yang 2017-08-13 23:03:16 +1200