7feddeb49f
Merge branch 'master' into story48
fjc402017-08-05 15:23:33 +12:00
554f8a2a0f
Added 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-Brown2017-08-04 23:08:07 +12:00
0b74acadff
rounding checks are now done by port or starboard side depending on what the compound marks type is #story[1101]
hba562017-08-04 22:19:07 +12:00
db1efab225
rounding checks are now done by port or starboard side depending on what the compound marks type is #story[1101]
hba562017-08-04 22:17:17 +12:00
be8b0e672d
Updated the xml reader to pull in the rounding type of the compound marks and set each mark with that value #story[1101]
hba562017-08-04 22:01:21 +12:00
425cc7f91f
Changed ControlKey to use BoatActionEnum instead of magic numbers.
Connor Taylor-Brown2017-08-04 21:27:53 +12:00
14ce5fcaff
Made changes to TackGybeCommand and VMGCommand classes to fit pattern layout.
zwu182017-08-04 03:56:55 +12:00
6e699f7037
Merge branch 'RaceFactory' into CommandFactory
zwu182017-08-04 03:00:31 +12:00
f23c3f854d
Seperated 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 Yang2017-08-03 23:13:28 +12:00
148108a658
CommandFactory uses BoatActionEnum instead of raw ints. #story[1094]
fjc402017-08-03 21:11:25 +12:00
c83442761c
Implemented Factory for Command objects and fixed Command Pattern implementation. - Commands now have standard 0-parameter execute method - Commands are created by CommandFactory
Connor Taylor-Brown2017-08-03 17:54:03 +12:00
40a3ed1bb0
Boats now store whether autoVMG is on or off, boat speed scales off their bearing relative to the TWA. #story[1094]
Joseph Gardner2017-08-03 16:56:52 +12:00
f212414bd9
Added 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.
hba562017-08-03 13:27:00 +12:00
e4999a3c93
Added 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]
fjc402017-08-03 12:56:15 +12:00
2a5d0938ff
Merge branch 'story48' into Development
fjc402017-08-03 11:07:17 +12:00
4e8d4f2433
Created 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 Yang2017-08-03 02:42:33 +12:00
d9679c1497
Build failing due to junit even though junit passes all tests. Commented out VMGCommand and TackGybeCommand content.
zwu182017-08-03 01:31:05 +12:00
2672c2b13b
Separated RaceLogic from MockRace - MockRace satisfies refactor requirement for RaceState - VisualiserRace directly implements Runnable to remove method from MockRace
Connor Taylor-Brown2017-08-03 00:32:17 +12:00
ad61dc6bce
Implemented runCommand method in VMGCommand and TackGybeCommand classes. Both classes currently rely on the MockRace class so changes will be required when MockRace is refactored.
zwu182017-08-03 00:22:46 +12:00
0466292bd0
Partially removed VMG optimisation, separated server-specific functionality from MockRace into RaceServer.
Connor Taylor-Brown2017-08-02 23:39:13 +12:00
7fc1347377
Created class TackGybeCommand which implements the CommandFactory interface.
zwu182017-08-02 22:28:47 +12:00
9889a474ee
Added 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]
fjc402017-08-02 18:24:43 +12:00
b7af4e19cf
new 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]
hba562017-08-02 18:09:12 +12:00
c633de21f5
added new methods to the mock boats to let them check which side a mark is on to them #story[1101]
hba562017-08-02 16:33:03 +12:00
27cf0e1539
Started splitting MockRace into RaceLogic and RaceState. #refactor #story[1094]
Joseph Gardner2017-08-02 16:31:55 +12:00
b258e94a54
Merged wind generator into this branch. #story[1094]
Joseph Gardner2017-08-02 15:19:32 +12:00
577a1d1b5a
Merge remote-tracking branch 'origin/RaceFactory' into RaceFactory
Joseph Gardner2017-08-02 15:10:36 +12:00
fba256113a
Merged wind generator into this branch. #story[1094]
Joseph Gardner2017-08-02 15:09:59 +12:00
51bbdf9a50
Merge branch 'issue_26_wind' into RaceFactory
Joseph Gardner2017-08-02 15:04:55 +12:00
ed12ff659d
mock: Moved wind generation logic and state into the WindGenerator class. MockRace initialises this, and calls it to update wind.
fjc402017-08-02 13:59:19 +12:00
9249e74e3a
Merge remote-tracking branch 'origin/RaceFactory' into RaceFactory
cbt242017-08-02 13:58:26 +12:00
a4592a10e6
Removed boundary checking logic to clean up MockRace before split
cbt242017-08-02 13:51:07 +12:00
81eeca3533
Split wind off from Race and made it its own class. Deleted dnfChance as it is no longer used.
Joseph Gardner2017-08-02 13:45:10 +12:00
99f3310d8b
Created a setWind(bearing, knots) in Race, which updates the Wind with new values. MockRace now uses Wind. VisualiserRace now uses Wind. #story[1093]
fjc402017-08-01 18:45:17 +12:00
5af3053537
Added shared.model.Wind class. shared.model.Race now uses Wind. It is wrapped in Property<>. #story[1093]
fjc402017-08-01 18:15:35 +12:00
f2932e8bae
New branch created for development.
David Wu2017-08-01 12:29:05 +12:00
fcea323cfd
The 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.
fjc402017-07-28 09:30:26 +12:00
7966ac41fb
Merge branch 'cbt-multi-controller' into 'master'
Fraser Cope2017-07-27 14:23:52 +12:00
669b8167cd
Merge branch 'cbt-multi-controller' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into cbt-multi-controller
fjc402017-07-27 14:08:19 +12:00
1b5926007c
Visualiser ConnectionController: Clicking the host button doesn't create more than one server.
fjc402017-07-27 14:07:25 +12:00
67c7c88b32
Print statements now print off the actual key action. #story[1089]
Joseph Gardner2017-07-27 14:06:40 +12:00
f91f7055de
Visualiser RaceController: event.consume() is required to stop the keyboard event from propogating to other controls.
fjc402017-07-27 13:52:55 +12:00
92b8b7b77f
moved the tm symbol #story[1087]
hba562017-07-27 13:34:03 +12:00
2b8b334486
Updated host to show the hosted address and port. Fixed css issue with lobby text field. #story[1087]
David Wu2017-07-27 13:12:39 +12:00
f4eb03e79e
Merge remote-tracking branch 'origin/css' into css
hba562017-07-27 13:06:07 +12:00
85347c169d
You can now resize all windows other than the title screen #story[1087]
hba562017-07-27 13:05:56 +12:00
28e6709890
Merge remote-tracking branch 'origin/css' into css
David Wu2017-07-27 12:42:13 +12:00
90f9ec2b98
Changed host menu. Will update soon. #story[1087]
David Wu2017-07-27 12:41:46 +12:00
6492ba89ab
Merging main features into story 6. App now sends and receives key strokes. #story[1007, 1089]
Joseph Gardner2017-07-27 12:36:34 +12:00
0ea7fb8c84
Merging main features into story 6. App now sends and receives key strokes. #story[1007, 1089]
Joseph Gardner2017-07-27 12:23:44 +12:00
59058da09c
textfields now show better colour that contrasts more #story[1087]
hba562017-07-27 12:23:21 +12:00
7fafddcf50
updated text to be easily read on daymode #pair[zwu18, hba56] #story[1087]
hba562017-07-27 12:09:33 +12:00
64b4aa539a
added and option to swap between css files in the title pane #pair[zwu18, hba56] #story[1087]
hba562017-07-27 12:04:17 +12:00
0352e3310d
Set up Boat Action Message encoding - Fixed command number for sails out
Connor Taylor-Brown2017-07-27 00:48:19 +12:00
e670ded66d
ControllerClient 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-Brown2017-07-26 23:40:39 +12:00
86e8cb7560
Refactored KeyFactory to ensure single instance of each key state handler.
Connor Taylor-Brown2017-07-26 23:22:05 +12:00
cc264f318e
Added 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-Brown2017-07-26 22:57:01 +12:00
8bb66bc5e4
Commented out test failure. Test was failing due to refactor.
zwu182017-07-26 22:06:42 +12:00
53a01402e1
Check method moved to new class called ping so that refresh will be called on new thread.
zwu182017-07-26 21:59:43 +12:00
243c450790
Merged with multi visualiser branch so now multiple visualisers can connect to the same host.
zwu182017-07-26 21:08:13 +12:00
88604df66d
Merge branch 'cbt-multi-controller' into css
zwu182017-07-26 20:54:07 +12:00
9c9b98f882
Added functionality to host game and join a game in lobby. Host name and game name are not implemented yet.
zwu182017-07-26 20:42:36 +12:00
9a76fa592c
Added keyboard handling to RaceController - Capture each KeyEvent with EventFilter over SplitPane race container
Connor Taylor-Brown2017-07-26 17:22:54 +12:00
9159e16a21
Set up controller classes for lobby and host. Made changes to TitleController and MainController. Title screen can now enter lobby and host. #story[1087]
David Wu2017-07-25 16:15:32 +12:00
7e3e865563
Host 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-Brown2017-07-25 15:52:53 +12:00
684611a52c
added a background to the water so it is not just white #story[1087]
hba562017-07-25 15:31:35 +12:00
afadabfecc
small fix for the sparkline so that it goes from 1 to 6 rather than 0 to 7 for a 6 boat race #story[1087]
hba562017-07-25 14:14:36 +12:00
eec0cb3493
Added fairness to mockOuput list so the index will correspond to the player in order that they entered the hosted game, #story[1010]
Fan-Wu Yang2017-07-24 17:40:46 +12:00
cfd858194e
Removed 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 Yang2017-07-24 17:36:47 +12:00
9f99e21232
Added 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 Yang2017-07-24 17:27:49 +12:00
9d9321522d
Linked the first fxml id tags from the fxml files for the new start up screens #story[1087]
hba562017-07-24 12:36:45 +12:00
eda7d062ec
merged in the changes from the master branch so that latter mergers can run smoothly #story[1087]
hba562017-07-24 12:12:12 +12:00
595e1a8727
Merge remote-tracking branch 'remotes/origin/master' into css
hba562017-07-24 12:06:56 +12:00
1ebbb8d4c7
merged in the changes from the master branch so that latter mergers can run smoothly #story[1087]
hba562017-07-24 12:05:00 +12:00
738a765a0a
Merge remote-tracking branch 'remotes/origin/master' into Game_Controller
hba562017-07-24 11:58:01 +12:00
86851c6181
Merge branch 'sprint5_refactor' into 'master'
Hamish Ball2017-07-24 11:48:54 +12:00
a140e532e8
Merge remote-tracking branch 'origin/css' into css
hba562017-07-24 11:31:24 +12:00
ec50310137
Added Messages to Controller For Testing Purposes - Added Pressed, Released, and Held Messages to Controller #story[1006]
Fan-Wu Yang2017-07-24 02:10:02 +12:00
d6d195f381
Added Modularity to Input Checker. - Added onHold - Added onRelease - Added ManualTesting Class in the tests - Added Unimplemented new methods to classes #story[1006]
Fan-Wu Yang2017-07-24 01:59:37 +12:00
8514c98805
Created FXML files for new start up U-I. #story[1087]
David Wu2017-07-23 19:32:57 +12:00
0598724117
Added two more missing javadocs.
fjc402017-07-23 14:37:24 +12:00
956ad1f59b
merged in the changes from the sprint5_refactor branch # Conflicts: # visualiser/src/main/java/seng302/Model/ResizableRaceMap.java #story[1087]
hba562017-07-21 10:58:02 +12:00
fjc40
Connor Taylor-Brown
hba56
zwu18
Fan-Wu Yang
Joseph Gardner
Jessica Syder