Commit Graph

  • e00ddb30c9 Fixed server-client communication dean11 2014-02-18 13:12:08 +0100
  • a79bcbe8d3 GameServer - Merged with GameClient dean11 2014-02-18 13:11:45 +0100
  • b78625c230 Merge remote-tracking branch 'origin/GameServer' into GameClient Dander7BD 2014-02-18 13:10:17 +0100
  • 500ac117a7 removed debug lines Dander7BD 2014-02-18 12:59:51 +0100
  • 2e75d168a1 New Cameras Dander7BD 2014-02-18 12:03:54 +0100
  • 0a70839211 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient lanariel 2014-02-18 12:02:58 +0100
  • f9f4d55123 Graphics fix lanariel 2014-02-18 12:02:48 +0100
  • cec2740896 GameServer - Fixed minor miss with inheritance dean11 2014-02-18 11:56:36 +0100
  • 222c203b69 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-18 11:44:23 +0100
  • 484b055338 GL - Call by reference instead dean11 2014-02-18 11:44:02 +0100
  • 562f444193 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-18 11:34:46 +0100
  • f6f183d6e7 GameServer - Added inititiate protocols dean11 2014-02-18 11:34:24 +0100
  • 06ddb86b17 GL - GetAllDynamicObjects , dennis order Erik Persson 2014-02-18 11:33:36 +0100
  • 0bd5d68da4 Removed some debug lines Dander7BD 2014-02-18 11:12:47 +0100
  • c8c0bb9bc4 Clamp fixed Dander7BD 2014-02-18 11:06:11 +0100
  • fc19938f1b Pär's fix i RenderScene Dander7BD 2014-02-18 10:40:27 +0100
  • ef32e2f5ac Added new lib files for bullet Robin Engman 2014-02-18 10:39:46 +0100
  • b2e98f1207 Debug hack + actual fixings Dander7BD 2014-02-18 10:28:46 +0100
  • 55e3aaaabc Fixed proper start and some more option modifications lanariel 2014-02-18 10:19:59 +0100
  • a36a26721d Added pre support for loading mesh shapes Robin Engman 2014-02-18 10:12:21 +0100
  • 80b203737a Debug WireFrame to verify lanariel 2014-02-18 09:56:28 +0100
  • 0f492e7bc6 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient lanariel 2014-02-18 09:33:44 +0100
  • 05cc76e9d6 Added .user to gitIgnore lanariel 2014-02-18 09:33:21 +0100
  • 197067687e Added Gui Transparancy, lanariel 2014-02-18 09:32:10 +0100
  • 5b4758d2ae Broekn Dennis Andersen 2014-02-18 08:55:38 +0100
  • 6f368b4565 compilation error dealt with Dander7BD 2014-02-18 08:53:52 +0100
  • 930a6ee279 Oops .. Forgot to save this one for the previous commit Dander7BD 2014-02-17 16:18:21 +0100
  • 5137404bb6 Temp dean11 2014-02-17 16:17:07 +0100
  • b4b5998a64 Bunch of implementations Dander7BD 2014-02-17 16:16:27 +0100
  • 43650befd6 GameServer - added more features to object protocols dean11 2014-02-17 15:11:12 +0100
  • b0aea19b8a Bunch of implementations Dander7BD 2014-02-17 14:33:11 +0100
  • 0cb569fdb7 Color is now Float4 with RGBA lanariel 2014-02-17 13:05:35 +0100
  • e815f57238 minor edit Dander7BD 2014-02-17 12:02:18 +0100
  • 752cb163ca Fixed build errors in GameClient Dander7BD 2014-02-17 11:50:51 +0100
  • 0a6cb9a43c Patch Dander7BD 2014-02-17 11:27:43 +0100
  • a2317b2e30 Merge remote-tracking branch 'origin/GameServer' into GameClient Dander7BD 2014-02-17 16:18:52 +0100
  • 112f45463a Oops .. Forgot to save this one for the previous commit Dander7BD 2014-02-17 16:18:21 +0100
  • 830b448690 Temp dean11 2014-02-17 16:17:07 +0100
  • 12623d1b16 Bunch of implementations Dander7BD 2014-02-17 16:16:27 +0100
  • a0c9677123 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient dean11 2014-02-17 15:12:29 +0100
  • 2bc7c9f65f GameServer - added more features to object protocols dean11 2014-02-17 15:11:12 +0100
  • b93e20e942 Bunch of implementations Dander7BD 2014-02-17 14:33:11 +0100
  • 52301021f6 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient lanariel 2014-02-17 13:06:54 +0100
  • 51a8569585 Color is now Float4 with RGBA lanariel 2014-02-17 13:05:35 +0100
  • 013546f076 minor edit Dander7BD 2014-02-17 12:02:18 +0100
  • 29f66d2874 Fixed build errors in GameClient Dander7BD 2014-02-17 11:50:51 +0100
  • aa2518a4f6 Patch Dander7BD 2014-02-17 11:27:43 +0100
  • 7395a0a495 Major cleanup dean11 2014-02-17 10:38:11 +0100
  • bb204a80f7 Merged with all modules dean11 2014-02-17 09:17:28 +0100
  • 222a3b0bec Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-17 09:14:29 +0100
  • fb48b0b34c Merge branch 'Camera' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-17 09:11:08 +0100
  • 509fdb5572 Merge remote-tracking branch 'origin/GameLogic' into Camera-merge-buffer Dander7BD 2014-02-17 09:07:27 +0100
  • 846836cc59 Glow update lanariel 2014-02-17 09:03:53 +0100
  • d96825816d Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-17 09:01:41 +0100
  • bb8d3549dc Cleanup dean11 2014-02-17 09:01:01 +0100
  • 5119af8127 Gameserver - Added more features to standalone srver Dennis Andersen 2014-02-17 08:53:15 +0100
  • a90f33d20e Jumpy jump Robin Engman 2014-02-17 06:44:29 +0100
  • 85ebe3a7ca GameServer - Merged with Input, Added some athur info in headers Dennis Andersen 2014-02-16 01:38:03 +0100
  • cce037783d Merge branch 'Input' of https://github.com/dean11/Danbias into GameServer Dennis Andersen 2014-02-16 01:28:50 +0100
  • 97f9bfcb96 GameServer - merged with Camera Dennis Andersen 2014-02-16 01:28:34 +0100
  • 9d0148c5c2 GameServer - Merged with Standalone Server and modified some stuff, still compile errors, will try to merge with other Dennis Andersen 2014-02-16 01:12:27 +0100
  • 21c640c6e1 GameServer - Merged with Standalone Server and modified some stuff, still compile errors, will try to merge with other Dennis Andersen 2014-02-16 01:12:03 +0100
  • deb173bc46 GameServer - Merged with gamephysics Dennis Andersen 2014-02-15 22:49:13 +0100
  • b834f1fb9b GameServer - Merged with GameServer Dennis Andersen 2014-02-15 22:33:40 +0100
  • 359c208f57 GameServer - Some minor changes Dennis Andersen 2014-02-15 09:29:54 +0100
  • 2dde8547b7 Server poking Dander7BD 2014-02-14 17:12:38 +0100
  • d32e614b00 GL - Hax to get the world model initiated. reading spawnpoints lindaandersson 2014-02-14 16:03:46 +0100
  • 92d8b7edda Input - Input system created dean11 2014-02-14 15:50:00 +0100
  • 2de045524a Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer Dander7BD 2014-02-14 15:42:46 +0100
  • 8bf13dab39 Merge remote-tracking branch 'origin/Graphics' into Camera-Merge-buffer Dander7BD 2014-02-14 15:39:01 +0100
  • ba7f9aaa38 Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer Dander7BD 2014-02-14 15:38:01 +0100
  • 26fb7a5664 GL- Compile fel med spawnpoint fixat Sam Mario Svensson 2014-02-14 15:36:19 +0100
  • 73e9629832 Removed incorrect Quaternion to AngAxis conversion Dander7BD 2014-02-14 15:33:17 +0100
  • 9096e548a1 Text Culling Fix lanariel 2014-02-14 15:31:38 +0100
  • 911700676c human error fix Dander7BD 2014-02-14 15:24:19 +0100
  • c85cecd05a som more stuff Dander7BD 2014-02-14 15:19:10 +0100
  • 3051621f30 GL- levelLoader can now load a correct spawnpoint Sam Mario Svensson 2014-02-14 15:18:38 +0100
  • 655f48017c Anim Fix lanariel 2014-02-14 15:11:12 +0100
  • bfb9864be9 GL - handle if the model dose not exist lindaandersson 2014-02-14 15:07:55 +0100
  • c1d63a1477 new state: NetLoadState Dander7BD 2014-02-14 14:32:17 +0100
  • fe6742f9e2 Tweaks and a new state: NetLoadState Dander7BD 2014-02-14 14:31:01 +0100
  • adcac0ec12 Random Updates lanariel 2014-02-14 14:27:38 +0100
  • 1dd36eaace Changed from ref to value struct. Forgot a System::. Pontus Fransson 2014-02-14 14:18:16 +0100
  • 68dfd2e324 Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-14 13:55:03 +0100
  • 25b0162b59 GL - explosive crate testing lindaandersson 2014-02-14 13:54:50 +0100
  • bab3af787c GL - merge with new physics movement lindaandersson 2014-02-14 13:54:28 +0100
  • 75201d4c6d Removed some using namespaces from .h to .cpp. Pontus Fransson 2014-02-14 13:52:44 +0100
  • 8110b677ff GL - added spawnpoint array lindaandersson 2014-02-14 13:09:55 +0100
  • 8b92c015ea Merge remote-tracking branch 'origin/GamePhysics' into GameLogic Erik Persson 2014-02-14 12:46:27 +0100
  • c5c0047b5c some minor temporary button edits Dander7BD 2014-02-14 12:20:58 +0100
  • e6c5f1f6e5 Merge errors dealt with Dander7BD 2014-02-14 12:09:59 +0100
  • 4c4693e890 Lagt till alla funktion, inte en aning om det fungerar. Pontus Fransson 2014-02-14 12:09:10 +0100
  • f8e68b95b2 Temporary jump Robin Engman 2014-02-14 12:07:49 +0100
  • 9fc8a8840f GL - fixed movement(pretty unstable but its working) Erik Persson 2014-02-14 12:03:29 +0100
  • 61c49cf352 Merge with game logic Robin Engman 2014-02-14 11:54:28 +0100
  • a42dfe96f1 Jump implemented Robin Engman 2014-02-14 11:52:44 +0100
  • 66d4fcef3a Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer Dander7BD 2014-02-14 11:44:49 +0100
  • ff6a4a0d47 Build Launcher lanariel 2014-02-14 11:38:43 +0100
  • 36c6689c7a bug fixes Dander7BD 2014-02-14 11:37:20 +0100
  • 3c928f497f Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Erik Persson 2014-02-14 11:34:59 +0100