fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
845 Commits 1 Branch 0 Tags
0558629dc698196e3f3ac7b5aa94515a7ae275ab
Commit Graph
142 Commits
Author SHA1 Message Date
hba56 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. 
This branch will not run the game any more as boats can't move on to the next leg until they can be controlled by the user.

#story[1087]
 2017-08-03 13:27:00 +12:00
fjc40 2e325d5177 Added WindGeneratorTest. 2017-08-03 13:21:53 +12:00
fjc40 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]
 2017-08-03 12:56:15 +12:00
fjc40 2a5d0938ff Merge branch 'story48' into Development 2017-08-03 11:07:17 +12:00
Connor Taylor-Brown c8621a7be5 Merge branch 'RaceFactory' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into RaceFactory 2017-08-03 09:01:27 +12:00
zwu18 d9679c1497 Build failing due to junit even though junit passes all tests. Commented out VMGCommand and TackGybeCommand content. 2017-08-03 01:31:05 +12:00
Connor Taylor-Brown 2672c2b13b Separated RaceLogic from MockRace 
- MockRace satisfies refactor requirement for RaceState
- VisualiserRace directly implements Runnable to remove method from MockRace

#story[1094]
 2017-08-03 00:32:17 +12:00
zwu18 b581b01a44 Merge branch 'RaceFactory' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into RaceFactory 
# Conflicts:
#	racevisionGame/src/main/java/mock/model/MockRace.java
 2017-08-03 00:28:44 +12:00
zwu18 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. 
#story[1097]
 2017-08-03 00:22:46 +12:00
Connor Taylor-Brown 0466292bd0 Partially removed VMG optimisation, separated server-specific functionality 
from MockRace into RaceServer.

#story[1094]
 2017-08-02 23:39:13 +12:00
zwu18 7fc1347377 Created class TackGybeCommand which implements the CommandFactory interface. 
#story[1097]
 2017-08-02 22:28:47 +12:00
fjc40 e1905e9e36 javadoc fix. 2017-08-02 18:27:40 +12:00
fjc40 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]
 2017-08-02 18:24:43 +12:00
hba56 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]
 2017-08-02 18:09:12 +12:00
hba56 13922bc284 updated javadoc 
#story[1101]
 2017-08-02 17:06:52 +12:00
hba56 c633de21f5 added new methods to the mock boats to let them check which side a mark is on to them 
#story[1101]
 2017-08-02 16:33:03 +12:00
Joseph Gardner 27cf0e1539 Started splitting MockRace into RaceLogic and RaceState. #refactor #story[1094] 2017-08-02 16:31:55 +12:00
Joseph Gardner b258e94a54 Merged wind generator into this branch. #story[1094] 2017-08-02 15:19:32 +12:00
Joseph Gardner fba256113a Merged wind generator into this branch. #story[1094] 2017-08-02 15:09:59 +12:00
Joseph Gardner 51bbdf9a50 Merge branch 'issue_26_wind' into RaceFactory 
# Conflicts:
#	racevisionGame/src/main/java/mock/model/MockRace.java
#	racevisionGame/src/main/java/shared/model/Race.java
#	racevisionGame/src/main/java/visualiser/model/VisualiserRace.java
 2017-08-02 15:04:55 +12:00
fjc40 ed12ff659d mock: 
Moved wind generation logic and state into the WindGenerator class.
MockRace initialises this, and calls it to update wind.
 2017-08-02 13:59:19 +12:00
Joseph Gardner 81eeca3533 Split wind off from Race and made it its own class. Deleted dnfChance as it is no longer used. 2017-08-02 13:45:10 +12:00
Joseph Gardner 775c32ca92 Made new branch for command architecture. 2017-08-02 12:48:56 +12:00
Joseph Gardner a87879eaa9 Made new branch for command architecture. 2017-08-02 12:41:47 +12:00
fjc40 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]
 2017-08-01 18:45:17 +12:00
fjc40 5af3053537 Added shared.model.Wind class. 
shared.model.Race now uses Wind. It is wrapped in Property<>.
#story[1093]
 2017-08-01 18:15:35 +12:00
David Wu f2932e8bae New branch created for development. 2017-08-01 12:29:05 +12:00
Fan-Wu Yang 442920f9f6 DOD, and added javadocs/fixed javadocs #story[1087] 2017-07-27 16:24:19 +12:00
Jessica Syder 9eaf24e699 Fixed title screen having whitespace on different screen resolutions. 
- Title screen has no white space on edges
- Main controller now anchors title to corners of main window

#story[1087] #pair[fjc40, jam339]
 2017-07-27 14:54:56 +12:00
Jessica Syder 402df18b71 Merge remote-tracking branch 'remotes/origin/master' into css 2017-07-27 14:31:33 +12:00
fjc40 669b8167cd Merge branch 'cbt-multi-controller' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into cbt-multi-controller 2017-07-27 14:08:19 +12:00
fjc40 1b5926007c Visualiser ConnectionController: 
Clicking the host button doesn't create more than one server.
 2017-07-27 14:07:25 +12:00
Joseph Gardner 67c7c88b32 Print statements now print off the actual key action. #story[1089] 2017-07-27 14:06:40 +12:00
fjc40 f91f7055de Visualiser RaceController: 
event.consume() is required to stop the keyboard event from propogating to other controls.
 2017-07-27 13:52:55 +12:00
hba56 92b8b7b77f moved the tm symbol 
#story[1087]
 2017-07-27 13:34:03 +12:00
David Wu 2b8b334486 Updated host to show the hosted address and port. Fixed css issue with lobby text field. 
#story[1087]
 2017-07-27 13:12:39 +12:00
hba56 f4eb03e79e Merge remote-tracking branch 'origin/css' into css 2017-07-27 13:06:07 +12:00
hba56 85347c169d You can now resize all windows other than the title screen 
#story[1087]
 2017-07-27 13:05:56 +12:00
David Wu 28e6709890 Merge remote-tracking branch 'origin/css' into css 
# Conflicts:
#	racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
 2017-07-27 12:42:13 +12:00
David Wu 90f9ec2b98 Changed host menu. Will update soon. 
#story[1087]
 2017-07-27 12:41:46 +12:00
Joseph Gardner 6492ba89ab Merging main features into story 6. App now sends and receives key strokes. #story[1007, 1089] 2017-07-27 12:36:34 +12:00
Joseph Gardner 0ea7fb8c84 Merging main features into story 6. App now sends and receives key strokes. #story[1007, 1089] 2017-07-27 12:23:44 +12:00
hba56 59058da09c textfields now show better colour that contrasts more 
#story[1087]
 2017-07-27 12:23:21 +12:00
hba56 7fafddcf50 updated text to be easily read on daymode 
#pair[zwu18, hba56]
#story[1087]
 2017-07-27 12:09:33 +12:00
hba56 64b4aa539a added and option to swap between css files in the title pane 
#pair[zwu18, hba56]
#story[1087]
 2017-07-27 12:04:17 +12:00
Connor Taylor-Brown 0352e3310d Set up Boat Action Message encoding 
- Fixed command number for sails out

#story[1089]
 2017-07-27 00:48:19 +12:00
Connor Taylor-Brown 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

#story[1089]
 2017-07-26 23:40:39 +12:00
Connor Taylor-Brown 86e8cb7560 Refactored KeyFactory to ensure single instance of each key state handler. 
#story[1089]
 2017-07-26 23:22:05 +12:00
Connor Taylor-Brown 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

#story[1089]
 2017-07-26 22:57:01 +12:00
zwu18 8bb66bc5e4 Commented out test failure. Test was failing due to refactor. 
#story[1087]
 2017-07-26 22:06:42 +12:00