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

1415 Commits

Author SHA1 Message Date
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 05cc76e9d6 Added .user to gitIgnore 2014-02-18 09:33:21 +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