2e9c6fe593
Merged most recent master in, #story[1092]
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
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
f44929f376
Spun off Locatable interface to make collision code more reusable
...
#story[1100]
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
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
1bdf80417d
javadoc
...
#story[1087]
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
2acc36225e
Fix for placement of invis gates and checks that boats pass through these gates
...
-see wiki on rounding
#story[1101]
8 years ago
f386a4b989
added checks for gates and moved second rounding check to be in line with the next mark to move towards
...
#story[1101]
8 years ago
e53d72f24b
compound marks now can give the mark they have that needs to be rounded this is used to draw the line around the correct mark
...
#story[1101]
8 years ago
be8b0e672d
Updated the xml reader to pull in the rounding type of the compound marks and set each mark with that value
...
#story[1101]
8 years ago
0d5bede349
java doc fixes to fix the ci build problems
...
#story[1003]
9 years ago
8d36d89570
Refactored and moved RaceXMLReader to shared/dataInput.
...
RaceStatus can provide windspeed in knots in addition to mm/sec.
RaceDataSource now provides a list of participating boat sourceIDs instead of boats.
Added a RegattaDataSource interface.
Angle, Azimuth, Bearing and mutable - careful.
Boat has positionInRace.
CompoundMarks have an ID and name.
Marks can be moved (setPosition(...)).
Refactored Mock.Race, Visualiser.StreamedCourse, Visualiser.StreamedRace, into (shared) Race, MockRace, VisualiserRace.
VisualiserBoat has color.
Added xml and polar files into resources folder.
9 years ago
bbbb1f2eb0
Renamed sharedModel module to racevisionGame - this is intended to be our single module program.
...
Moved Boat/MockBoat/VisualiserBoat into it.
Moved Polars, polarParser, VMG, and polar exception.
Moved the networking stuff into it.
Moved angle, azimuth, bearing into it.
Moved gpscoordinate into it.
Moved mark/compoundMark into it.
Moved leg into it.
Moved trackpoint into it.
9 years ago
Fan-Wu Yang
Joseph Gardner
cbt24
hba56
fjc40