Jace 6684aa06b7 Merge branch 'master' into gui ...

Conflicts:
	src/GUI/Frame.h
	src/InputManager.cpp

2014-05-15 21:16:43 +02:00

..

ModelingProject1

Changed toolset to vs11, for future Havok implementation.

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

Returngeance

Merge branch 'master' into gui

2014-05-15 21:16:43 +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