Merge master

2015-09-25 00:03:28 +02:00
parent fa198cf953 72413dc0a9
commit c624c5bcf3
53 changed files with 6061 additions and 382 deletions
@@ -19,6 +19,8 @@
 #include "PrecompiledHeader.h"
 #include "Core/World.h"

+//TODO Delete this please
+
 void dd::World::RecycleEntityID(EntityID id)
 {
 	m_RecycledEntityIDs.push(id);