8c1eded926
Boat collision packets are now sent. Command class created for boat collision. Currently prints out message depending on if user crashed or someone else crashed. #story[1195]
9 years ago
cd685ae467
Added sound effect files for button clicks and mark rounding and linked them up to application. Collision audio is added too but not linked up. #story[1195]
9 years ago
abf325e5ea
Passing a mark will now play a sound. Currently using placeholder sound so will ned to change. #story[1195]
9 years ago
c3be9665ac
Added button press sounds for hosting a game, entering lobby list and entering host menu. #story[1195]
9 years ago
eb980c436e
Wind arrow now points in the direction the wind is blowing, as per P.O feedback (again....).
9 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.
9 years ago
b886cb426f
guide line last leg fix
9 years ago
37095bfc6c
Merged master into branch.
9 years ago
5234cdea66
Merge branch 'master' into new_issue#19
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
9 years ago
598275591f
Updated javadoc.
9 years ago
79add59375
Unresizable control screen.
9 years ago
f1ef75fb81
Merge branch 'master' into new_issue#19
9 years ago
03dd937713
Change fxml stuff. Added back to menu buttons.
9 years ago
9f813ab7aa
Merged in development.
9 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
9 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
9 years ago
09eaf6d968
Merged master.
9 years ago
5a188f0582
Merge branch 'master' into new_issue#19
9 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
9 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
9 years ago
2edb6b5249
Merge branch 'issue#40' into 'master'
...
Issue#40
See merge request !30
9 years ago
c08bafa566
Fixed most of issue #19 with new master?
9 years ago
2656efcb4d
Marks are a bit darker.
...
Wake no longer has circle at end.
9 years ago
02ab0e8a00
added javadoc
9 years ago
3cf50c56f8
added a refresh for the info table so no new values are shown when the game is in full screen
9 years ago
a50d460222
Merged master.
9 years ago
0f58270c10
Merge branch 'master' into issue_18_track_alpha
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/model/VisualiserRaceState.java
9 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
9 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
9 years ago
fa5992bfb2
added App app to app.
9 years ago
62f400b924
Trackpoint line color fades out.
9 years ago
6bc81f566e
Issue 19 changes.
9 years ago
fa26abe10c
Minor tidy.
9 years ago
df2b674b94
update scale for table displaying
9 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
9 years ago
d7e0bfa86c
Trackpoints are only shown for the player's boat. #story[1098]
9 years ago
47fc55245c
Merged master.
9 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
9 years ago
109b291973
Merged issue #20 fix and splash screen into development.
9 years ago
317582aae8
Merge branch 'issue#20fix' into Development
9 years ago
4e8b7d3b5a
Merge remote-tracking branch 'origin/master' into issue#20fix
9 years ago
8759ac070e
Merge remote-tracking branch 'origin/splashScreen' into issue#20fix
9 years ago
ee0cc4b704
Merge branch 'issue#40' into Development
9 years ago
114c18763b
Reduced track point period to 1000ms.
...
issue #18
9 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
9 years ago
f1e41d5d8f
Merge branch 'master' into issue_18_trackpoint
9 years ago
f44929f376
Spun off Locatable interface to make collision code more reusable
...
#story[1100]
9 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
9 years ago
85e703cba5
RaceController/info table now makes a copy of the boat list, to avoid race conditions.
...
#story[1095]
9 years ago
9f7c5d8c0c
Fixed other javadocs that were causing the build to fail #story[1092]
9 years ago
David Wu
fjc40
hba56
Joseph Gardner
Fan-Wu Yang
cbt24