NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Danbias/Code
History
Dander7BD 60d1fdba97 Merge remote-tracking branch 'origin/GameLogic' into Camera-test-merge 
Conflicts:
	Code/Game/DanBiasGame/DanBiasGame.vcxproj
	Code/Game/DanBiasGame/DanBiasGame_Impl.cpp
	Code/Game/DanBiasGame/GameClientState/C_Object.h
	Code/Game/DanBiasGame/GameClientState/GameClientState.h
	Code/Game/DanBiasGame/GameClientState/GameState.cpp
	Code/Game/DanBiasGame/GameClientState/GameState.h
	Code/Game/DanBiasGame/GameClientState/LobbyState.h
	Code/Game/DanBiasGame/GameClientState/LoginState.h
	Code/Game/DanBiasGame/GameClientState/MainState.cpp
	Code/Game/GameProtocols/ObjectProtocols.h
	Code/Game/GameServer/Implementation/GameSession_General.cpp
 		2014-02-12 13:23:50 +01:00
..
Dokumentation Documentation - Updated uml diagrams 2014-02-10 22:25:31 +01:00
Game Merge remote-tracking branch 'origin/GameLogic' into Camera-test-merge 2014-02-12 13:23:50 +01:00
GamePhysics Merge remote-tracking branch 'origin/GameLogic' into Camera-test-merge 2014-02-12 13:23:50 +01:00
Input Master - Modified igore 2014-01-08 13:07:55 +01:00
Misc Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-12 11:36:19 +01:00
Network Overhaul of GameState 2014-02-12 09:02:44 +01:00
OysterGraphics Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameLogic 2014-02-12 09:52:46 +01:00
OysterMath Merge remote-tracking branch 'origin/GamePhysics' into Camera 2014-02-11 14:15:00 +01:00
OysterPhysics3D Fixed collision for object not in world 2014-02-12 12:38:52 +01:00
Physics Lib change for bullet 2014-02-11 13:21:22 +01:00
Sound Master - Modified igore 2014-01-08 13:07:55 +01:00
Tester removed some old stuff, respect animation looping state 2014-02-12 09:32:15 +01:00
WindowManager GameServer - Added some functionality in windowshell 2014-01-31 10:50:38 +01:00
Code.rar GL - started using the lvl format. Objects on client have pos, rot and scale (not verified) 2014-02-10 14:00:14 +01:00
DanBias.sln GL - moved camera for testing 2014-02-12 13:17:27 +01:00