lanariel 469ccaab6c Merge branch 'Sprint1' of https://github.com/dean11/Danbias into Graphics ... Conflicts: Bin/DLL/DebugCameraVertex.cso Bin/DLL/DebugPixel.cso Bin/DLL/GamePhysics_x86D.dll Bin/DLL/GamePhysics_x86D.exp Bin/DLL/GamePhysics_x86D.ilk Bin/DLL/GamePhysics_x86D.pdb Bin/DLL/OysterGraphics_x86D.dll Bin/DLL/OysterGraphics_x86D.exp Bin/DLL/OysterGraphics_x86D.ilk Bin/DLL/OysterGraphics_x86D.pdb Bin/DLL/TextureDebug.cso Bin/DLL/VertexGatherData.cso Code/OysterGraphics/FileLoader/ObjReader.cpp Code/OysterGraphics/FileLoader/TextureLoader.cpp Code/OysterGraphics/FileLoader/TextureLoader.h Code/OysterGraphics/OysterGraphics.vcxproj Code/OysterGraphics/OysterGraphics.vcxproj.filters Code/OysterGraphics/Render/Resources/Resources.cpp Code/OysterGraphics/Shader/HLSL/SimpleDebug/Debug.hlsl Code/OysterGraphics/Shader/HLSL/SimpleDebug/DebugCameraVertex.hlsl Code/OysterGraphics/Shader/HLSL/SimpleDebug/DebugPixel.hlsl Code/OysterGraphics/Shader/HLSL/SimpleDebug/TextureDebug.hlsl Code/Tester/MainTest.cpp		2013-11-29 10:31:19 +01:00
..
GatherGBuffer	Unstable RenderTexture	2013-11-27 15:26:29 +01:00
Render	Stable Graphics, hard coded texture read in ObjReader.ToModel	2013-11-28 14:34:52 +01:00