Merge branch 'develop' into 1276_Next_Mark_Indicator

Browse Source

...

This commit is contained in:

alistairjmcintyre

2017-09-28 02:06:18 +13:00

parent 4018dd783e 8b7407bf89

commit 73861b2ef3

19 changed files with 457 additions and 407 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/parrot_hull.stl

BIN

Binary file not shown.

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

BIN

Binary file not shown.

src/main/resources/meshes/land_smooth.dae

+201 -188

File diff suppressed because one or more lines are too long

src/main/resources/meshes/random_pickup.dae

+63 -33

File diff suppressed because one or more lines are too long

src/main/resources/meshes/wind_walker_pickup.dae

+24 -135

File diff suppressed because one or more lines are too long