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
include/Core/World.h
+1 -1
View File
@@ -195,7 +195,7 @@ public:
// Triggers commit events in systems
// TODO: Replace completely by EComponentCreated?
void CommitEntity(EntityID entity);
int CommitEntity(EntityID entity);
/** Get all components of a specific type.