NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,404 Commits 1 Branch 0 Tags 38 MiB
Commit Graph

609 Commits

Author SHA1 Message Date
Pontus Fransson f532514131 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-20 15:57:36 +01:00
Pontus Fransson dedd0e87c7 Added player disconnect protocol. 2014-02-20 15:47:11 +01:00
lanariel 67d150fce1 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-20 15:16:20 +01:00
lanariel a3c4099111 Global Tint 2014-02-20 15:15:54 +01:00
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
lindaandersson de70388dfb world matrix for RB on client fix 2014-02-20 13:35:51 +01:00
dean11 8f3eb586c6 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-20 12:44:24 +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
Dander7BD d945eea992 Fixed left turn mirroring and filter turn signals 2014-02-20 11:17:23 +01:00
Dander7BD a78a4f70f1 Dan doing stuff 2014-02-20 11:12:53 +01:00
lindaandersson a2bba95003 GameClient sending rotation to server 2014-02-20 11:12:08 +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
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
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
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
Dennis Andersen f872cfffd1 Added debug project to game server and some other stuff 2014-02-20 08:33:07 +01:00
Dennis Andersen 7ab3223280 Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameServer 2014-02-19 22:44:46 +01:00
Dennis Andersen 4ac5cdd147 GameServer - Painly merge with GameLogic 2014-02-19 22:44:31 +01:00
Dennis Andersen b5639bec90 GameServer - Some white spaces etc.. 2014-02-19 22:07:53 +01:00
dean11 b656ce448d GameServer - Debuging GameLogic 2014-02-19 16:22:14 +01:00
Dander7BD 3b70e0baec Merge remote-tracking branch 'origin/GameClientGraphics' into GameClient 2014-02-19 16:09:07 +01:00
lanariel 4697b85e3b Small fixes 2014-02-19 15:57:52 +01:00
lindaandersson 0876e5797a Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 15:54:01 +01:00
lindaandersson a2979a2bf5 GameClient - modified player Data and out commented physics 2014-02-19 15:53:28 +01:00
Dander7BD 48487e681b Merge remote-tracking branch 'origin/GameLogic' into GameClient 2014-02-19 15:53:21 +01:00
dean11 13755c0aeb Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer 2014-02-19 15:53:20 +01:00
dean11 d07ee997f5 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-19 15:53:09 +01:00
dean11 89b73cdf01 GameLogic - fixed wrong pointer cast 2014-02-19 15:52:16 +01:00