402df18b71
Merge remote-tracking branch 'remotes/origin/master' into css
9 years ago
7966ac41fb
Merge branch 'cbt-multi-controller' into 'master'
...
Cbt multi controller
Covers stories 4 and 6.
See merge request !17
9 years ago
669b8167cd
Merge branch 'cbt-multi-controller' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into cbt-multi-controller
9 years ago
1b5926007c
Visualiser ConnectionController:
...
Clicking the host button doesn't create more than one server.
9 years ago
67c7c88b32
Print statements now print off the actual key action. #story[1089]
9 years ago
f91f7055de
Visualiser RaceController:
...
event.consume() is required to stop the keyboard event from propogating to other controls.
9 years ago
92b8b7b77f
moved the tm symbol
...
#story[1087]
9 years ago
2b8b334486
Updated host to show the hosted address and port. Fixed css issue with lobby text field.
...
#story[1087]
9 years ago
f4eb03e79e
Merge remote-tracking branch 'origin/css' into css
9 years ago
85347c169d
You can now resize all windows other than the title screen
...
#story[1087]
9 years ago
28e6709890
Merge remote-tracking branch 'origin/css' into css
...
# Conflicts:
# racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
9 years ago
90f9ec2b98
Changed host menu. Will update soon.
...
#story[1087]
9 years ago
6492ba89ab
Merging main features into story 6. App now sends and receives key strokes. #story[1007, 1089]
9 years ago
0ea7fb8c84
Merging main features into story 6. App now sends and receives key strokes. #story[1007, 1089]
9 years ago
59058da09c
textfields now show better colour that contrasts more
...
#story[1087]
9 years ago
7fafddcf50
updated text to be easily read on daymode
...
#pair[zwu18, hba56]
#story[1087]
9 years ago
64b4aa539a
added and option to swap between css files in the title pane
...
#pair[zwu18, hba56]
#story[1087]
9 years ago
0352e3310d
Set up Boat Action Message encoding
...
- Fixed command number for sails out
#story[1089]
9 years ago
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
86e8cb7560
Refactored KeyFactory to ensure single instance of each key state handler.
...
#story[1089]
9 years ago
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
8bb66bc5e4
Commented out test failure. Test was failing due to refactor.
...
#story[1087]
9 years ago
53a01402e1
Check method moved to new class called ping so that refresh will be called on new thread.
...
#story[1087]
9 years ago
243c450790
Merged with multi visualiser branch so now multiple visualisers can connect to the same host.
...
#story[1087]
9 years ago
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
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
9a76fa592c
Added keyboard handling to RaceController
...
- Capture each KeyEvent with EventFilter over SplitPane race container
#story[1010]
9 years ago
578f04c74f
Merge branch 'css' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into css
9 years ago
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
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
684611a52c
added a background to the water so it is not just white
...
#story[1087]
9 years ago
a27c16d413
Merge remote-tracking branch 'remotes/origin/Game_Controller' into cbt-multi-controller
9 years ago
913946265d
Merge branch 'css' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into css
9 years ago
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
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
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
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
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
9d9321522d
Linked the first fxml id tags from the fxml files for the new start up screens
...
#story[1087]
9 years ago
eda7d062ec
merged in the changes from the master branch so that latter mergers can run smoothly
...
#story[1087]
9 years ago
595e1a8727
Merge remote-tracking branch 'remotes/origin/master' into css
9 years ago
1ebbb8d4c7
merged in the changes from the master branch so that latter mergers can run smoothly
...
#story[1087]
9 years ago
738a765a0a
Merge remote-tracking branch 'remotes/origin/master' into Game_Controller
9 years ago
86851c6181
Merge branch 'sprint5_refactor' into 'master'
...
Sprint5 refactor
This branch refactors most of the codebase and merges everything into a single module (racevisionGame).
This has feature parity with the master branch from what I can tell, and fixes a few bugs/issues.
However, the sparkline y axis labelling isn't exactly the same. Instead of being labelled 1, 2, 3, 4, 5, 6, it's labelled (1, 7).
Acceptance criteria:
1. Feature parity with master branch. (There's an app class in each of the mock and visualiser packages.
2. Tests all pass.
3. Code is actually tidier and easier to reason about, and documented.
See merge request !16
9 years ago
a140e532e8
Merge remote-tracking branch 'origin/css' into css
9 years ago
ec50310137
Added Messages to Controller For Testing Purposes
...
- Added Pressed, Released, and Held Messages to Controller
#story[1006]
9 years ago
d6d195f381
Added Modularity to Input Checker.
...
- Added onHold
- Added onRelease
- Added ManualTesting Class in the tests
- Added Unimplemented new methods to classes
#story[1006]
9 years ago
8514c98805
Created FXML files for new start up U-I. #story[1087]
9 years ago
0598724117
Added two more missing javadocs.
9 years ago
956ad1f59b
merged in the changes from the sprint5_refactor branch
...
# Conflicts:
# visualiser/src/main/java/seng302/Model/ResizableRaceMap.java
#story[1087]
9 years ago
Jessica Syder
Fraser Cope
Joseph Gardner
hba56
David Wu
Connor Taylor-Brown
Fan-Wu Yang