Fan-Wu Yang
b5e414f97a
Made all the model classes extend off the schema xml classes for race, and made xml builder, validator and reader utility class.
...
#story[1092]
8 years ago
Fan-Wu Yang
70d5447e88
Moving stuff from school pc to home
8 years ago
Fan-Wu Yang
8999cddf8b
Pre merge commit
8 years ago
Fan-Wu Yang
820898d92c
pushed work from school computer to do at home
8 years ago
Fan-Wu Yang
7c6f0931ba
Transferring files from my laptop to desktop to work on, may be broken.
8 years ago
Fan-Wu Yang
a460df3e4d
Fixed Javadocs that were causing the build to fail. #story[1096]
8 years ago
Fan-Wu Yang
0f9b191ccb
Added doc strings to RaceXML Creator #story[1096]
8 years ago
Fan-Wu Yang
fef35d0b00
The race is rotated with it's initial rotation in mind
...
- RaceXMLCreator now checks the bearing of the race with getLineAngle()
- Split some methods into functions so that it is more readable
#story[1096]
8 years ago
Fan-Wu Yang
2ce1c0786e
The course points can now be rotated,
...
- Created markToGPSCoordinate Class
- Added Rotation to marks
#story[1092]
8 years ago
Fan-Wu Yang
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]
8 years ago
Fan-Wu Yang
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]
8 years ago
Fan-Wu Yang
a8701d8a1f
Merge branch 'css' into 'master'
...
CSS merge into master branch
See merge request !18
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
Fraser Cope
7966ac41fb
Merge branch 'cbt-multi-controller' into 'master'
...
Cbt multi controller
Covers stories 4 and 6.
See merge request !17
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