Merge branch 'developer' into feature/loadingscreen

# Conflicts: # worlds/rock.json
2016-06-22 02:17:44 +02:00
parent 9f455be8d6 5ad61e525f
commit 80f0c33b91
62 changed files with 11886 additions and 13221 deletions
@@ -40,7 +40,7 @@ World::World(const std::string &fileName)
 		std::cout << "Invalid world file: objects - " << fileName << "\n";
 	if (v["enemies"].isNull())
 		std::cout << "Invalid world file: enemies - " << fileName << "\n";
-	if (v["crystals"].isNull())
+	if (v["crystal"].isNull())
 		std::cout << "Invalid world file: crystals - " << fileName << "\n";