Danbias/Code
Dander7BD ba7f9aaa38 Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer
Conflicts:
	Code/Game/DanBiasGame/GameClientState/C_Object.h
	Code/Game/DanBiasGame/GameClientState/C_obj/C_Player.cpp
	Code/Game/DanBiasGame/GameClientState/C_obj/C_Player.h
	Code/Game/DanBiasGame/GameClientState/GameState.cpp
2014-02-14 15:38:01 +01:00
..
Dokumentation Documentation - Updated uml diagrams 2014-02-10 22:25:31 +01:00
Game Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer 2014-02-14 15:38:01 +01:00
GamePhysics Jump implemented 2014-02-14 11:52:44 +01:00
Input Temporary mouse pos add + other stuff 2014-02-14 11:26:50 +01:00
Misc Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer 2014-02-14 15:38:01 +01:00
Network Merge 2014-02-13 15:32:54 +01:00
OysterGraphics Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameLogic 2014-02-14 13:55:03 +01:00
OysterMath Removed incorrect Quaternion to AngAxis conversion 2014-02-14 15:33:17 +01:00
OysterPhysics3D Fixed collision for object not in world 2014-02-12 12:38:52 +01:00
Physics Fixed project files 2014-02-12 13:21:59 +01:00
Sound Master - Modified igore 2014-01-08 13:07:55 +01:00
Tester New Vertex format NOT STABLE UNTIL NEW MODELS 2014-02-14 10:08:39 +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 - added Portal and started on crystalformation 2014-02-13 09:58:25 +01:00