f60809bdd4
Merge branch 'master' into story_64_sails
Joseph2017-08-17 09:13:49 +12:00
109b291973
Merged issue #20 fix and splash screen into development.
zwu182017-08-17 01:36:55 +12:00
317582aae8
Merge branch 'issue#20fix' into Development
zwu182017-08-17 01:35:33 +12:00
4e8b7d3b5a
Merge remote-tracking branch 'origin/master' into issue#20fix
zwu182017-08-17 01:30:43 +12:00
8759ac070e
Merge remote-tracking branch 'origin/splashScreen' into issue#20fix
zwu182017-08-17 01:30:38 +12:00
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-Brown2017-08-17 01:10:55 +12:00
ee0cc4b704
Merge branch 'issue#40' into Development
hba562017-08-16 22:41:49 +12:00
114c18763b
Reduced track point period to 1000ms. issue #18fjc402017-08-16 19:44:42 +12:00
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 #18fjc402017-08-16 18:10:30 +12:00
f7d0e9d466
Boats bounce during collision if pointing into collision
cbt242017-08-16 17:55:33 +12:00
eaa0d2e82b
Boats bounce away from marks. - Changed onCollisionEnter signature to pass boat info
cbt242017-08-16 17:22:08 +12:00
8113867576
Bubbles collision events to RaceLogic - ColliderRegistry collects and forwards all Collision events - RaceLogic observes the ColliderRegistry of its single Race instance
cbt242017-08-16 16:56:20 +12:00
f1e41d5d8f
Merge branch 'master' into issue_18_trackpoint
fjc402017-08-16 16:52:32 +12:00
79f3c41d45
Moved generic ray casting to Collider abstract class - Boat is now collider - Collider subclasses specify their own collision ray and collision handler
cbt242017-08-16 16:21:55 +12:00
8498701091
Removed commented-out file from master
cbt242017-08-16 16:08:38 +12:00
f44929f376
Spun off Locatable interface to make collision code more reusable
cbt242017-08-16 16:05:25 +12:00
f0d750cae1
Merge remote-tracking branch 'remotes/origin/master' into story66-collision
cbt242017-08-16 15:09:18 +12:00
d63641c1e2
Cherry-picked multiple changes from master
cbt242017-08-16 14:54:55 +12:00
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
hba562017-08-16 02:04:07 +12:00
85e703cba5
RaceController/info table now makes a copy of the boat list, to avoid race conditions. #story[1095]
fjc402017-08-15 23:10:32 +12:00
9f7c5d8c0c
Fixed other javadocs that were causing the build to fail #story[1092]
Fan-Wu Yang2017-08-15 22:48:35 +12:00
9e6bd10870
Merge branch 'master' into MapWindRotation
Fan-Wu Yang2017-08-15 22:45:01 +12:00
8d87da6206
fixed java doc issues on my side #story[1092]
Fan-Wu Yang2017-08-15 22:44:56 +12:00
bcb6b79f8d
Fixed player boat not being highlighted. #story[1095]
fjc402017-08-15 22:41:43 +12:00
5e0bcd2af5
Added control menu to title screen. Pressing control button will open a pop-up window showing game controls.
zwu182017-08-15 21:26:23 +12:00
a4755ed88b
Maybe fixed updating boat list on FX thread.
fjc402017-08-15 21:08:56 +12:00
a4e1dfb3d7
Fixed import that was messing up the build #story[1092]
Fan-Wu Yang2017-08-15 20:46:10 +12:00
0483859c40
Fixed sparkline y axis labelling. Reverted it to how it previously worked (negative data values instead of negative scale). issue #32fjc402017-08-15 20:40:29 +12:00
9ab12a9c58
MockBoat: Removed redundant isAutoVMG() function. TackGybeCommand now disables autoVMG. Removed print statements from VMGCommand.
fjc402017-08-15 18:48:14 +12:00
dc4610d6eb
Fixed sparkline not updating. #story[1095]
fjc402017-08-15 18:41:28 +12:00
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
fjc402017-08-15 17:13:12 +12:00
3a0bd10a57
Merge remote-tracking branch 'origin/master' into story_61
fjc402017-08-15 14:49:58 +12:00
c9875f3987
RaceLogic no longer uses AnimationTimer for its main loop (since that ran in javafx thread).
fjc402017-08-15 14:37:36 +12:00
9ca50aa66c
Ray casting now only supports distance specification.
cbt242017-08-15 14:26:43 +12:00
7d64a43350
Allow collision checking to provide collision parameters to ray casting method - Added tests for MockBoat collision direction and distance
cbt242017-08-15 13:47:59 +12:00
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
cbt242017-08-15 12:57:26 +12:00
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 #18fjc402017-08-14 12:58:05 +12:00
7d4f1cd925
Fixed first key press not working. #story[1098]
Joseph Gardner2017-08-14 12:41:21 +12:00
eebdd3806e
Added .idea/codeStyleSettings.xml to the git ignore
Fan-Wu Yang2017-08-14 04:06:14 +12:00
ac42c07c69
Merge branch 'master' into MapWindRotation
Fan-Wu Yang2017-08-14 03:54:02 +12:00
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 Yang2017-08-14 03:47:42 +12:00
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]
fjc402017-08-14 00:53:05 +12:00
70d5447e88
Moving stuff from school pc to home
Fan-Wu Yang2017-08-13 23:03:16 +12:00
Hamish Ball
David Wu
Joseph Gardner
Fan-Wu Yang
fjc40
Connor Taylor-Brown
Jessica Syder