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 |
dean11
|
0785e54dfd
|
Removed .orig files after merge
|
2013-11-28 15:19:52 +01:00 |
|
dean11
|
cc4835a97b
|
Merge with Physics branch
|
2013-11-28 15:09:09 +01:00 |
Dander7BD
|
d241298308
|
merging MiscBranch into Physics with conflict fixes
|
2013-11-28 14:52:13 +01:00 |
|
lanariel
|
9bf84cdc65
|
Stable Graphics, hard coded texture read in ObjReader.ToModel
|
2013-11-28 14:34:52 +01:00 |
|
dean11
|
972cfa0d39
|
Fixed bugs with custom loading
|
2013-11-27 21:12:37 +01:00 |
|
dean11
|
48c812b033
|
Forgot to follow coding standard...
|
2013-11-26 21:51:40 +01:00 |
|
dean11
|
1f27336b3f
|
Added filename paramater in custom load function
|
2013-11-26 12:09:38 +01:00 |
|
dean11
|
e5cef4895e
|
Added support for custom loading, unloading and reloading
|
2013-11-26 10:55:51 +01:00 |
|
dean11
|
15455db1b2
|
Added a resource handler with basic byte loading
|
2013-11-22 10:46:25 +01:00 |