NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Danbias/Code/OysterGraphics
History
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
..
Core Merge branch 'Sprint1' of https://github.com/dean11/Danbias into Graphics 2013-11-29 10:31:19 +01:00
Definitions Pre merge Commit 2013-11-26 13:44:58 +01:00
DllInterfaces Stable Resource Management with 4 unidentified Memory Leaks 2013-11-29 10:25:27 +01:00
FileLoader Stable Resource Management with 4 unidentified Memory Leaks 2013-11-29 10:25:27 +01:00
Model Stable Dll read, unstable Pos 2013-11-26 15:33:05 +01:00
OldRender Fixing Render Namespace, See, todo in Resources.cpp 2013-11-20 16:51:53 +01:00
OldResourses Fixing Render Namespace, See, todo in Resources.cpp 2013-11-20 16:51:53 +01:00
Render Stable Resource Management with 4 unidentified Memory Leaks 2013-11-29 10:25:27 +01:00
Shader Merge branch 'Sprint1' of https://github.com/dean11/Danbias into Graphics 2013-11-29 10:31:19 +01:00
Engine.cpp Restructured folders to give a flexible solution for dependencies and added to ignore list 2013-11-18 15:41:09 +01:00
Engine.h Core Update 2013-11-20 10:22:01 +01:00
EngineIncludes.h Core Update 2013-11-20 10:22:01 +01:00
OysterGraphics.vcxproj Stable Resource Management with 4 unidentified Memory Leaks 2013-11-29 10:25:27 +01:00
OysterGraphics.vcxproj.filters Stable Resource Management with 4 unidentified Memory Leaks 2013-11-29 10:25:27 +01:00
OysterGraphics.vcxproj.filters.orig Debug From Home 2013-11-21 18:31:16 +01:00
OysterGraphics.vcxproj.orig Debug From Home 2013-11-21 18:31:16 +01:00