dean11
|
c0807442a4
|
Fixed some minor errors with project linking
|
2013-11-29 11:04:52 +01:00 |
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 |
Erik Persson
|
61777e23df
|
Merge remote-tracking branch 'origin/Graphics' into GameLogicBranch
Conflicts:
Bin/DLL/GamePhysics_x86D.dll
Bin/DLL/GamePhysics_x86D.exp
Bin/DLL/GamePhysics_x86D.ilk
Bin/DLL/GamePhysics_x86D.pdb
Code/OysterGraphics/OysterGraphics.vcxproj
Code/OysterGraphics/OysterGraphics.vcxproj.filters
Code/OysterGraphics/OysterGraphics.vcxproj.filters.orig
|
2013-11-27 09:12:21 +01:00 |
|
lanariel
|
f9d9479dad
|
Stable Dll read, unstable Pos
|
2013-11-26 15:33:05 +01:00 |
|
dean11
|
15455db1b2
|
Added a resource handler with basic byte loading
|
2013-11-22 10:46:25 +01:00 |
Linda Andersson
|
68d516cc86
|
adding IGame interface
|
2013-11-20 15:47:11 +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 |