Commit Graph

24 Commits

Author SHA1 Message Date
Dander7BD ee54ce5d73 Merge remote-tracking branch 'origin/GameClient' into PlayerRunEdits
Conflicts:
	Code/Game/GameClient/DanBiasGame_Impl.cpp
2014-02-27 12:47:26 +01:00
lanariel 1b7cebc2e9 Resize 2014-02-27 10:49:22 +01:00
lanariel d5eeb3eec1 Merge branch 'New-inputsystem' of https://github.com/dean11/Danbias into Gtest 2014-02-27 09:05:09 +01:00
lanariel 3e72421cb5 half baked tiles 2014-02-27 09:04:12 +01:00
dean11 3bfedf920a GameServer - minor 2014-02-26 16:10:04 +01:00
dean11 b1f82c8ef2 Merged with Physics 2014-02-26 14:07:46 +01:00
dean11 7c52fe236f NewInput - Merged with gameClient 2014-02-25 16:42:51 +01:00
dean11 0fd038be8c NewInpuit - Pre-merge with gameclient 2014-02-25 15:52:15 +01:00
dean11 b4ad883472 New input - added new input and more menu stuff 2014-02-25 14:25:54 +01:00
Dennis Andersen 44aab68bfb Input - More support for mouse 2014-02-21 21:04:30 +01:00
lindaandersson 38717f011c Render players with run animation 2014-02-21 12:38:25 +01:00
Dander7BD 9a470fc175 post merge fixes 2014-02-21 12:09:38 +01:00
Dander7BD ac492b413b implementations 2014-02-21 09:36:43 +01:00
Dander7BD 3e8595f52c branch jumping 2014-02-20 16:15:47 +01:00
Dander7BD ccd1ce3ab1 jumping 2014-02-20 14:58:42 +01:00
Dander7BD a78a4f70f1 Dan doing stuff 2014-02-20 11:12:53 +01:00
lanariel 4697b85e3b Small fixes 2014-02-19 15:57:52 +01:00
lanariel 5cc858ba1b Normal normals 2014-02-19 13:38:36 +01:00
Dander7BD b2e98f1207 Debug hack + actual fixings 2014-02-18 10:32:09 +01:00
lanariel 55e3aaaabc Fixed proper start and some more option modifications 2014-02-18 10:19:59 +01:00
Dander7BD 12623d1b16 Bunch of implementations 2014-02-17 16:16:39 +01:00
Dander7BD 29f66d2874 Fixed build errors in GameClient 2014-02-17 11:50:51 +01:00
Dander7BD aa2518a4f6 Patch 2014-02-17 11:27:43 +01:00
dean11 7395a0a495 Major cleanup 2014-02-17 10:38:11 +01:00
Renamed from Code/Game/DanBiasGame/DanBiasGame_Impl.cpp (Browse further)