Jace a36d6c554a Merge branch 'master' into havok ...

Conflicts:
	assets
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters

2014-05-17 21:23:46 +02:00

..

ModelingProject1

Changed toolset to vs11, for future Havok implementation.

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

Returngeance

Merge branch 'master' into havok

2014-05-17 21:23:46 +02:00

Returngeance.psess

Basic working deferred rendering

2014-04-27 02:44:04 +02:00

Returngeance.sln

Defucked defucked rendering

2014-05-07 22:34:38 +02:00