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

56 Commits

Author SHA1 Message Date
Pontus Fransson 4072e7aca2 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-21 11:00:21 +01:00
lindaandersson 0ade5fde25 GameClient UI base. TODO: make it look pretty 2014-02-21 10:49:02 +01:00
dean11 956c1a726c Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameServer 2014-02-21 09:44:29 +01:00
Pontus Fransson c718dc5a2b Started implementing broadcasting 2014-02-21 09:34:09 +01:00
lindaandersson 3bee35785a moved debug buttons to gameState 2014-02-20 16:51:14 +01:00
lindaandersson d7a9772889 Merge with gameServer 2014-02-20 16:38:15 +01:00
lindaandersson d83e545e58 Started adding GameUI 2014-02-20 16:35:49 +01:00
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
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 1079b20e15 Updating player pos and RB, moved camera pos for testing 2014-02-20 11:59:26 +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
Dander7BD d945eea992 Fixed left turn mirroring and filter turn signals 2014-02-20 11:17:23 +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 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
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
Dander7BD 48487e681b Merge remote-tracking branch 'origin/GameLogic' into GameClient 2014-02-19 15:53:21 +01:00
dean11 89b73cdf01 GameLogic - fixed wrong pointer cast 2014-02-19 15:52:16 +01:00
Dander7BD 908d52020a Some fixes and traps 2014-02-19 15:47:55 +01:00
Dander7BD 8917caf08a removed debug comment 2014-02-19 14:20:46 +01:00
Dander7BD cd4e5ae0ec compilation error fixes 2014-02-19 14:00:48 +01:00
lindaandersson 3fe0221342 GameClient - fixed render RB 2014-02-19 13:41:05 +01:00
lindaandersson 932ef429c2 GameClient - removed hardcoding for lvl, use 2ofAll map for correct world. Init player gets wrong scale and isMyPlayer. Need to verify camera on client 2014-02-19 12:09:42 +01:00
lindaandersson 77ad199cf6 GameClient - merged with all new things 2014-02-19 11:31:05 +01:00
lindaandersson 3bc916cfb2 GameClient - merge 2014-02-19 11:10:28 +01:00
lindaandersson 6ef0a7caa6 Added lights to client 2014-02-19 10:59:23 +01:00
Robin Engman fa95e6b821 Linda fixing some lvl loading stuff 2014-02-19 10:55:59 +01:00
Dander7BD 00fe2e6aa7 Camera swap 
Trying the quaternion based one instead
 2014-02-18 17:42:00 +01:00
Dander7BD a85b803e5c GameClientState Patch 
virtual void DataRecieved(
::Oyster::Network::NetEvent<::Oyster::Network::NetworkClient*,
::Oyster::Network::NetworkClient::ClientEventArgs> e );

changed to

virtual const NetEvent & DataRecieved( const NetEvent &message );

/******************************************************************
* @param message of the event
* @return message or GameClientState::event_processed.
******************************************************************/
 2014-02-18 17:28:24 +01:00
Dander7BD a6f740e1f8 bunch of stuff 2014-02-18 16:44:38 +01:00
lindaandersson 611e75b505 Toggle wireframe with "T" 2014-02-18 15:54:09 +01:00
Dander7BD 996f660990 Fixes and bugtraps 2014-02-18 15:09:01 +01:00
lindaandersson e8b0e75ed7 Render rigid body from lvl format 2014-02-18 15:07:40 +01:00
lanariel 0971bc407e Small fix 2014-02-18 14:23:38 +01:00
lindaandersson c583543d36 Merge commit '0a70839211c9b1d87f2313817cb5a1000fe34ef0' into GameClient 2014-02-18 13:32:32 +01:00
lindaandersson bfa748047f GL - added RigidBody data on client for debuging output 2014-02-18 13:31:36 +01:00
Dander7BD 500ac117a7 removed debug lines 2014-02-18 12:59:51 +01:00
lanariel 0a70839211 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-18 12:02:58 +01:00
lanariel f9f4d55123 Graphics fix 2014-02-18 12:02:48 +01:00
Dander7BD 0bd5d68da4 Removed some debug lines 2014-02-18 11:12:47 +01:00
Dander7BD b2e98f1207 Debug hack + actual fixings 2014-02-18 10:32:09 +01:00