kennyboy55 5fc92d3f2a Merge branch 'developer' into world/Building ...

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

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

..

ape.wav

Added audio

2016-06-22 00:47:02 +02:00

Crystal.wav

MusicIncluded, crystals

2016-06-21 17:10:34 +02:00

ghostEnemy.wav

Muziek toegvoegt aan world en enemy

2016-06-21 18:15:49 +02:00

hedge.wav

Added audio

2016-06-22 00:47:02 +02:00

letsRock.wav

Added audio

2016-06-22 00:47:02 +02:00

portal.wav

Bugfixes, added sound to portal and enemy in JSON

2016-06-21 13:51:16 +02:00

world1.wav

Muziek toegvoegt aan world en enemy

2016-06-21 18:15:49 +02:00

world2.wav

Attempt fix rock world

2016-06-21 22:57:18 +02:00