5937f8b640
Merge remote-tracking branch 'origin/develop' into Story66_Collision
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/model/Yacht.java
2017-08-08 17:04:34 +12:00
79105a1bdc
Created a simple collision detection by iterating each boats per update. Working but sequential checks can be costly.
...
#story[1117]
2017-08-07 12:01:26 +12:00
e90a0ce435
Merge branch '1124_Mark_Sequence_From_RaceXML' into 'develop'
...
Loading mark sequence from RaceXML
# Loading mark sequence from RaceXML
## Change Log
1. Added MarkOrder class
* Mark order is read from the generated RaceXML and stored
* Added .getNextMark() to get the next mark in the race
* Added .equals() and .hashCode() for Marks
* NEW: Added RacePosition class to hold players position in the race
* NEW: Fixed issue where the duplicates weren't stored in the mark order
## Testing
* Unit tests in models/MarkOrderTest.java
## Acceptance Criteria
* Use the mark sequence in the raceXML
* Met by change log item (1)
* Store relevant mark details with each participating boat (Last mark, next mark)
* Method in MarkOrder to get next mark, however the last mark and next mark will need to be stored by whoever implements the second task.
See merge request !52
2017-08-05 15:18:26 +12:00
a727014fcb
Implemented boats spawning in parallel at the start line with spacing.
...
Added two more colours to support up to eight boats.
#story[1117]
2017-08-05 00:31:36 +12:00
281ce2d842
Loading course mark order from RaceXML
...
- Re-engineered code to work with the new marks
- Fixed bug where race order wasn't correct (added RacePosition class to fix)
- Rewrote tests to work with new RacePosition class
Tags: #story[1124] (Task 1)
2017-08-04 13:20:50 +12:00
874cdec654
Added booleans: has entered rounding zone, has crossed first line, has crossed second line
...
All for purposes of checking mark rounding.
Currently not yet finished
tags: #story[1124] #pair[hyi25, wmu16]
2017-08-03 17:39:07 +12:00
454e9ac9f1
Added an attribute to each yacht: 'DistanceToNextMark'
...
This attribute is calculated at each update of the boat as prompted by the game state regularly
Removed the lat and lng attribute from the Yacht class and replaced its usage with the GeoPoint object instead
Removed redundant test files and merged GeoUtility and testGeoUtil test classes into one
tags: #story[1124] #pair[hyi25, wmu16]
2017-08-03 16:29:12 +12:00
db078538ff
Minor cleaning in yacht class
...
tags: #story[1124]
2017-08-03 13:53:30 +12:00
f9e6df46c1
Fixed issues caused by merge.
...
#bug
2017-08-03 13:23:43 +12:00
c655cb3fab
Fixed build. (Actually this time)
...
All doc string annotations were required to be fixed for all methods
tags: #issue[34]
2017-08-03 11:45:14 +12:00
47c5e6f155
Reverting some new graphics classes back to how they were on master.
2017-07-31 23:35:28 +12:00
b82d0d0137
Boats and map are now updated using the observer pattern.
...
#implement
2017-07-31 05:23:41 +12:00
f1ad03e913
Refactored the setup for MarkObjects (now renamed Markers) and made the CompoundMark + Mark + GeoPoint classes the standard across all classes instead of GateMark + SingleMark + Mark.
...
#refactor
2017-07-31 02:19:19 +12:00
6cae338c1e
Began fixing bugs with caused by asynchronous listener calls.
...
#bug
2017-07-30 20:12:19 +12:00
7894e31926
Merge branch 'develop' into story61_player_perspective
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/client/ClientPacketParser.java
# src/main/java/seng302/client/ClientState.java
# src/main/java/seng302/client/ClientStateQueryingRunnable.java
# src/main/java/seng302/controllers/Controller.java
# src/main/java/seng302/controllers/LobbyController.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/controllers/StartScreenController.java
# src/main/java/seng302/fxObjects/BoatAnnotations.java
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/model/Yacht.java
# src/main/java/seng302/model/stream/StreamReceiver.java
# src/main/java/seng302/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/GameView.java
# src/main/java/seng302/visualiser/fxObjects/BoatObject.java
# src/test/java/seng302/model/stream/StreamReceiverTest.java
2017-07-30 18:07:28 +12:00
8ac44d13df
Began fixing conflicts with LobbyController
...
#bug
2017-07-26 12:05:03 +12:00
9c9f6e4e80
Merge branch 'develop' into story61_player_perspective
...
# Conflicts:
# src/main/java/seng302/fxObjects/BoatAnnotations.java
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/model/Yacht.java
# src/main/java/seng302/visualiser/controllers/LobbyController.java
2017-07-26 02:56:46 +12:00
08e369f1ae
Merged with develop. Fixed many bugs in Visualiser.
...
#bugs
2017-07-26 02:49:31 +12:00
acd54dec7a
Merge branch 'develop' into story61_player_perspective
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/client/ClientPacketParser.java
# src/main/java/seng302/controllers/Controller.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/fxObjects/BoatAnnotations.java
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/model/Boat.java
# src/main/java/seng302/models/stream/XMLParser.java
# src/main/java/seng302/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/GameView.java
# src/main/java/seng302/visualiser/controllers/FinishScreenViewController.java
# src/main/java/seng302/visualiser/controllers/StartScreenController.java
# src/main/java/seng302/visualiser/fxObjects/BoatObject.java
# src/main/resources/views/LobbyView.fxml
# src/main/resources/views/MainView.fxml
2017-07-25 21:05:15 +12:00
6242ab0b2e
Implemented observer and strategy pattern in BoatAnnotations, now renamed AnnotationsBox.
...
Also implemented various other small fixes and further refactored code.
#refactor
2017-07-25 20:45:27 +12:00
aad93d8913
Parsing classes now static utilities. Data now moved to model via controller class. Race logic shifted out of grpahics classes. Several improvements to code readability.
...
#story[986] #refactor
2017-07-24 12:14:08 +12:00
3ec1242a9a
Merge branch 'Story62_Reading_Keystrokes' into story61_player_perspective
...
# Conflicts:
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
2017-07-21 11:13:04 +12:00
881f7f8e30
Changed package heirachy. Merged Controller and StartScreenController.
...
#refactor
2017-07-21 09:22:55 +12:00
Zhi You Tan
Zhi You Tan
William Muir
Michael Rausch
Calum