fjc40
31ce9fff94
Added BoatActonEncoder.
...
Updated ControllerClient to use RaceVisionByteEncoder.encode(message). It also logs a warning if the encoding fails. Also removed pointless and out of place encode/decode of the action enum.
Added a BoatActionDecoderTest which tests encoding/decoding a BoatAction Message.
issue #35 #36
#story[1095]
8 years ago
fjc40
16686678a7
Added an InvalidMessageTypeException - thrown whenever we encounter a MessageType that isn't recognised or isn't supported.
...
Added EncoderFactory. This creates specific MessageEncoders. Supports JoinAcceptance and RequestToJoin.
Added MessageEncoder interface.
Added JoinAcceptanceEncoder.
Added encode(AC35Data) function to RaceVisionByteEncoder.
Added RequestToJonEncoder.
Updated RequestToJoin and JoinAcceptance decode/encode tests to use the above.
issue #35 #36
#story[1095]
8 years ago
fjc40
7ea5b31fa1
RequestToJoinEnum contains an int instead of a byte.
...
Added requestToJoin and joinAcceptance encoding functions to RaceVisionByteEncoder.
Implemented JoinAcceptanceDecoder.
Implemented RequestToJoinDecoder.
Added tests for encoding/decoding RequestToJoin and JoinAcceptance messages.
issue #35
#story[1095]
8 years ago
fjc40
ca2b8a8899
Added missing javadoc.
...
#story[1095]
8 years ago
fjc40
f65ed79619
Implemented RequestToJoin and JoinAcceptance messages.
...
Also added their message types to MessageType.
issue #35
#story[1095]
8 years ago
fjc40
1385500e68
Added JoinAcceptance and RequestToJoin enumerations.
...
Issue #35
#story[1095]
8 years ago
fjc40
7feddeb49f
Merge branch 'master' into story48
8 years ago
Connor Taylor-Brown
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
8 years ago
hba56
0b74acadff
rounding checks are now done by port or starboard side depending on what the compound marks type is
...
#story[1101]
8 years ago
hba56
db1efab225
rounding checks are now done by port or starboard side depending on what the compound marks type is
...
#story[1101]
8 years ago
hba56
be8b0e672d
Updated the xml reader to pull in the rounding type of the compound marks and set each mark with that value
...
#story[1101]
8 years ago
Connor Taylor-Brown
425cc7f91f
Changed ControlKey to use BoatActionEnum instead of magic numbers.
8 years ago
zwu18
14ce5fcaff
Made changes to TackGybeCommand and VMGCommand classes to fit pattern layout.
...
#Story[1097]
8 years ago
zwu18
6e699f7037
Merge branch 'RaceFactory' into CommandFactory
8 years ago
Connor Taylor-Brown
851bbb4fde
Merged branch "RaceFactory" with master
8 years ago
fjc40
148108a658
CommandFactory uses BoatActionEnum instead of raw ints.
...
#story[1094]
8 years ago
Connor Taylor-Brown
c83442761c
Implemented Factory for Command objects and fixed Command Pattern implementation.
...
- Commands now have standard 0-parameter execute method
- Commands are created by CommandFactory
#story[1094]
8 years ago
Joseph Gardner
40a3ed1bb0
Boats now store whether autoVMG is on or off, boat speed scales off their bearing relative to the TWA. #story[1094]
8 years ago
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]
8 years ago
fjc40
2e325d5177
Added WindGeneratorTest.
8 years ago
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]
8 years ago
fjc40
2a5d0938ff
Merge branch 'story48' into Development
8 years ago
Connor Taylor-Brown
c8621a7be5
Merge branch 'RaceFactory' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into RaceFactory
8 years ago
zwu18
d9679c1497
Build failing due to junit even though junit passes all tests. Commented out VMGCommand and TackGybeCommand content.
8 years ago
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]
8 years ago
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
8 years ago
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]
8 years ago
Connor Taylor-Brown
0466292bd0
Partially removed VMG optimisation, separated server-specific functionality
...
from MockRace into RaceServer.
#story[1094]
8 years ago
zwu18
7fc1347377
Created class TackGybeCommand which implements the CommandFactory interface.
...
#story[1097]
8 years ago
fjc40
e1905e9e36
javadoc fix.
8 years ago
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]
8 years ago
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]
8 years ago
hba56
13922bc284
updated javadoc
...
#story[1101]
8 years ago
hba56
c633de21f5
added new methods to the mock boats to let them check which side a mark is on to them
...
#story[1101]
8 years ago
Joseph Gardner
27cf0e1539
Started splitting MockRace into RaceLogic and RaceState. #refactor #story[1094]
8 years ago
Joseph Gardner
b258e94a54
Merged wind generator into this branch. #story[1094]
8 years ago
Joseph Gardner
fba256113a
Merged wind generator into this branch. #story[1094]
8 years ago
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
8 years ago
fjc40
ed12ff659d
mock:
...
Moved wind generation logic and state into the WindGenerator class.
MockRace initialises this, and calls it to update wind.
8 years ago
Joseph Gardner
81eeca3533
Split wind off from Race and made it its own class. Deleted dnfChance as it is no longer used.
8 years ago
Joseph Gardner
775c32ca92
Made new branch for command architecture.
8 years ago
Joseph Gardner
a87879eaa9
Made new branch for command architecture.
8 years ago
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]
9 years ago
fjc40
5af3053537
Added shared.model.Wind class.
...
shared.model.Race now uses Wind. It is wrapped in Property<>.
#story[1093]
9 years ago
David Wu
f2932e8bae
New branch created for development.
9 years ago
fjc40
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.
9 years ago
Fan-Wu Yang
442920f9f6
DOD, and added javadocs/fixed javadocs #story[1087]
9 years ago
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]
9 years ago
Jessica Syder
402df18b71
Merge remote-tracking branch 'remotes/origin/master' into css
9 years ago
fjc40
669b8167cd
Merge branch 'cbt-multi-controller' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into cbt-multi-controller
9 years ago
fjc40
1b5926007c
Visualiser ConnectionController:
...
Clicking the host button doesn't create more than one server.
9 years ago
Joseph Gardner
67c7c88b32
Print statements now print off the actual key action. #story[1089]
9 years ago
fjc40
f91f7055de
Visualiser RaceController:
...
event.consume() is required to stop the keyboard event from propogating to other controls.
9 years ago
hba56
92b8b7b77f
moved the tm symbol
...
#story[1087]
9 years ago
David Wu
2b8b334486
Updated host to show the hosted address and port. Fixed css issue with lobby text field.
...
#story[1087]
9 years ago
hba56
f4eb03e79e
Merge remote-tracking branch 'origin/css' into css
9 years ago
hba56
85347c169d
You can now resize all windows other than the title screen
...
#story[1087]
9 years ago
David Wu
28e6709890
Merge remote-tracking branch 'origin/css' into css
...
# Conflicts:
# racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
9 years ago
David Wu
90f9ec2b98
Changed host menu. Will update soon.
...
#story[1087]
9 years ago
Joseph Gardner
6492ba89ab
Merging main features into story 6. App now sends and receives key strokes. #story[1007, 1089]
9 years ago
Joseph Gardner
0ea7fb8c84
Merging main features into story 6. App now sends and receives key strokes. #story[1007, 1089]
9 years ago
hba56
59058da09c
textfields now show better colour that contrasts more
...
#story[1087]
9 years ago
hba56
7fafddcf50
updated text to be easily read on daymode
...
#pair[zwu18, hba56]
#story[1087]
9 years ago
hba56
64b4aa539a
added and option to swap between css files in the title pane
...
#pair[zwu18, hba56]
#story[1087]
9 years ago
Connor Taylor-Brown
0352e3310d
Set up Boat Action Message encoding
...
- Fixed command number for sails out
#story[1089]
9 years ago
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]
9 years ago
Connor Taylor-Brown
86e8cb7560
Refactored KeyFactory to ensure single instance of each key state handler.
...
#story[1089]
9 years ago
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]
9 years ago
zwu18
8bb66bc5e4
Commented out test failure. Test was failing due to refactor.
...
#story[1087]
9 years ago
zwu18
53a01402e1
Check method moved to new class called ping so that refresh will be called on new thread.
...
#story[1087]
9 years ago
zwu18
243c450790
Merged with multi visualiser branch so now multiple visualisers can connect to the same host.
...
#story[1087]
9 years ago
zwu18
88604df66d
Merge branch 'cbt-multi-controller' into css
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/App.java
# racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java
# racevisionGame/src/main/java/visualiser/app/App.java
# racevisionGame/src/main/java/visualiser/model/RaceConnection.java
# racevisionGame/src/main/resources/visualiser/scenes/connect.fxml
9 years ago
zwu18
9c9b98f882
Added functionality to host game and join a game in lobby. Host name and game name are not implemented yet.
...
#story[1087]
9 years ago
Connor Taylor-Brown
9a76fa592c
Added keyboard handling to RaceController
...
- Capture each KeyEvent with EventFilter over SplitPane race container
#story[1010]
9 years ago
David Wu
578f04c74f
Merge branch 'css' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into css
9 years ago
David Wu
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]
9 years ago
Connor Taylor-Brown
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
#story[1010]
9 years ago
hba56
684611a52c
added a background to the water so it is not just white
...
#story[1087]
9 years ago
Connor Taylor-Brown
a27c16d413
Merge remote-tracking branch 'remotes/origin/Game_Controller' into cbt-multi-controller
9 years ago
hba56
913946265d
Merge branch 'css' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into css
9 years ago
hba56
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]
9 years ago
Fan-Wu Yang
eec0cb3493
Added fairness to mockOuput list so the index will correspond to the player in order that they entered the hosted game, #story[1010]
9 years ago
Jessica McAuslin
4ba9c6b774
Added a pretty title screen to the application.
...
- Created a GUI title screen
- Drew images to be display on the title
- Created controller for the title
- Changed visualiser main to initially display title
- Added functionality for host button
#story[1087]
9 years ago
Fan-Wu Yang
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]
9 years ago
Fan-Wu Yang
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]
9 years ago
hba56
9d9321522d
Linked the first fxml id tags from the fxml files for the new start up screens
...
#story[1087]
9 years ago
hba56
eda7d062ec
merged in the changes from the master branch so that latter mergers can run smoothly
...
#story[1087]
9 years ago
hba56
595e1a8727
Merge remote-tracking branch 'remotes/origin/master' into css
9 years ago
hba56
1ebbb8d4c7
merged in the changes from the master branch so that latter mergers can run smoothly
...
#story[1087]
9 years ago
hba56
738a765a0a
Merge remote-tracking branch 'remotes/origin/master' into Game_Controller
9 years ago
fjc40
0598724117
Added two more missing javadocs.
9 years ago
hba56
956ad1f59b
merged in the changes from the sprint5_refactor branch
...
# Conflicts:
# visualiser/src/main/java/seng302/Model/ResizableRaceMap.java
#story[1087]
9 years ago
hba56
0d5bede349
java doc fixes to fix the ci build problems
...
#story[1003]
9 years ago
hba56
08f74f608f
trying to see if ci works while logged in to the ienabler when ssh
...
#story[1003]
9 years ago
fjc40
38f3fe16a0
Revert "Added travis_wait to test CI build order."
...
This reverts commit 350ec41beb .
9 years ago
fjc40
350ec41beb
Added travis_wait to test CI build order.
9 years ago
fjc40
5cddaaed8e
mock.app.App now tells mock.app.Event that the xml file strings are XMLFileType.Contents.
...
Made network.MessageEncoders.RaceVisionByteEncoder methods static (they were effectively static already).
shared.dataInput.XMLReader#readXMLFileToString(..) now throws an XMLReaderException if the file cannot be found.
visualiser.Controllers.StartController assumed XML messages were resource paths instead of file contents - fixed.
Testing:
networking tests now work again.
9 years ago
fjc40
4bcfc01ceb
shared.dataInput:
...
Added shared.enums.XMLFileType, which is used to specify if a string contains a file path or file contents.
Updated the XML readers to use it.
Testing:
Moved the networking tests and resources into racevisionGame module.
Moved the remaining tests from visualiser into racevisionGame, and added a few empty tests to implement later.
9 years ago
fjc40
10e80bca05
Moved mock.app.App#readFile(...) to shared.dataInput.XMLReader#readXMLFileToString(...).
...
Did the bare minimum to get the mock.model, mock.dataInput, shared.model tests working - many of them need to be tidied/refactored/moved as they don't take into account most of the refactorings.
9 years ago
fjc40
d0c6b5f716
Moved mock.model and mock.dataInput tests into the racevisionGame.tests.mock package.
9 years ago