Tleety 90e929131f Merge remote-tracking branch 'origin/master' into deffered_rendering ...

Conflicts:
	src/GameWorld.cpp
	src/Shaders/Fragment.glsl
	vs11/Returngeance/Returngeance.vcxproj.filters

2014-04-27 02:51:04 +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 deffered_rendering

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

Returngeance.psess

Basic working deferred rendering

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

Returngeance.sln

Basic working deferred rendering

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