Dander7BD 78f47cd3ae Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer ... Conflicts: Code/Game/GameLogic/Portal.cpp		2014-02-14 10:34:00 +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 10:34:00 +01:00
GamePhysics	Merge branch 'Camera-test-merge' into Camera	2014-02-13 08:49:45 +01:00
Input	Master - Modified igore	2014-01-08 13:07:55 +01:00
Misc	Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer	2014-02-14 10:02:25 +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-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	Fixed project files	2014-02-12 13:21:59 +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 - added Portal and started on crystalformation	2014-02-13 09:58:25 +01:00