Stiffly 98399c3995 Merge branch 'FMOD' ...

Conflicts:
	src/GameWorld.cpp
	src/Renderer.cpp
	src/Systems/PhysicsSystem.cpp
	src/Systems/PhysicsSystem.h
	src/Systems/SoundSystem.cpp
	src/Systems/SoundSystem.h
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters

2014-06-02 20:16:08 +02:00

..

ModelingProject1

Changed toolset to vs11, for future Havok implementation.

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

Returngeance

Merge branch 'FMOD'

2014-06-02 20:16:08 +02:00

Returngeance1.psess

Specular maps working.

2014-05-19 21:36:28 +02:00

Returngeance140519.vsp

Specular maps working.

2014-05-19 21:36:28 +02:00

Returngeance140519(1).vsp

Specular maps working.

2014-05-19 21:36:28 +02:00

Returngeance140519(2).vsp

Specular maps working.

2014-05-19 21:36:28 +02:00

Returngeance140519(3).vsp

Specular maps working.

2014-05-19 21:36:28 +02:00

Returngeance.psess

Basic working deferred rendering

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

Returngeance.sln

Merge remote-tracking branch 'origin/deffered_rendering' into render_queue

2014-05-27 07:10:50 +02:00