Commit Graph

5 Commits

Author SHA1 Message Date
bladdidoo 61b8baed1b Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics
Conflicts:
	Code/OysterGraphics/Shader/HLSL/Deffered Shaders/GBufferHeader.hlsli
	Code/Tester/MainTest.cpp
2014-01-17 08:58:49 +01:00
bladdidoo c48f640cdf Loading .Dan geometry and material 2014-01-17 08:51:12 +01:00
lanariel 483236801f Fixed compile warnings and crash on non existing models 2014-01-16 09:30:01 +01:00
lanariel 7c567ec360 SSAO and frame counter 2014-01-08 07:01:59 +01:00
lanariel 718b1ade2b Proper Lighting, supports Multiple Lights 2013-12-18 20:28:06 +01:00