7feddeb49fMerge branch 'master' into story48
fjc40
2017-08-05 15:23:33 +1200
554f8a2a0fAdded WindCommand and multiple command execution to RaceLogic - Dispatch commands with CompositeCommand - Single WindCommand handles upwind and downwind logic - Changed key bindings as Mac lacks PgUp PgDn - ControllerServer is observable, RaceLogic updates CompositeCommand as observer
Connor Taylor-Brown
2017-08-04 23:08:07 +1200
0b74acadffrounding checks are now done by port or starboard side depending on what the compound marks type is #story[1101]
hba56
2017-08-04 22:19:07 +1200
db1efab225rounding checks are now done by port or starboard side depending on what the compound marks type is #story[1101]
hba56
2017-08-04 22:17:17 +1200
be8b0e672dUpdated the xml reader to pull in the rounding type of the compound marks and set each mark with that value #story[1101]
hba56
2017-08-04 22:01:21 +1200
425cc7f91fChanged ControlKey to use BoatActionEnum instead of magic numbers.
Connor Taylor-Brown
2017-08-04 21:27:53 +1200
14ce5fcaffMade changes to TackGybeCommand and VMGCommand classes to fit pattern layout.
zwu18
2017-08-04 03:56:55 +1200
6e699f7037Merge branch 'RaceFactory' into CommandFactory
zwu18
2017-08-04 03:00:31 +1200
f23c3f854dSeperated race xml creation into a class of its own - Created RaceXMLCreator class - made a function to convert limit to GPS Coordinate (limitToGPSCoordinate) - can rotate a GPS Coordinate around a point (rotate) - can get center of a race with (getCenter) #story[1092]
Fan-Wu Yang
2017-08-03 23:13:28 +1200
851bbb4fdeMerged branch "RaceFactory" with master
Connor Taylor-Brown
2017-08-03 23:03:15 +1200
148108a658CommandFactory uses BoatActionEnum instead of raw ints. #story[1094]
fjc40
2017-08-03 21:11:25 +1200
c83442761cImplemented Factory for Command objects and fixed Command Pattern implementation. - Commands now have standard 0-parameter execute method - Commands are created by CommandFactory
Connor Taylor-Brown
2017-08-03 17:54:03 +1200
40a3ed1bb0Boats now store whether autoVMG is on or off, boat speed scales off their bearing relative to the TWA. #story[1094]
Joseph Gardner
2017-08-03 16:56:52 +1200
f212414bd9Added in a new basis for boats to round marks, gave mockboats a status to say how far through a rounding they are and made a method in GPScoordinate public so it can be used to calculate intersections.
hba56
2017-08-03 13:27:00 +1200
e4999a3c93Added a light variant of the arrow image. nightMode.css loads this instead of the regular dark arrow. ResizableRaceCanvas doesn't cache the race boundary background, as it was unneccessary and stopped the canvas from being transparent. #story[1093]
fjc40
2017-08-03 12:56:15 +1200
2a5d0938ffMerge branch 'story48' into Development
fjc40
2017-08-03 11:07:17 +1200
4e8d4f2433Created Schema for Race xml's and generated classes for reading xml with xjc, made the RaceXMLReader read Corner classes in as well as making a corner class #story[1092]
Fan-Wu Yang
2017-08-03 02:42:33 +1200
d9679c1497Build failing due to junit even though junit passes all tests. Commented out VMGCommand and TackGybeCommand content.
zwu18
2017-08-03 01:31:05 +1200
2672c2b13bSeparated RaceLogic from MockRace - MockRace satisfies refactor requirement for RaceState - VisualiserRace directly implements Runnable to remove method from MockRace
Connor Taylor-Brown
2017-08-03 00:32:17 +1200
ad61dc6bceImplemented runCommand method in VMGCommand and TackGybeCommand classes. Both classes currently rely on the MockRace class so changes will be required when MockRace is refactored.
zwu18
2017-08-03 00:22:46 +1200
0466292bd0Partially removed VMG optimisation, separated server-specific functionality from MockRace into RaceServer.
Connor Taylor-Brown
2017-08-02 23:39:13 +1200
7fc1347377Created class TackGybeCommand which implements the CommandFactory interface.
zwu18
2017-08-02 22:28:47 +1200
9889a474eeAdded ArrowController. This is the controller for arrow.fxml. Removed arrow control stuff from ResizableRaceCanvas. Added a wind speed label to arrow.fxml. Also created an outer GridPane to lay things out. #story[1093]
fjc40
2017-08-02 18:24:43 +1200
b7af4e19cfnew method to check if a boat is between gates as well as updated the gps values to fit better with real life values #story[1101]
hba56
2017-08-02 18:09:12 +1200
c633de21f5added new methods to the mock boats to let them check which side a mark is on to them #story[1101]
hba56
2017-08-02 16:33:03 +1200
27cf0e1539Started splitting MockRace into RaceLogic and RaceState. #refactor #story[1094]
Joseph Gardner
2017-08-02 16:31:55 +1200
b258e94a54Merged wind generator into this branch. #story[1094]
Joseph Gardner
2017-08-02 15:19:32 +1200
577a1d1b5aMerge remote-tracking branch 'origin/RaceFactory' into RaceFactory
Joseph Gardner
2017-08-02 15:10:36 +1200
fba256113aMerged wind generator into this branch. #story[1094]
Joseph Gardner
2017-08-02 15:09:59 +1200
51bbdf9a50Merge branch 'issue_26_wind' into RaceFactory
Joseph Gardner
2017-08-02 15:04:55 +1200
ed12ff659dmock: Moved wind generation logic and state into the WindGenerator class. MockRace initialises this, and calls it to update wind.
fjc40
2017-08-02 13:59:19 +1200
9249e74e3aMerge remote-tracking branch 'origin/RaceFactory' into RaceFactory
cbt24
2017-08-02 13:58:26 +1200
a4592a10e6Removed boundary checking logic to clean up MockRace before split
cbt24
2017-08-02 13:51:07 +1200
81eeca3533Split wind off from Race and made it its own class. Deleted dnfChance as it is no longer used.
Joseph Gardner
2017-08-02 13:45:10 +1200
775c32ca92Made new branch for command architecture.
Joseph Gardner
2017-08-02 12:48:56 +1200
a87879eaa9Made new branch for command architecture.
Joseph Gardner
2017-08-02 12:41:47 +1200
99f3310d8bCreated a setWind(bearing, knots) in Race, which updates the Wind with new values. MockRace now uses Wind. VisualiserRace now uses Wind. #story[1093]
fjc40
2017-08-01 18:45:17 +1200
5af3053537Added shared.model.Wind class. shared.model.Race now uses Wind. It is wrapped in Property<>. #story[1093]
fjc40
2017-08-01 18:15:35 +1200
f2932e8baeNew branch created for development.
David Wu
2017-08-01 12:29:05 +1200
fcea323cfdThe racevisionGame pom still had "profiles", which aren't needed with a single jar build, and the built jar didn't have a mainifest/main class.
fjc40
2017-07-28 09:30:26 +1200
a8701d8a1fMerge branch 'css' into 'master'
Fan-Wu Yang
2017-07-27 16:26:47 +1200
442920f9f6DOD, and added javadocs/fixed javadocs #story[1087]
Fan-Wu Yang
2017-07-27 16:24:19 +1200
9eaf24e699Fixed title screen having whitespace on different screen resolutions.
Jessica Syder
2017-07-27 14:54:56 +1200
7966ac41fbMerge branch 'cbt-multi-controller' into 'master'
Fraser Cope
2017-07-27 14:23:52 +1200
669b8167cdMerge branch 'cbt-multi-controller' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into cbt-multi-controller
fjc40
2017-07-27 14:08:19 +1200
1b5926007cVisualiser ConnectionController: Clicking the host button doesn't create more than one server.
fjc40
2017-07-27 14:07:25 +1200
67c7c88b32Print statements now print off the actual key action. #story[1089]
Joseph Gardner
2017-07-27 14:06:40 +1200
f91f7055deVisualiser RaceController: event.consume() is required to stop the keyboard event from propogating to other controls.
fjc40
2017-07-27 13:52:55 +1200
92b8b7b77fmoved the tm symbol #story[1087]
hba56
2017-07-27 13:34:03 +1200
2b8b334486Updated host to show the hosted address and port. Fixed css issue with lobby text field. #story[1087]
David Wu
2017-07-27 13:12:39 +1200
f4eb03e79eMerge remote-tracking branch 'origin/css' into css
hba56
2017-07-27 13:06:07 +1200
85347c169dYou can now resize all windows other than the title screen #story[1087]
hba56
2017-07-27 13:05:56 +1200
28e6709890Merge remote-tracking branch 'origin/css' into css
David Wu
2017-07-27 12:42:13 +1200
90f9ec2b98Changed host menu. Will update soon. #story[1087]
David Wu
2017-07-27 12:41:46 +1200
6492ba89abMerging main features into story 6. App now sends and receives key strokes. #story[1007, 1089]
Joseph Gardner
2017-07-27 12:36:34 +1200
0ea7fb8c84Merging main features into story 6. App now sends and receives key strokes. #story[1007, 1089]
Joseph Gardner
2017-07-27 12:23:44 +1200
59058da09ctextfields now show better colour that contrasts more #story[1087]
hba56
2017-07-27 12:23:21 +1200
7fafddcf50updated text to be easily read on daymode #pair[zwu18, hba56] #story[1087]
hba56
2017-07-27 12:09:33 +1200
64b4aa539aadded and option to swap between css files in the title pane #pair[zwu18, hba56] #story[1087]
hba56
2017-07-27 12:04:17 +1200
0352e3310dSet up Boat Action Message encoding - Fixed command number for sails out
Connor Taylor-Brown
2017-07-27 00:48:19 +1200
e670ded66dControllerClient can retrieve valid protocol code from each key press - ControlKey now includes protocolCode property - RaceController now fires action with each key press - Shift toggles sail state appropriately
Connor Taylor-Brown
2017-07-26 23:40:39 +1200
86e8cb7560Refactored KeyFactory to ensure single instance of each key state handler.
Connor Taylor-Brown
2017-07-26 23:22:05 +1200
cc264f318eAdded ControllerClient and ControllerServer - StartController sets up client-wide ControllerClient on socket to game server. - RaceController now calls ControllerClient.sendKey with each keypress - ConnectionAcceptor runs ControllerServer for each successfully connected client
Connor Taylor-Brown
2017-07-26 22:57:01 +1200
8bb66bc5e4Commented out test failure. Test was failing due to refactor.
zwu18
2017-07-26 22:06:42 +1200
53a01402e1Check method moved to new class called ping so that refresh will be called on new thread.
zwu18
2017-07-26 21:59:43 +1200
243c450790Merged with multi visualiser branch so now multiple visualisers can connect to the same host.
zwu18
2017-07-26 21:08:13 +1200
88604df66dMerge branch 'cbt-multi-controller' into css
zwu18
2017-07-26 20:54:07 +1200
9c9b98f882Added functionality to host game and join a game in lobby. Host name and game name are not implemented yet.
zwu18
2017-07-26 20:42:36 +1200
9a76fa592cAdded keyboard handling to RaceController - Capture each KeyEvent with EventFilter over SplitPane race container
Connor Taylor-Brown
2017-07-26 17:22:54 +1200
9159e16a21Set up controller classes for lobby and host. Made changes to TitleController and MainController. Title screen can now enter lobby and host. #story[1087]
David Wu
2017-07-25 16:15:32 +1200
7e3e865563Host starts with button in ConnectionController - Converted Event to Singleton for configuring and hosting no more than one game instance. - Retrieve address and port from ConnectionAcceptor - Automatically add local host to host list
Connor Taylor-Brown
2017-07-25 15:52:53 +1200
684611a52cadded a background to the water so it is not just white #story[1087]
hba56
2017-07-25 15:31:35 +1200
afadabfeccsmall fix for the sparkline so that it goes from 1 to 6 rather than 0 to 7 for a 6 boat race #story[1087]
hba56
2017-07-25 14:14:36 +1200
eec0cb3493Added fairness to mockOuput list so the index will correspond to the player in order that they entered the hosted game, #story[1010]
Fan-Wu Yang
2017-07-24 17:40:46 +1200
4ba9c6b774Added a pretty title screen to the application.
Jessica McAuslin
2017-07-24 17:38:46 +1200
cfd858194eRemoved Unecessary Print Messages - Removed xml's printing at the start as well as the amount of visualisers connected from spamming the log. - Issue of visualisers connecting when not actually connecting was actually an visual issue as the log spits out the number of visualisers right now before the loop has gotten rid of the useless sockets. #story[1010]
Fan-Wu Yang
2017-07-24 17:36:47 +1200
9f99e21232Added functionality for more than one visualiser to connect to the mock. - more than one visualiser can now connect to the mock. - Created class ConnectionAcceptor that will accept and allocate to each socket - Issue of sockets connecting after the race starts then disconnecting will use a socket slot. #story[1010]
Fan-Wu Yang
2017-07-24 17:27:49 +1200
9d9321522dLinked the first fxml id tags from the fxml files for the new start up screens #story[1087]
hba56
2017-07-24 12:36:45 +1200
eda7d062ecmerged in the changes from the master branch so that latter mergers can run smoothly #story[1087]
hba56
2017-07-24 12:12:12 +1200
595e1a8727Merge remote-tracking branch 'remotes/origin/master' into css
hba56
2017-07-24 12:06:56 +1200
1ebbb8d4c7merged in the changes from the master branch so that latter mergers can run smoothly #story[1087]
hba56
2017-07-24 12:05:00 +1200
738a765a0aMerge remote-tracking branch 'remotes/origin/master' into Game_Controller
hba56
2017-07-24 11:58:01 +1200
86851c6181Merge branch 'sprint5_refactor' into 'master'
Hamish Ball
2017-07-24 11:48:54 +1200
a140e532e8Merge remote-tracking branch 'origin/css' into css
hba56
2017-07-24 11:31:24 +1200
ec50310137Added Messages to Controller For Testing Purposes - Added Pressed, Released, and Held Messages to Controller #story[1006]
Fan-Wu Yang
2017-07-24 02:10:02 +1200
d6d195f381Added Modularity to Input Checker. - Added onHold - Added onRelease - Added ManualTesting Class in the tests - Added Unimplemented new methods to classes #story[1006]
Fan-Wu Yang
2017-07-24 01:59:37 +1200
8514c98805Created FXML files for new start up U-I. #story[1087]
David Wu
2017-07-23 19:32:57 +1200
0598724117Added two more missing javadocs.
fjc40
2017-07-23 14:37:24 +1200
956ad1f59bmerged in the changes from the sprint5_refactor branch # Conflicts: # visualiser/src/main/java/seng302/Model/ResizableRaceMap.java #story[1087]
hba56
2017-07-21 10:58:02 +1200
fjc40 2017-08-05 19:23:32 +1200
Connor Taylor-Brown 2017-08-04 23:08:07 +1200
hba56 2017-08-04 22:19:07 +1200
zwu18 2017-08-04 03:56:55 +1200
Fan-Wu Yang 2017-08-03 23:13:28 +1200
Joseph Gardner 2017-08-03 16:56:52 +1200
Jessica Syder 2017-07-27 14:54:56 +1200