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 |
|
lanariel
|
ca20a5af9e
|
Stable Resource Management with 4 unidentified Memory Leaks
|
2013-11-29 10:25:27 +01:00 |
|
lanariel
|
9bf84cdc65
|
Stable Graphics, hard coded texture read in ObjReader.ToModel
|
2013-11-28 14:34:52 +01:00 |
|
lanariel
|
8f6ca79e6b
|
Unstable RenderTexture
|
2013-11-27 15:26:29 +01:00 |
|
lanariel
|
328e4777ce
|
Started to wrap into dll
|
2013-11-22 14:09:47 +01:00 |
|
lanariel
|
5abaef6e86
|
Fixed render errors
|
2013-11-21 23:54:12 +01:00 |
|
lanariel
|
425a838f31
|
Core Update
|
2013-11-20 10:22:01 +01:00 |
dean11
|
33e7afabcd
|
Restructured folders to give a flexible solution for dependencies and added to ignore list
|
2013-11-18 15:41:09 +01:00 |