NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Danbias/Code
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
..
DanBiasGame GL - camera movement working 2013-11-29 10:04:44 +01:00
Dokumentation Restructured folders to give a flexible solution for dependencies and added to ignore list 2013-11-18 15:41:09 +01:00
GameLogic Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-29 10:04:59 +01:00
GamePhysics Implemented a temporary collision test update 2013-11-29 10:00:07 +01:00
Input GL - camera movement working 2013-11-29 10:04:44 +01:00
Misc Merge branch 'Sprint1' of https://github.com/dean11/Danbias into Graphics 2013-11-29 10:31:19 +01:00
Network Documentation of the code done by Sam 2013-11-29 09:19:14 +01:00
OysterGraphics Merge branch 'Sprint1' of https://github.com/dean11/Danbias into Graphics 2013-11-29 10:31:19 +01:00
OysterMath Some matrix constructors made explicit 2013-11-27 15:24:09 +01:00
OysterPhysics3D SimpleRigidBody factory done 2013-11-28 12:08:41 +01:00
Sound Restructured folders to give a flexible solution for dependencies and added to ignore list 2013-11-18 15:41:09 +01:00
Tester Merge branch 'Sprint1' of https://github.com/dean11/Danbias into Graphics 2013-11-29 10:31:19 +01:00
WindowManager Restructured folders to give a flexible solution for dependencies and added to ignore list 2013-11-18 15:41:09 +01:00
DanBias.sln GL could draw an object but now adding DanBiasGame - problems with dll! 2013-11-27 16:17:47 +01:00