Merge branch 'master' into story68

Browse Source

-updated port and starboard boat checks
-added gps method to check if on correct side of a line
-updated pos check method to make boats round marks with the new tech

# Conflicts:
#	racevisionGame/src/main/java/mock/app/ConnectionAcceptor.java
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java
#	racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java

...

This commit is contained in:

hba56

2017-08-12 03:24:20 +12:00

parent 4da3734804 a8af866228

commit 499a409d4f

94 changed files with 5962 additions and 1849 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

racevisionGame/src/main/resources/visualiser/images/arrowLight.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 23 KiB