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

1280 Commits

Author SHA1 Message Date
lindaandersson 3fe0221342 GameClient - fixed render RB 2014-02-19 13:41:05 +01:00
lanariel 90072484b8 Merge branch 'GameClientGraphics' of https://github.com/dean11/Danbias into GameClientGraphics 2014-02-19 13:39:20 +01:00
lanariel 5cc858ba1b Normal normals 2014-02-19 13:38:36 +01:00
Dander7BD 220cf30abb Merge remote-tracking branch 'origin/GameServer' into GameClient 2014-02-19 13:15:56 +01:00
Dander7BD 0f1d07cee0 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 13:15:29 +01:00
Dander7BD 8816efafc8 GameState pre-work for subStates 2014-02-19 13:15:19 +01:00
lindaandersson d6d45392d3 Merge remote-tracking branch 'origin/GameServer' into GameClient 2014-02-19 13:13:05 +01:00
dean11 8a3cd796ca GameServer - Pontus found idiot bug that dennis made 2014-02-19 12:46:05 +01:00
lindaandersson 14deeeebca Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 12:09:50 +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
Pontus Fransson f1cd73425c Removed old LevelLoader, it's now in a seperate project. 2014-02-19 11:38:36 +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
Pontus Fransson 58117ad425 asd 2014-02-19 11:22:14 +01:00
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
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
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
lindaandersson 95c70fe0b2 Merge branch 'GameClientGraphics' of https://github.com/dean11/Danbias into GameClientGraphics 2014-02-18 15:54:17 +01:00
lindaandersson 611e75b505 Toggle wireframe with "T" 2014-02-18 15:54:09 +01:00
lanariel 02312c53a4 changed debug models and tinted pink spheres 2014-02-18 15:41:59 +01:00
lanariel a068ce7ddb Merge branch 'GameClientGraphics' of https://github.com/dean11/Danbias into GameClientGraphics 2014-02-18 15:21:01 +01:00
lanariel 60d44d76d8 using new models 2014-02-18 15:20:53 +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
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
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
Dander7BD fc19938f1b Pär's fix i RenderScene 2014-02-18 10:40:27 +01:00
Robin Engman ef32e2f5ac Added new lib files for bullet 2014-02-18 10:39:46 +01:00
Dander7BD b2e98f1207 Debug hack + actual fixings 2014-02-18 10:32:09 +01:00
lanariel 55e3aaaabc Fixed proper start and some more option modifications 2014-02-18 10:19:59 +01:00
Robin Engman a36a26721d Added pre support for loading mesh shapes 
Will be used for triangle collision
 2014-02-18 10:12:21 +01:00
lanariel 80b203737a Debug WireFrame to verify 2014-02-18 09:56:28 +01:00
lanariel 0f492e7bc6 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-18 09:33:44 +01:00
lanariel 197067687e Added Gui Transparancy, 
Get Options provides Resolution.xy
 2014-02-18 09:32:10 +01:00
Dennis Andersen 5b4758d2ae Broekn 2014-02-18 08:55:38 +01:00
Dander7BD 6f368b4565 compilation error dealt with 2014-02-18 08:53:52 +01:00
Dander7BD 930a6ee279 Oops .. Forgot to save this one for the previous commit 2014-02-18 08:31:29 +01:00
dean11 5137404bb6 Temp 2014-02-18 08:31:28 +01:00
Dander7BD b4b5998a64 Bunch of implementations 2014-02-18 08:31:28 +01:00
dean11 43650befd6 GameServer - added more features to object protocols 2014-02-18 08:31:28 +01:00
Dander7BD b0aea19b8a Bunch of implementations 2014-02-18 08:31:27 +01:00
lanariel 0cb569fdb7 Color is now Float4 with RGBA 2014-02-18 08:31:27 +01:00
Dander7BD e815f57238 minor edit 2014-02-18 08:31:26 +01:00
Dander7BD 752cb163ca Fixed build errors in GameClient 2014-02-18 08:31:26 +01:00
Dander7BD 0a6cb9a43c Patch 2014-02-18 08:31:26 +01:00
Dander7BD a2317b2e30 Merge remote-tracking branch 'origin/GameServer' into GameClient 2014-02-17 16:18:52 +01:00
Dander7BD 112f45463a Oops .. Forgot to save this one for the previous commit 2014-02-17 16:18:21 +01:00
dean11 830b448690 Temp 2014-02-17 16:17:07 +01:00
Dander7BD 12623d1b16 Bunch of implementations 2014-02-17 16:16:39 +01:00
dean11 a0c9677123 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-17 15:12:29 +01:00
dean11 2bc7c9f65f GameServer - added more features to object protocols 2014-02-17 15:11:12 +01:00
Dander7BD b93e20e942 Bunch of implementations 2014-02-17 14:33:23 +01:00