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
96acb6251e
Merge branch 'story66-collision' into 'master'
...
66. [M] As Gemma, I'd like boats and marks to act as barriers to movement so that another player cannot beat me by just ignoring marks and other boats on the course.
Note: as boats and marks don't start in overlapped positions, we are only concerned with collisions.
Acceptance criteria:
- No boat can pass within an agreed distance of the centre of another boat or mark
- Boats that hit other objects are repelled twice the agreed distance in the opposite direction to their current heading
See merge request !27
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
3d953362a6
Merge branch 'story_61' into 'master'
...
Story 61
[Agilefant link](http://agilefant.cosc.canterbury.ac.nz:8080/agilefant302/qrq.action?q=story:1095 )
```
Note: the boat should be permanently circled with a highlight (or something similar)
See: (http://learn.canterbury.ac.nz/mod/forum/discuss.php?d=213948 ). Contains boat request to join, and server response messages.
Acceptance criteria:
- The boat that responds to control keypresses is permanently highlighted on screen.
- No boat without a highlight responds to keypresses.
```
Works with either single player or multiplayer game (see HostController.hostGamePressed()).
The race.xml currently is not updated when players join/quit, so there are 6 boats by default, and any boats without playes will just sail off the side of the map.
- resolves #39
- resolves #37
- resolves #35
- resolves #27
- resolves #25
- resolves #32
See merge request !26
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
9e6bd10870
Merge branch 'master' into MapWindRotation
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
Hamish Ball
David Wu
fjc40
Fan-Wu Yang
Joseph Gardner
Connor Taylor-Brown
Jessica Syder