12 Commits

Include renames

Author	SHA1	Message	Date
Remco	80f0c33b91	Merge branch 'developer' into feature/loadingscreen ... # Conflicts: # worlds/rock.json	2016-06-22 02:17:44 +02:00
kennyboy55	5fc92d3f2a	Merge branch 'developer' into world/Building ... # Conflicts: # World.cpp # worlds/rock.json	2016-06-22 01:49:27 +02:00
kennyboy55	342a56fa5a	Added audio	2016-06-22 00:47:02 +02:00
kennyboy55	0e99b9f719	Attempt fix rock world	2016-06-21 22:57:18 +02:00
Aaldert	9543dd8324	Muziek toegvoegt aan world en enemy	2016-06-21 18:15:49 +02:00
Aaldert	d56625e19a	MusicIncluded, crystals	2016-06-21 17:10:34 +02:00
kennyboy55	8700aa90af	Bugfixes, added sound to portal and enemy in JSON	2016-06-21 13:51:16 +02:00
Aaldert	d5406120c6	Enemy speelt cow!	2016-06-20 15:30:38 +02:00
Aaldert	5c776e3d3a	Test	2016-06-20 14:53:40 +02:00
Aaldert	b7d73c9abe	Test 1	2016-06-20 13:43:13 +02:00
Aaldert	117010b9fe	OpenAl Werkt! en Setup enzo	2016-06-05 23:49:06 +02:00
Daniel	b53bcac528	OpenAL Test	2016-05-30 11:04:09 +02:00