Merge branch 'developer' into world/Building

Browse Source

# Conflicts:
#	World.cpp
#	worlds/rock.json

...

This commit is contained in:

kennyboy55

2016-06-22 01:49:27 +02:00

parent 6306e8abd4 97d43a1249

commit 5fc92d3f2a

18 changed files with 206 additions and 87 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

WAVE/ape.wav

BIN

Binary file not shown.

WAVE/hedge.wav

BIN

Binary file not shown.

WAVE/letsRock.wav

BIN

Binary file not shown.