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

Merge branch 'havok'

Browse Source 
Conflicts:
	src/GameWorld.cpp
	src/Systems/PhysicsSystem.cpp
	src/Systems/RenderSystem.cpp
	src/Systems/RenderSystem.h
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters
This commit is contained in:
sippeangelo
2014-04-16 00:38:30 +02:00
parent 062242ab8e 1697627f69
commit 62abb3f964
861 changed files with 81159 additions and 157546 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/GameWorld.h
+2 -10
View File
@@ -26,17 +26,9 @@
#include "Components/Template.h"
#include "Components/Transform.h"
#include "Components/CompoundShape.h"
#include "Components/BoxShape.h"
#include "Components/SphereShape.h"
#include "Components/Physics.h"
#include "Components/BallSocketConstraint.h"
#include "Components/HingeConstraint.h"
#include "Components/SliderConstraint.h"
#include "Components/Vehicle.h"
#include "Components/Wheel.h"
#include "Components/Sphere.h"
#include "Components/Box.h"
class GameWorld : public World
{