0621e1bdb1
Finished up lobby menu. Set split pane to not change size on resize. Disabled divider on split pane. Added quit button and start button (start only prints to terminal for now). Panes are now wrapped in an anchor pane to fix resizing issues. TODO: Will be working on making a nicer background animation.
8 years ago
c63403d1de
Created new lobby menu. Working on animated background for menu.
8 years ago
1b1b0a4591
Added floating test cube in title screen initialiser
...
#story[1191]
8 years ago
eb980c436e
Wind arrow now points in the direction the wind is blowing, as per P.O feedback (again....).
8 years ago
a9fde95b39
Updated maven version to 2.0.
...
Added a dedicatedServer module.
Removed Visualiser module.
Removed mock module.
Removed network module.
Fixed weird exception non-handling that appeared for some reason.
8 years ago
0d2be85d17
Brought over long/latitude fix from "rounding_line_visible_hack" branch.
8 years ago
b886cb426f
guide line last leg fix
8 years ago
666c7b029f
Disabled map rotation - temp fix for the demo.
...
Set race to use 3 boat race.xml file.
8 years ago
37095bfc6c
Merged master into branch.
8 years ago
5234cdea66
Merge branch 'master' into new_issue#19
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
8 years ago
598275591f
Updated javadoc.
8 years ago
5ba6f52669
fixed autovmg.
8 years ago
79add59375
Unresizable control screen.
8 years ago
f1ef75fb81
Merge branch 'master' into new_issue#19
8 years ago
03dd937713
Change fxml stuff. Added back to menu buttons.
8 years ago
dcd1df2999
Merged master.
8 years ago
014b78f166
Merge branch 'master' into story_64_sails
8 years ago
83b0c0a6b4
Fixed issue using File from java.io.File which did not like maven
8 years ago
9f813ab7aa
Merged in development.
8 years ago
e26fb73627
Merged master.
8 years ago
288979be3b
Merge branch 'Development' into new_issue#19
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
# racevisionGame/src/main/java/visualiser/app/App.java
8 years ago
d41e52766b
Merge branch 'master' into story_64_sails
...
# Conflicts:
# racevisionGame/src/main/java/mock/model/MockRace.java
# racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java
# racevisionGame/src/main/java/visualiser/model/VisualiserBoat.java
8 years ago
09eaf6d968
Merged master.
8 years ago
37fe7389ff
Rounding marks works.
8 years ago
5a188f0582
Merge branch 'master' into new_issue#19
8 years ago
d2f9bfedcb
Merge branch 'issue_18_track_alpha' into 'master'
...
Issue 18 track alpha
This should resolve #18 .
Track point system is now a line, and updated more frequently.
Line fades over time.
The boat wake is also longer, and has a black dot at the end.
See merge request !28
8 years ago
610aa96241
Merge branch 'MapWindRotation' into 'master'
...
Map wind rotation
Note: we'd like to generate a realistic course layout, that can vary from race to race (but not within a race, for now.) The generated layout must be sent through the API in the format given by the race.xml section of the AC35 Streaming Data Interface Specification. The AC35 Protocol (sections 31.4 and 31.5) specifies the requirements for a course:
* First leg of the course (from start line to first mark) must be a reaching leg
* Next legs are windward/leeward, and boats complete either two or three laps of this section
* Final leg to finish line may be a reaching leg
* A boat should take around 25 minutes to complete the course in the wind conditions at the start of the race (AC35 protocol, section 31.5)
You should assume that the windward/leeward marks and start/finish lines are always compounds of two marks.
Acceptance criteria:
* The layout must be sent over the API in a race.xml message, plus boat location messages for the marks as required, before any other boat location messages are sent.
* Each mark must be defined using boat "SourceID"s (see definition of race.xml) so their positions can be adjusted later.
* The course must meet the requirements given in the AC35 Protocol.
* The course limits should be set to clear all marks by at least several boat-lengths.
* The entire race area within the limits must be on the water.
See merge request !22
8 years ago
2edb6b5249
Merge branch 'issue#40' into 'master'
...
Issue#40
See merge request !30
8 years ago
c08bafa566
Fixed most of issue #19 with new master?
8 years ago
2656efcb4d
Marks are a bit darker.
...
Wake no longer has circle at end.
8 years ago
2e9c6fe593
Merged most recent master in, #story[1092]
8 years ago
02ab0e8a00
added javadoc
8 years ago
3cf50c56f8
added a refresh for the info table so no new values are shown when the game is in full screen
8 years ago
a50d460222
Merged master.
8 years ago
0f58270c10
Merge branch 'master' into issue_18_track_alpha
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/model/VisualiserRaceState.java
8 years ago
7546c65893
Merge branch 'master' into MapWindRotation
...
# Conflicts:
# racevisionGame/src/main/java/shared/model/CompoundMark.java
# racevisionGame/src/main/java/shared/model/Mark.java
8 years ago
20c9870fea
Merge branch 'master' into story_64_sails
...
# Conflicts:
# racevisionGame/src/main/java/shared/model/Boat.java
# racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/BoatLocationCommand.java
8 years ago
fa5992bfb2
added App app to app.
8 years ago
62f400b924
Trackpoint line color fades out.
8 years ago
6bc81f566e
Issue 19 changes.
8 years ago
a3fe57ed5a
Removed print statement. #story[1092]
8 years ago
fa26abe10c
Minor tidy.
8 years ago
4cf8846cda
Map wind rotation works with multiplayer xml. #story[1092]
8 years ago
86d94ef27e
javadoc fix
8 years ago
df2b674b94
update scale for table displaying
8 years ago
4b3cc8e126
Created ack number generator for use by multiple services
...
#story[1100]
8 years ago
1e7ba8cd51
Merge branch 'master' into MapWindRotation
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/Event.java
# racevisionGame/src/main/java/mock/model/MockRace.java
# racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java
# racevisionGame/src/main/java/shared/dataInput/RaceXMLReader.java
# racevisionGame/src/main/java/shared/model/CompoundMark.java
# racevisionGame/src/main/java/shared/model/Mark.java
# racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/java/visualiser/app/VisualiserInput.java
# racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java
# racevisionGame/src/main/java/visualiser/model/VisualiserRace.java
8 years ago
d7e0bfa86c
Trackpoints are only shown for the player's boat. #story[1098]
8 years ago
47fc55245c
Merged master.
8 years ago
f60809bdd4
Merge branch 'master' into story_64_sails
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/MockOutput.java
# racevisionGame/src/main/java/mock/model/MockRace.java
# racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java
# racevisionGame/src/main/java/network/MessageDecoders/BoatActionDecoder.java
# racevisionGame/src/main/java/network/MessageDecoders/BoatLocationDecoder.java
# racevisionGame/src/main/java/visualiser/app/VisualiserInput.java
# racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java
# racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
# racevisionGame/src/main/java/visualiser/model/VisualiserRace.java
# racevisionGame/src/main/resources/visualiser/scenes/connect.fxml
# racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml
# racevisionGame/src/test/java/mock/model/MockRaceTest.java
# racevisionGame/src/test/java/network/Utils/AC35UnitConverterTest.java
# racevisionGame/src/test/java/network/XMLMessageEncoderTest.java
8 years ago
109b291973
Merged issue #20 fix and splash screen into development.
8 years ago
317582aae8
Merge branch 'issue#20fix' into Development
8 years ago
4e8b7d3b5a
Merge remote-tracking branch 'origin/master' into issue#20fix
8 years ago
8759ac070e
Merge remote-tracking branch 'origin/splashScreen' into issue#20fix
8 years ago
f8150ef449
Added YachtEvent message with encoder and decoder
...
- Updated Encoder and Decoder factories for the new message type
- Added an enum for handling yacht event types
#story[1100]
8 years ago
ee0cc4b704
Merge branch 'issue#40' into Development
8 years ago
114c18763b
Reduced track point period to 1000ms.
...
issue #18
8 years ago
20055b1883
Removed redunant calls in VisualiserRaceState.initialiseBoats().
...
Slightly refactored ResizableRaceCanvas - removed a redundant drawPoint() function, functions which alter the gc stroke call save/restore.
Text is drawn black, at 20pts.
The drawBoats() function: instead of drawing everything for each boat, one boat at a time, it draws the track points for all boats, then wake for all boats, etc..., to have better layering.
issue #18
8 years ago
f7d0e9d466
Boats bounce during collision if pointing into collision
...
#story[1100]
8 years ago
eaa0d2e82b
Boats bounce away from marks.
...
- Changed onCollisionEnter signature to pass boat info
#story[1100]
8 years ago
8113867576
Bubbles collision events to RaceLogic
...
- ColliderRegistry collects and forwards all Collision events
- RaceLogic observes the ColliderRegistry of its single Race instance
#story[1100]
8 years ago
f1e41d5d8f
Merge branch 'master' into issue_18_trackpoint
8 years ago
79f3c41d45
Moved generic ray casting to Collider abstract class
...
- Boat is now collider
- Collider subclasses specify their own collision ray and collision handler
#story[1100]
8 years ago
8498701091
Removed commented-out file from master
8 years ago
f44929f376
Spun off Locatable interface to make collision code more reusable
...
#story[1100]
8 years ago
ce14e93404
Removed CI-breaking docstring
8 years ago
f0d750cae1
Merge remote-tracking branch 'remotes/origin/master' into story66-collision
...
# Conflicts:
# racevisionGame/src/main/java/mock/model/MockBoat.java
# racevisionGame/src/main/java/mock/model/RaceLogic.java
# racevisionGame/src/main/java/shared/model/CompoundMark.java
# racevisionGame/src/main/java/shared/model/Race.java
# racevisionGame/src/test/java/mock/model/MockBoatTest.java
8 years ago
d63641c1e2
Cherry-picked multiple changes from master
8 years ago
fdd0b30a51
Added the ability to hide and show info table with a key press
...
-the wind arrow also scales with the new size of the screen
8 years ago
85e703cba5
RaceController/info table now makes a copy of the boat list, to avoid race conditions.
...
#story[1095]
8 years ago
9f7c5d8c0c
Fixed other javadocs that were causing the build to fail #story[1092]
8 years ago
8d87da6206
fixed java doc issues on my side #story[1092]
8 years ago
bcb6b79f8d
Fixed player boat not being highlighted.
...
#story[1095]
8 years ago
5e0bcd2af5
Added control menu to title screen. Pressing control button will open a pop-up window showing game controls.
8 years ago
a4755ed88b
Maybe fixed updating boat list on FX thread.
8 years ago
a4e1dfb3d7
Fixed import that was messing up the build #story[1092]
8 years ago
0483859c40
Fixed sparkline y axis labelling. Reverted it to how it previously worked (negative data values instead of negative scale).
...
issue #32
8 years ago
9ab12a9c58
MockBoat: Removed redundant isAutoVMG() function.
...
TackGybeCommand now disables autoVMG.
Removed print statements from VMGCommand.
8 years ago
dc4610d6eb
Fixed sparkline not updating.
...
#story[1095]
8 years ago
5ae8393126
Fixed null pointer exception when a boat finishes the race.
...
Boats now default to have position (0, 0).
Added mark rounding data to single player race.xml
8 years ago
3a0bd10a57
Merge remote-tracking branch 'origin/master' into story_61
...
# Conflicts:
# racevisionGame/src/main/java/mock/model/MockRace.java
# racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java
# racevisionGame/src/main/java/visualiser/gameController/ControllerClient.java
# racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java
# racevisionGame/src/main/resources/visualiser/scenes/race.fxml
8 years ago
c9875f3987
RaceLogic no longer uses AnimationTimer for its main loop (since that ran in javafx thread).
8 years ago
9ca50aa66c
Ray casting now only supports distance specification.
...
#story[1100]
8 years ago
7d64a43350
Allow collision checking to provide collision parameters to ray casting method
...
- Added tests for MockBoat collision direction and distance
#story[1100]
8 years ago
2fbb96afd7
Created ray casting methods for MockBoat and CompoundMark
...
- Added ColliderRegistry to Race
- Added collision triggering to RaceLogic
- Created basic collision handlers for MockBoat and CompoundMark
8 years ago
da52082d70
Deleted duplicate method (again -.-)
8 years ago
847cd1251e
Merge remote-tracking branch 'remotes/origin/master' into CommandFactory
...
# Conflicts:
# racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java
# racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java
8 years ago
b97bfe62a6
Fixed documentation bugs not relevant to story.
8 years ago
5a03d97713
Added comment.
8 years ago
b07c30704a
The trackpoint line is now a line (poly-line) instead of a sequence of circles. A point along the poly-line is added every 250ms.
...
issue #18
8 years ago
7d4f1cd925
Fixed first key press not working. #story[1098]
8 years ago
1bdf80417d
javadoc
...
#story[1087]
8 years ago
0558629dc6
Added luffing sails image.
...
- Created transparent gif of luffing sail
- Displayed image when sail is luffing
- Repositioned luffing sail
#story[1098]
8 years ago
a5b21799d3
Fixed java doc issue #story[1092]
8 years ago
ac42c07c69
Merge branch 'master' into MapWindRotation
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/Event.java
# racevisionGame/src/main/java/mock/model/MockRace.java
# racevisionGame/src/main/java/visualiser/app/VisualiserInput.java
# racevisionGame/src/main/java/visualiser/model/VisualiserRace.java
8 years ago
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
175fb11178
Javadoc fixes.
...
#story[1095]
8 years ago
7366aba5ec
Added empty data sources, to be used by VisualiserRace.
...
Created FrameRateTracker which can be used to track framerate.
Updated RequestToJoinEnum and JoinAcceptanceEnum to match the agreed connection API.
Added AssignPlayerBoat message, which is used internally on the client to assign the player a source ID once they have connected.
Fixed some race conditions in the MessageRouter.
Updated ConnectionAcceptor.CheckClientConnection to wait slightly longer before removing connection (there was a slight race condition before).
Race no longer has a reference to LatestMessages. LatestMessages no longer has specific messages types in it.
Created RaceState class, which contains the state that is shared between VisualiserRaceState and MockRaceState (currently only used on visualiser).
Split VisualiserRace into VisualiserRaceState and VisualiserRaceService.
Added the VisualiserRace commands (BoatLocatonCommand, RaceStatusCommand, etc...).
Slightly increased the preferred width of race.fxml table columns.
issues #27 #37 #35
#story[1095]
8 years ago
70d5447e88
Moving stuff from school pc to home
8 years ago
8999cddf8b
Pre merge commit
8 years ago
David Wu
cbt24
fjc40
hba56
Joseph Gardner
Fan-Wu Yang
Jessica Syder