Remco 80f0c33b91 Merge branch 'developer' into feature/loadingscreen ...

# Conflicts:
#	worlds/rock.json

2016-06-22 02:17:44 +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

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