michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into 1124_broadcast_mark_rounding_message

Browse Source 
# Conflicts:
#	src/main/java/seng302/model/Yacht.java
#	src/main/java/seng302/visualiser/GameView.java
This commit is contained in:
Haoming Yin
2017-08-15 14:58:13 +12:00
parent c125708a4a 89ceab0c4b
commit 6909f99773
13 changed files with 974 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/config/config.xml
+1 -1
View File
@@ -4,6 +4,6 @@
<race-name>AC35</race-name>
<race-size>6</race-size>
<time-scale>10.0</time-scale>
<wind-direction>135</wind-direction>
<windDir-direction>135</windDir-direction>
</configurations>