11 Commits

Include renames

Author	SHA1	Message	Date
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	eaa6f9cd57	Hotfix rock world	2016-06-21 23:35:36 +02:00
kennyboy55	0e99b9f719	Attempt fix rock world	2016-06-21 22:57:18 +02:00
Aaldert	579a04a9b4	Merge branch 'developer' into musicInclude ... # Conflicts: # worlds/small.json	2016-06-21 19:16:12 +02:00
kennyboy55	3025fecf94	Load weapons from JSON	2016-06-21 18:25:16 +02:00
Aaldert	41a81d104e	Enemy stops geluid als gedood	2016-06-21 18:23:57 +02:00
Aaldert	9543dd8324	Muziek toegvoegt aan world en enemy	2016-06-21 18:15:49 +02:00
kennyboy55	8700aa90af	Bugfixes, added sound to portal and enemy in JSON	2016-06-21 13:51:16 +02:00
Aaldert	f93c09a999	rock heeft muziek	2016-06-20 15:48:57 +02:00
kennyboy55	ad30824057	Added Rock world. Updated others	2016-06-10 12:09:16 +02:00