Danbias/Code
Sam Mario Svensson 3c1d66e3f8 Merge branch 'GameLogic-LevelFormat' of https://github.com/dean11/Danbias into GameLogic-LevelFormat
Conflicts:
	Code/Dokumentation/LevelLoader.uxf
	Code/Game/GameLogic/GameLogic.vcxproj
2014-01-24 10:42:19 +01:00
..
Dokumentation Merge branch 'GameLogic-LevelFormat' of https://github.com/dean11/Danbias into GameLogic-LevelFormat 2014-01-24 10:42:19 +01:00
Game Merge branch 'GameLogic-LevelFormat' of https://github.com/dean11/Danbias into GameLogic-LevelFormat 2014-01-24 10:42:19 +01:00
GamePhysics Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-01-23 08:25:10 +01:00
Input Master - Modified igore 2014-01-08 13:07:55 +01:00
Misc Merge remote-tracking branch 'origin/Physics' into GameLogic 2014-01-22 10:51:13 +01:00
Network Added final protocols, and a bit of support for them on server side 2014-01-22 15:22:52 +01:00
OysterGraphics GameLogic - Merged with graphics 2014-01-20 16:36:25 +01:00
OysterMath lerp fix 3 2014-01-21 12:11:30 +01:00
OysterPhysics3D Added gravity normal to state struct 2014-01-21 14:56:34 +01:00
Sound Master - Modified igore 2014-01-08 13:07:55 +01:00
WindowManager Fixed minor server network bug, modified shader to get visual 2014-01-14 10:15:50 +01:00
DanBias.sln GameServer - Added more protocols and modified old ones a bit. Also added a new project that starts both server and client 2014-01-21 09:52:48 +01:00