Merge remote-tracking branch 'origin/develop' into 1293_PowerUps

Browse Source

# Conflicts:
#	src/main/java/seng302/model/ClientYacht.java

...

This commit is contained in:

William Muir

2017-09-22 21:18:58 +12:00

parent 3be8cd264d 607acff7c6

commit a3c555d5fe

35 changed files with 267 additions and 189 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

src/main/resources/meshes/boatSTLs/catamaran_hull.stl

BIN

Binary file not shown.

src/main/resources/meshes/boatSTLs/catamaran_mast.stl

BIN

Binary file not shown.

src/main/resources/meshes/boatSTLs/catamaran_sail.stl

BIN

Binary file not shown.

src/main/resources/meshes/boatSTLs/dinghy_hull.stl

BIN

Binary file not shown.

src/main/resources/meshes/boatSTLs/dinghy_mast.stl

BIN

Binary file not shown.

src/main/resources/meshes/boatSTLs/dinghy_sail.stl

BIN

Binary file not shown.

src/main/resources/meshes/boatSTLs/pirateship_frontsail.stl

BIN

Binary file not shown.

src/main/resources/meshes/boatSTLs/pirateship_hull.stl

BIN

Binary file not shown.

src/main/resources/meshes/boatSTLs/pirateship_mainsail.stl

BIN

Binary file not shown.

src/main/resources/meshes/boatSTLs/pirateship_mast.stl

BIN

Binary file not shown.

src/main/resources/meshes/dinghy_hull.stl

BIN

Binary file not shown.

src/main/resources/meshes/dinghy_mast.stl

BIN

Binary file not shown.

src/main/resources/meshes/dinghy_sail.stl

BIN

Binary file not shown.