Merge branch 'master' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance

Conflicts: vs11/Returngeance/Returngeance.vcxproj.filters
2014-04-17 00:11:53 +02:00
parent 5e402af093 b1edefcf26
commit 2efb5405eb
10 changed files with 158 additions and 17 deletions
@@ -1,7 +1,10 @@
 #ifndef Components_ParticleEmitter_h__
 #define Components_ParticleEmitter_h__

+#include "System.h"
 #include "Component.h"
+#include "Components/Transform.h"
+#include "Components/ParticleEmitter.h"
 #include "Color.h"
 #include <vector>