Commit Graph

1509 Commits

Author SHA1 Message Date
Robin Engman f8f656d7c9 Player now has better movement
Something is "dragging" the player slightly, but will be fixed. Bumps up
and down, tweaking physical properties should fix it.
2014-02-20 15:14:02 +01:00
Dander7BD fa2c4455f1 missed file 2014-02-20 14:59:24 +01:00
Dander7BD ccd1ce3ab1 jumping 2014-02-20 14:58:42 +01:00
Dander7BD 0aabd0b323 Merge remote-tracking branch 'origin/GameClient' into New-inputsystem 2014-02-20 14:40:04 +01:00
Dander7BD 8993241408 Win32ApplicationKeyboard fully implemented
ApplicationKeyboard, Win32ApplicationKeyboard & implemented into the
CreateDevice function
2014-02-20 14:39:12 +01:00
lindaandersson de70388dfb world matrix for RB on client fix 2014-02-20 13:35:51 +01:00
Dander7BD 2c8b52e0fa some implementations 2014-02-20 13:27:21 +01:00
dean11 6414fc1a4f Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-20 12:45:25 +01:00
dean11 ef35172bb9 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameClient 2014-02-20 12:45:13 +01:00
dean11 8f3eb586c6 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-20 12:44:24 +01:00
dean11 a72a304c88 Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic 2014-02-20 12:42:39 +01:00
lanariel ab830f2293 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-20 12:08:31 +01:00
lanariel a965c66e13 Seperate Glow and Tint 2014-02-20 12:07:53 +01:00
lindaandersson 50fc2fcc29 Merge remote-tracking branch 'origin/GameLogic' into GameClient 2014-02-20 11:59:44 +01:00
lindaandersson 1079b20e15 Updating player pos and RB, moved camera pos for testing 2014-02-20 11:59:26 +01:00
dean11 7ee63f887e Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer 2014-02-20 11:58:08 +01:00
dean11 4150ba0fc3 GameLogic - Added default scael 1:1 2014-02-20 11:57:26 +01:00
dean11 b570ca895e Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-20 11:48:09 +01:00
Pontus Fransson 84d2c4eb56 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-20 11:47:32 +01:00
Pontus Fransson bdf8c199a3 Removed check to not send rotation since it fucked up the rotation. 2014-02-20 11:47:18 +01:00
lindaandersson bf41bd38d4 Updating model worldMatrix 2014-02-20 11:34:29 +01:00
dean11 8cf0087a95 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-20 11:32:57 +01:00
dean11 e954180e22 Merge branch 'Input' of https://github.com/dean11/Danbias into GameServer 2014-02-20 11:32:40 +01:00
dean11 53dc42ffc4 Input - Added normalized cordinates 2014-02-20 11:27:43 +01:00
Dander7BD d945eea992 Fixed left turn mirroring and filter turn signals 2014-02-20 11:17:23 +01:00
Robin Engman 89c52d34f4 Changed order of move call 2014-02-20 11:15:13 +01:00
Dander7BD a78a4f70f1 Dan doing stuff 2014-02-20 11:12:53 +01:00
lindaandersson ddbc800dbb Merge branches 'GameClient' and 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-20 11:12:16 +01:00
lindaandersson a2bba95003 GameClient sending rotation to server 2014-02-20 11:12:08 +01:00
Pontus Fransson a4de2ddbe2 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-20 11:01:38 +01:00
Pontus Fransson d1fb6a7718 Added udp connection if we want to implement broadcast. 2014-02-20 11:01:25 +01:00
lindaandersson e6cd1f1e5f GameClient now objects say to client that they have moved! 2014-02-20 10:33:27 +01:00
lindaandersson 9082666eba Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-20 10:13:08 +01:00
lindaandersson dd397ec752 GameClient set onMoveFunc for all objects 2014-02-20 10:13:01 +01:00
Dander7BD 263eba782b Found unmarked debug hack
Naughty collegues
2014-02-20 10:04:38 +01:00
dean11 641442854e GameServer - Added debug traps 2014-02-20 09:23:33 +01:00
lanariel d537bd6791 Last release gfx fix 2014-02-20 09:23:09 +01:00
dean11 208885d4eb Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-20 09:22:03 +01:00
lindaandersson d22e736ea3 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-20 09:21:47 +01:00
lindaandersson 7b87707714 GmaeClient fix RBsphere radius 2014-02-20 09:21:38 +01:00
Dander7BD d80dec600b Memory leak dealt with + removed obsolete debug trap 2014-02-20 09:20:41 +01:00
dean11 d93d900d40 GameServer - Misc 2014-02-20 09:14:42 +01:00
Pontus Fransson 0a4d1f76b5 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-20 09:07:44 +01:00
Pontus Fransson 3527d3acb0 Network - Fixed memory leak in NetworkServer. 2014-02-20 09:07:02 +01:00
lanariel 20cb3c61c5 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient
Conflicts:
	Code/Game/GameClient/GameClientState/GameState.cpp
	Code/Game/GameClient/GameClientState/NetLoadState.cpp
2014-02-20 09:02:57 +01:00
lanariel 745a3802dc touched up SSAO and fixed wireframe rendering in release 2014-02-20 09:00:02 +01:00
dean11 9e26095dd0 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-20 08:57:06 +01:00
lindaandersson 0c0fde51b0 GameClient Correct scaling on drawn RB 2014-02-20 08:56:36 +01:00
lindaandersson 80b2a9edd7 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-20 08:44:03 +01:00
lindaandersson 7414544774 GameClient exclude RB rendering from release 2014-02-20 08:43:54 +01:00