NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Danbias/Code/OysterGraphics
History
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
..
Core Stable Dll read, unstable Pos 2013-11-26 15:33:05 +01:00
Definitions Pre merge Commit 2013-11-26 13:44:58 +01:00
DllInterfaces Stable Dll read, unstable Pos 2013-11-26 15:33:05 +01:00
FileLoader Pre merge Commit 2013-11-26 13:44:58 +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 Pre merge Commit 2013-11-26 13:44:58 +01:00
Shader Pre merge Commit 2013-11-26 13:44:58 +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 Merge remote-tracking branch 'origin/Graphics' into GameLogicBranch 2013-11-27 09:12:21 +01:00
OysterGraphics.vcxproj.filters Merge remote-tracking branch 'origin/Graphics' into GameLogicBranch 2013-11-27 09:12:21 +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