Merge branch 'develop' into story1273_minimap

Browse Source

# Conflicts:
#	src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java
#	src/main/resources/meshes/boatSTLs/parrot_features.stl

...

This commit is contained in:

William Muir

2017-09-28 14:41:08 +13:00

parent b9a2d60115 597fbe935f

commit a5eea10c87

16 changed files with 202 additions and 61 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/parrot_features.stl

BIN

Binary file not shown.

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

BIN

Binary file not shown.

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

BIN

Binary file not shown.

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

BIN

Binary file not shown.