Stiffly e0b5b72454 Merge remote-tracking branch 'origin/master' into particles ...

Conflicts:
	src/Components/Physics.h
	src/GameWorld.cpp
	src/World.cpp
	src/World.h
	vs11/Returngeance/Returngeance.vcxproj.filters

2014-05-12 13:55:48 +02:00

..

ModelingProject1

Changed toolset to vs11, for future Havok implementation.

2014-04-12 01:59:55 +02:00

Returngeance

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

2014-05-12 13:55:48 +02:00

Returngeance.sln

Visual studio crap stuff

2014-04-16 14:46:41 +02:00