BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into Sound

Browse Source 
Conflicts:
	include/Core/Engine.h
This commit is contained in:
Stiffly
2015-09-17 13:18:56 +02:00
parent 13de4bd1cb bc5a5e5e92
commit 953be0cda9
44 changed files with 18806 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Core/World.cpp
+1 -1
View File
@@ -163,7 +163,7 @@ void dd::World::Initialize()
}
}
void dd::World::CommitEntity(EntityID entity)
int dd::World::CommitEntity(EntityID entity)
{
for (auto pair : m_Systems)
{