NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Danbias/Code
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
..
Debug Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-26 09:26:04 +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 GL: debug fix 2013-11-26 11:32:00 +01:00
GamePhysics Created SphericalRigidBody 2013-11-26 13:28:47 +01:00
Input Restructured folders to give a flexible solution for dependencies and added to ignore list 2013-11-18 15:41:09 +01:00
Misc Merge remote-tracking branch 'origin/Graphics' into GameLogicBranch 2013-11-27 09:12:21 +01:00
Network Restructured folders to give a flexible solution for dependencies and added to ignore list 2013-11-18 15:41:09 +01:00
OysterGraphics Merge remote-tracking branch 'origin/Graphics' into GameLogicBranch 2013-11-27 09:12:21 +01:00
OysterMath Fixed Projection 2013-11-22 10:55:21 +01:00
OysterPhysics3D Simple Rigid Body implementation 2013-11-25 16:35:56 +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 remote-tracking branch 'origin/Graphics' into GameLogicBranch 2013-11-27 09:12:21 +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 Restructured folders to give a flexible solution for dependencies and added to ignore list 2013-11-18 15:41:09 +01:00