ef61a687d6
Researched and implemented a way for the game to listen for key presses. When one of the valid key controls are pressed, feedback is given in the console. Has yet to be connected to a method which will create and send a message to the server.
...
#pair[kre39,zyt10] #story[988]
2017-07-11 16:32:15 +12:00
1a3e330eb4
Created some basic UI for new start screen (host and connect) and a lobby
...
tags: #story[1047] #pair[wmu16, zyt10]
2017-07-10 13:43:25 +12:00
fe76ef9cdc
Merge remote-tracking branch 'origin/develop'
2017-05-25 16:58:01 +12:00
20b79b40f2
Fix the button position #story[923]
2017-05-25 16:45:35 +12:00
72e2776b7e
Fix the finish screen size #story[923]
2017-05-25 16:41:59 +12:00
ca22615c08
Add scroll bar to the side panel to cater for smaller screen.
2017-05-25 16:18:47 +12:00
559a9f38c0
Merge remote-tracking branch 'origin/develop' into issue#8_create_finish_screen
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/models/stream/StreamParser.java
2017-05-25 16:12:44 +12:00
cec7014856
Set axis ons parkline style
2017-05-25 14:54:34 +12:00
6e903bfbed
Merge branch 'develop' into 38b_LayLines
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/models/Yacht.java
# src/main/java/seng302/models/stream/StreamParser.java
2017-05-25 14:16:55 +12:00
53f6a6b8c5
Implimented a new way to determine positions
...
#story[952]
2017-05-25 14:06:33 +12:00
5ed02a1fe1
Merge remote-tracking branch 'origin/develop' into issue#8_create_finish_screen
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
2017-05-25 12:32:10 +12:00
67b5650288
Merge branch 'develop' into 38b_LayLines
...
# Conflicts:
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/Yacht.java
2017-05-25 09:19:42 +12:00
34c3899ec4
Removed unused css for charts
2017-05-24 18:51:52 +12:00
81c021b59a
Merge branch 'develop' into Story34_Sparklines
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/resources/views/RaceView.fxml
2017-05-24 18:45:01 +12:00
e7060d4b6f
Finish screen will show when race finishes, added functionality to return to start screen when in finish screen, updated finishScreenView.fxml to have controller and also four corner anchors to fit to parent
2017-05-24 16:17:56 +12:00
641039720e
Merge remote-tracking branch 'origin/develop' into issue#8_create_finish_screen
2017-05-24 16:12:37 +12:00
c42942430f
Fixed bug that grid panel pushes annotation panel up out of window.
...
#story[928]
2017-05-24 14:57:06 +12:00
7abb36c362
The axis is labeled correctly and is scaled accordingly.
...
The sparkline should work from the start of a race now also. We now have the boat in first place listed at the top along with the axis labeling and marking matching the position (eg, 1st at top. 6th at bottom). Boats picked up on the visualiser park way through the race are able to added and drawn onto the sparkline.
#story[952]
2017-05-24 14:42:41 +12:00
c449da2916
[WIP] created finishScreenView.fxml, finishScreenViewController.java
2017-05-24 14:24:14 +12:00
397f7d003a
Fixed the size of race canvas and race view so that canvas won't be stretched
...
- canvas view is set to 1280 * 960
#story[928]
2017-05-24 13:54:05 +12:00
189ba93e64
Created a canvas map class to fetch map image from google
...
- also added Bound class to encapsulate map boundary.
- created TestMapView and its controller just for testing.
#story[928]
2017-05-24 00:49:03 +12:00
3f57adb9cf
Merge branch 'develop' into Story34_Sparklines
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/resources/views/RaceView.fxml
2017-05-23 14:06:24 +12:00
87150b3c72
Merge remote-tracking branch 'origin/develop' into 38b_LayLines
2017-05-22 15:40:11 +12:00
e385ac5c09
Initial work on static parser class for polar files
...
story[956]
2017-05-22 15:39:53 +12:00
8f81060a18
Managed to make the sparklines coordinate with their colour.
...
However the symbols had to be removed. The sparkline can also be intialised at any time now but this might need to be tested further to ensure that it works.
#story[952]
2017-05-21 19:49:11 +12:00
390aabc78f
Adding race yacht series to the sparkline.
...
Next step is to make the series of the boats update when new position information is received.
#story[952]
2017-05-18 14:44:10 +12:00
ecc0e722b5
Started sparkline prototype
...
#story[952]
2017-05-18 13:19:59 +12:00
38b44fa92b
Merge branch 'develop' into Issue#4_boat_movement
...
# Conflicts:
# src/main/java/seng302/controllers/Controller.java
# src/main/java/seng302/controllers/RaceController.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/BoatGroup.java
# src/main/java/seng302/models/mark/MarkGroup.java
# src/main/java/seng302/models/stream/StreamParser.java
# src/test/java/seng302/models/stream/StreamReceiverTest.java
2017-05-17 20:05:40 +12:00
6e3d037021
Merge branch 'develop' into 38a_Select_Boats
2017-05-17 14:34:10 +12:00
4da8c1645e
Split Start Screen out from Main View view and controller.
...
#story[923]
2017-05-17 12:56:13 +12:00
2b294702a9
Merge remote-tracking branch 'origin/develop' into 38a_Select_Boats
...
# Conflicts:
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/BoatGroup.java
2017-05-17 09:53:18 +12:00
e03e121da4
Merge branch 'develop' into Story47CourseLimits
...
Conflicts:
src/main/java/seng302/App.java
2017-05-15 18:37:31 +12:00
fc3ca70e5d
Merge branch 'issue#10_unifying_marks' into Issue#4_boat_movement
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/controllers/Controller.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/stream/StreamPacket.java
# src/main/java/seng302/models/stream/StreamParser.java
2017-05-15 18:09:47 +12:00
110143ae6e
Added a dynamically updating course limits file to the model.
...
This will make manual testing of the course limits easier. When the race starts, the limits encapsulate the start line but soon after the race starts the course limits close off around the start line (this is for the model). This means the model acts in a very similar way to the actual live stream.
#story[889]
2017-05-15 17:09:12 +12:00
51f090324a
CSS on annotation selection and minor bug fixes. Changed annotation slider to only have None, important and All
...
#story[955]
2017-05-15 16:44:28 +12:00
5fa47ff65b
Implemented elapsed time since last mark on annotation.
...
#story[927]
2017-05-15 16:31:04 +12:00
764ae37ce4
Gave the boatgroups a selection attribute, allowing them to be highlighted upon clicking
...
Boats can be clicked on canvas or from selection drop down on the side
#story[955]
2017-05-15 14:09:09 +12:00
04b105d74b
Merge branch 'develop' into story33_add_estimated_time_annotation
...
# Conflicts:
# src/main/java/seng302/controllers/RaceViewController.java
2017-05-15 10:19:58 +12:00
ff6bfc9516
Important annotations are displayed correctly when updated.
...
- Important annotations can be selected, the live view updates in real time
- Change local time text colour to white
- Split the important annotations state into a separate class
Tags: #story[926]
2017-05-14 20:27:25 +12:00
03ca60f2e1
deleted a whole bunch of legacy code, primarily the old controllers and old parsers #story[923]
2017-05-14 20:12:35 +12:00
47880d09bc
Implemented estimated time to next mark. Added checkbox for estimated time to next mark. To be fix: change from long to human readable time, update time every second
...
#story[923]
2017-05-12 20:04:09 +12:00
a23bdd0c53
Added functionality to select important annotations and ui changes
...
- Added CSS for the race view & welcome screen
- Added view to select important annotations
- Annotations are enabled/disabled when the user changes the important annotations
Tags: #story[926]
2017-05-11 21:44:56 +12:00
07234ee33a
Updated start screen team list to show position in race. Created Yacht class to replace Boat class. Removed Boat class from XMLParser. Removed unused BoatParser.java.
...
#story[572]
2017-05-04 04:16:16 +12:00
d992422efd
Various bug fixes
...
- Made canvas fill entire screen
- Made window scale to screens that aren't 1920x1080
- Changed boat speeds in mock so they aren't too fast
- Added command line options to switch server
Tags: #story[829]
2017-05-03 21:56:51 +12:00
772ece25a0
Implemented real time race clock on the start screen using data from stream.
...
#story[594]
2017-05-02 22:39:33 +12:00
ee6a543f8d
Fixed timer separator instead of dot to semicolon, and fixed the timer position in race canvas, and updated the start screen so it does not grow vertically
...
#story[572]
2017-05-01 18:35:17 +12:00
a9709c4f84
Merged the mock server to visualisation.
...
#story[715] #story[716]
2017-05-01 17:42:07 +12:00
978493853d
Merge branch 'Story29' into merge_branch_front
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/controllers/Controller.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/Boat.java
# src/main/java/seng302/models/Colors.java
# src/main/java/seng302/models/Event.java
# src/main/java/seng302/models/Race.java
# src/main/java/seng302/models/mark/GateMark.java
# src/main/java/seng302/models/mark/Mark.java
# src/main/java/seng302/models/mark/MarkType.java
# src/main/java/seng302/models/mark/SingleMark.java
# src/main/java/seng302/models/parsers/CourseParser.java
# src/main/java/seng302/models/parsers/TeamsParser.java
# src/main/resources/views/MainView.fxml
# src/main/resources/views/RaceView.fxml
# src/test/java/seng302/BoatTest.java
# src/test/java/seng302/ColorsTest.java
# src/test/java/seng302/EventTest.java
# src/test/java/seng302/models/mark/MarkTest.java
# src/test/java/seng302/models/parsers/CourseParserTest.java
2017-05-01 17:06:17 +12:00
9a864cc2bd
Merge remote-tracking branch 'origin/Mark_to_MarkGroup' into wake_remake
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/controllers/Controller.java
# src/main/java/seng302/models/BoatGroup.java
# src/main/java/seng302/models/Wake.java
# src/main/java/seng302/models/parsers/StreamParser.java
# src/main/resources/views/MainView.fxml
2017-05-01 15:59:14 +12:00
ec57851de2
Created annotation slider to display different levels of annotations
...
Removed toggleAnnotations method as abstract from race object and made only for boat group as it didnt make sense for markgroup, at least not currently as they have no annotations to show
#story[558]
2017-04-30 23:24:24 +12:00
Kusal Ekanayake
William Muir
Michael Rausch
Zhi You Tan
Haoming Yin
Peter Galloway
Michael Rausch