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

27 Commits

Author SHA1 Message Date
Linda Andersson 704e562d01 Merge branch 'GameServer' into GameClient 2014-02-24 14:48:36 +01:00
lanariel 37e9d47207 Instanced Rendering 2014-02-24 14:44:36 +01:00
Pontus Fransson 6eb0a282c2 LevelLoader reads lights and cgMesh correctly. 2014-02-22 12:58:43 +01:00
lindaandersson 1079b20e15 Updating player pos and RB, moved camera pos for testing 2014-02-20 11:59:26 +01:00
lindaandersson 7b87707714 GmaeClient fix RBsphere radius 2014-02-20 09:21:38 +01:00
lindaandersson 0c0fde51b0 GameClient Correct scaling on drawn RB 2014-02-20 08:56:36 +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 ad37095a80 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 11:31:14 +01:00
lindaandersson 77ad199cf6 GameClient - merged with all new things 2014-02-19 11:31:05 +01:00
Pontus Fransson 6c19c12682 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 
Conflicts:
	Code/Game/GameLogic/LevelLoader/LevelLoader.cpp
	Code/Game/GameLogic/LevelLoader/LevelLoader.h
	Code/Game/GameLogic/LevelLoader/LevelParser.cpp
	Code/Game/GameLogic/LevelLoader/LevelParser.h
	Code/Game/GameLogic/LevelLoader/Loader.cpp
	Code/Game/GameLogic/LevelLoader/Loader.h
	Code/Game/GameLogic/LevelLoader/ObjectDefines.h
	Code/Game/GameLogic/LevelLoader/ParseFunctions.cpp
 2014-02-19 11:25:33 +01:00
lindaandersson 3bc916cfb2 GameClient - merge 2014-02-19 11:10:28 +01:00
Pontus Fransson 7f8c10292e Moved LevelLoader to a seperate lib project. 2014-02-19 11:00:16 +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 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 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
lindaandersson bfa748047f GL - added RigidBody data on client for debuging output 2014-02-18 13:31:36 +01:00
Dander7BD b78625c230 Merge remote-tracking branch 'origin/GameServer' into GameClient 
Conflicts:
	Code/Game/GameClient/GameClientState/NetLoadState.cpp
 2014-02-18 13:10:17 +01:00
Dander7BD 500ac117a7 removed debug lines 2014-02-18 12:59:51 +01:00
Dander7BD b2e98f1207 Debug hack + actual fixings 2014-02-18 10:32:09 +01:00
Dennis Andersen 5b4758d2ae Broekn 2014-02-18 08:55:38 +01:00
Dander7BD 12623d1b16 Bunch of implementations 2014-02-17 16:16:39 +01:00
Dander7BD b93e20e942 Bunch of implementations 2014-02-17 14:33:23 +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/GameClientState/NetLoadState.cpp (Browse further)