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

1206 Commits

Author SHA1 Message Date
lindaandersson ed355d58b6 Merge remote-tracking branch 'origin/GameServer' into GameClient 2014-02-19 11:19:48 +01:00
lindaandersson 3bc916cfb2 GameClient - merge 2014-02-19 11:10:28 +01:00
dean11 65163447bb GameServer - Merged with Physics 2014-02-19 11:09:37 +01:00
dean11 0a664bd0dd GameServer - Added dynamic player alias and model names 2014-02-19 11:02:44 +01:00
Dander7BD ed6825a408 Merge remote-tracking branch 'origin/Physics' into GameClient 2014-02-19 10:57:18 +01:00
Robin Engman fa95e6b821 Linda fixing some lvl loading stuff 2014-02-19 10:55:59 +01:00
dean11 aa19904fa0 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer 2014-02-19 10:48:04 +01:00
dean11 61350572c7 GameLogic - Merge with origin gamelogic 2014-02-19 10:47:14 +01:00
dean11 0e23bcfc82 GameLogic - Modified some names and cleand up some junk 2014-02-19 10:36:45 +01:00
Erik Persson c2ef8350cf GL - players created with unique ids 2014-02-19 10:15:52 +01:00
dean11 efe29b7a18 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-19 09:43:08 +01:00
Pontus Fransson 6e80c1c603 LevelLoader - Added an if check to se if it found the map file. 2014-02-19 09:39:19 +01:00
Pontus Fransson ca2695293f Added reconnect (not tested). Added check for level parser not finding file. 2014-02-19 09:25:40 +01:00
Robin Engman 2fac21584f Merge with GameServer 2014-02-19 09:00:00 +01:00
Dennis Andersen 7af1c18dcf GameServer - Some minor features to Standalone server 2014-02-19 02:10:13 +01:00
Dennis Andersen af15157283 GameLogic - Added default path to level data 2014-02-19 00:20:01 +01:00
Dennis Andersen 53c0c74c7c GameLogic - Merged with GameServer and fixed some merge errors 2014-02-18 21:50:51 +01:00
Dennis Andersen 8a0dbe969c GameLogic - Added filename to paramater when initiating a level, Also changed some string to wstrings 2014-02-18 21:24:21 +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 f2cbbfcf69 Merge remote-tracking branch 'origin/GameServer' into GameClient 2014-02-18 17:04:58 +01:00
Dander7BD 02b467be18 const related edits in CustomNetProtocol 
Should be none impact besides positive ones
 2014-02-18 17:04:27 +01:00
Dander7BD a6f740e1f8 bunch of stuff 2014-02-18 16:44:38 +01:00
dean11 22f9daf0d8 Connection between server and client is stable 2014-02-18 16:38:08 +01:00
Dander7BD e37dd606ba Merge remote-tracking branch 'origin/GameServer' into GameClient 
Conflicts:
	Code/Game/GameClient/GameClientState/NetLoadState.cpp
 2014-02-18 15:11:03 +01:00
Dander7BD 996f660990 Fixes and bugtraps 2014-02-18 15:09:01 +01:00
Dander7BD 3218e7b847 Connect to Dennis 2014-02-18 15:08:47 +01:00
Pontus Fransson 86ef521abd LevelLoader - Added new CollisionGeometry_TriangleMesh. 2014-02-18 14:10:22 +01:00
Pontus Fransson e72f2224be Removed Misc\Misc from additionalDependencies. 2014-02-18 14:10:22 +01:00
Erik Persson be8b7537b5 GL - merging 2014-02-18 13:47:40 +01:00
lanariel ded860c98b Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-18 13:43:41 +01:00
lanariel 3f4038a12d Backface change and enable render wireframe 2014-02-18 13:43:32 +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
dean11 c89ec7bbcd Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-18 13:12:33 +01:00
dean11 e00ddb30c9 Fixed server-client communication 2014-02-18 13:12:08 +01:00
dean11 a79bcbe8d3 GameServer - Merged with GameClient 2014-02-18 13:11:45 +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 2e75d168a1 New Cameras 
V2 is quaternion based
 2014-02-18 12:04:22 +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
dean11 cec2740896 GameServer - Fixed minor miss with inheritance 2014-02-18 11:56:36 +01:00
dean11 222c203b69 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer 2014-02-18 11:44:23 +01:00
dean11 484b055338 GL - Call by reference instead 2014-02-18 11:44:02 +01:00
dean11 562f444193 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer 2014-02-18 11:34:46 +01:00
dean11 f6f183d6e7 GameServer - Added inititiate protocols 2014-02-18 11:34:24 +01:00
Erik Persson 06ddb86b17 GL - GetAllDynamicObjects , dennis order 2014-02-18 11:33:36 +01:00
Dander7BD 0bd5d68da4 Removed some debug lines 2014-02-18 11:12:47 +01:00
Dander7BD c8c0bb9bc4 Clamp fixed 2014-02-18 11:06:11 +01:00