Fan-Wu Yang
2e9c6fe593
Merged most recent master in, #story[1092]
8 years ago
Fan-Wu Yang
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
Joseph Gardner
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
cbt24
f7d0e9d466
Boats bounce during collision if pointing into collision
...
#story[1100]
8 years ago
cbt24
eaa0d2e82b
Boats bounce away from marks.
...
- Changed onCollisionEnter signature to pass boat info
#story[1100]
8 years ago
cbt24
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
cbt24
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
cbt24
f44929f376
Spun off Locatable interface to make collision code more reusable
...
#story[1100]
8 years ago
Fan-Wu Yang
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
hba56
2acc36225e
Fix for placement of invis gates and checks that boats pass through these gates
...
-see wiki on rounding
#story[1101]
8 years ago
hba56
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
fjc40
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
fjc40
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