Commit Graph

  • b5639bec90 GameServer - Some white spaces etc.. Dennis Andersen 2014-02-19 22:07:53 +0100
  • b656ce448d GameServer - Debuging GameLogic dean11 2014-02-19 16:22:14 +0100
  • 3b70e0baec Merge remote-tracking branch 'origin/GameClientGraphics' into GameClient Dander7BD 2014-02-19 16:09:07 +0100
  • 4697b85e3b Small fixes lanariel 2014-02-19 15:57:52 +0100
  • 0876e5797a Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient lindaandersson 2014-02-19 15:54:01 +0100
  • a2979a2bf5 GameClient - modified player Data and out commented physics lindaandersson 2014-02-19 15:53:28 +0100
  • 48487e681b Merge remote-tracking branch 'origin/GameLogic' into GameClient Dander7BD 2014-02-19 15:53:21 +0100
  • 13755c0aeb Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-19 15:53:20 +0100
  • d07ee997f5 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-19 15:53:09 +0100
  • 89b73cdf01 GameLogic - fixed wrong pointer cast dean11 2014-02-19 15:52:16 +0100
  • 908d52020a Some fixes and traps Dander7BD 2014-02-19 15:47:43 +0100
  • c2226fa9d1 Clamp fixed Dander7BD 2014-02-19 15:47:02 +0100
  • f69f3af23d Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient Pontus Fransson 2014-02-19 15:40:23 +0100
  • 03efca45b8 Fixed ButonEllipse it was not up to date. And only resizing the buttons now. Pontus Fransson 2014-02-19 15:40:09 +0100
  • b81995b84b Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic dean11 2014-02-19 15:32:52 +0100
  • b5d7109e13 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameLogic dean11 2014-02-19 15:28:32 +0100
  • 89857c03e6 Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic dean11 2014-02-19 15:25:10 +0100
  • a9f554448c some edits in Camera_FPSV2 Dander7BD 2014-02-19 15:20:50 +0100
  • 4104ae8df7 Camera_FPSV2 fix + Added bug trap Dander7BD 2014-02-19 15:00:28 +0100
  • 6409b051b4 GameServer - Added more feature to standalone server dean11 2014-02-19 14:53:59 +0100
  • da94d7d827 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient Pontus Fransson 2014-02-19 14:52:24 +0100
  • 706395680f Added bunch of Quaternion functions Dander7BD 2014-02-19 14:51:37 +0100
  • 717e95bdfe Network - Added reconnect with the last address you connected on. Pontus Fransson 2014-02-19 14:49:20 +0100
  • 8917caf08a removed debug comment Dander7BD 2014-02-19 14:20:46 +0100
  • d79e65657c Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-19 14:04:53 +0100
  • f04a928d6e Merge remote-tracking branch 'origin/Physics' into GameClient Dander7BD 2014-02-19 14:01:46 +0100
  • cd4e5ae0ec compilation error fixes Dander7BD 2014-02-19 14:00:36 +0100
  • 3520062577 Implemented TurnLeft function Robin Engman 2014-02-19 13:59:59 +0100
  • d972bd7685 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient lindaandersson 2014-02-19 13:57:09 +0100
  • b25a08ff90 Fix in lvl loader - can now load shere RB lindaandersson 2014-02-19 13:57:00 +0100
  • 0a9b522e15 Merge remote-tracking branch 'origin/GameLogic' into Physics Robin Engman 2014-02-19 13:50:33 +0100
  • d4baf33ef5 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-19 13:50:32 +0100
  • 47b9b69e7f Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-19 13:50:23 +0100
  • f0c581ca04 GameLogic - Added functions for relative rotation dean11 2014-02-19 13:47:49 +0100
  • e585589d6e Merge remote-tracking branch 'origin/GameServer' into GameClient Dander7BD 2014-02-19 13:44:55 +0100
  • 273995e204 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClientGraphics lanariel 2014-02-19 13:43:03 +0100
  • 7ece3b62a0 Changed Player_Look protocol to Player_LeftTurn Dander7BD 2014-02-19 13:42:43 +0100
  • b3f8754f47 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient lindaandersson 2014-02-19 13:41:12 +0100
  • 3fe0221342 GameClient - fixed render RB lindaandersson 2014-02-19 13:41:05 +0100
  • 90072484b8 Merge branch 'GameClientGraphics' of https://github.com/dean11/Danbias into GameClientGraphics lanariel 2014-02-19 13:39:20 +0100
  • 5cc858ba1b Normal normals lanariel 2014-02-19 13:38:36 +0100
  • 220cf30abb Merge remote-tracking branch 'origin/GameServer' into GameClient Dander7BD 2014-02-19 13:15:56 +0100
  • 0f1d07cee0 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient Dander7BD 2014-02-19 13:15:29 +0100
  • 8816efafc8 GameState pre-work for subStates Dander7BD 2014-02-19 13:15:19 +0100
  • d6d45392d3 Merge remote-tracking branch 'origin/GameServer' into GameClient lindaandersson 2014-02-19 13:13:05 +0100
  • be73d95568 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-19 13:10:17 +0100
  • 8a3cd796ca GameServer - Pontus found idiot bug that dennis made dean11 2014-02-19 12:46:05 +0100
  • 14deeeebca Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient lindaandersson 2014-02-19 12:09:50 +0100
  • 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 lindaandersson 2014-02-19 12:09:42 +0100
  • f1cd73425c Removed old LevelLoader, it's now in a seperate project. Pontus Fransson 2014-02-19 11:38:36 +0100
  • ad37095a80 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient lindaandersson 2014-02-19 11:31:14 +0100
  • 77ad199cf6 GameClient - merged with all new things lindaandersson 2014-02-19 11:31:05 +0100
  • 6c19c12682 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient Pontus Fransson 2014-02-19 11:25:33 +0100
  • 58117ad425 asd Pontus Fransson 2014-02-19 11:22:14 +0100
  • ed355d58b6 Merge remote-tracking branch 'origin/GameServer' into GameClient lindaandersson 2014-02-19 11:19:48 +0100
  • 3bc916cfb2 GameClient - merge lindaandersson 2014-02-19 11:10:28 +0100
  • 65163447bb GameServer - Merged with Physics dean11 2014-02-19 11:09:37 +0100
  • 0a664bd0dd GameServer - Added dynamic player alias and model names dean11 2014-02-19 11:02:44 +0100
  • 7f8c10292e Moved LevelLoader to a seperate lib project. Pontus Fransson 2014-02-19 11:00:16 +0100
  • 6ef0a7caa6 Added lights to client lindaandersson 2014-02-19 10:59:23 +0100
  • ed6825a408 Merge remote-tracking branch 'origin/Physics' into GameClient Dander7BD 2014-02-19 10:57:18 +0100
  • fa95e6b821 Linda fixing some lvl loading stuff Robin Engman 2014-02-19 10:55:59 +0100
  • aa19904fa0 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-19 10:48:04 +0100
  • 61350572c7 GameLogic - Merge with origin gamelogic dean11 2014-02-19 10:47:14 +0100
  • 0e23bcfc82 GameLogic - Modified some names and cleand up some junk dean11 2014-02-19 10:36:45 +0100
  • c2ef8350cf GL - players created with unique ids Erik Persson 2014-02-19 10:15:52 +0100
  • efe29b7a18 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-19 09:43:08 +0100
  • 6e80c1c603 LevelLoader - Added an if check to se if it found the map file. Pontus Fransson 2014-02-19 09:39:19 +0100
  • ca2695293f Added reconnect (not tested). Added check for level parser not finding file. Pontus Fransson 2014-02-19 09:25:40 +0100
  • 2fac21584f Merge with GameServer Robin Engman 2014-02-19 09:00:00 +0100
  • 5de66d5d2d Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-19 08:43:05 +0100
  • 7af1c18dcf GameServer - Some minor features to Standalone server Dennis Andersen 2014-02-19 02:10:13 +0100
  • af15157283 GameLogic - Added default path to level data Dennis Andersen 2014-02-19 00:20:01 +0100
  • 53c0c74c7c GameLogic - Merged with GameServer and fixed some merge errors Dennis Andersen 2014-02-18 21:50:51 +0100
  • 8a0dbe969c GameLogic - Added filename to paramater when initiating a level, Also changed some string to wstrings Dennis Andersen 2014-02-18 21:24:21 +0100
  • 00fe2e6aa7 Camera swap Dander7BD 2014-02-18 17:42:00 +0100
  • a85b803e5c GameClientState Patch Dander7BD 2014-02-18 17:28:24 +0100
  • f2cbbfcf69 Merge remote-tracking branch 'origin/GameServer' into GameClient Dander7BD 2014-02-18 17:04:58 +0100
  • 02b467be18 const related edits in CustomNetProtocol Dander7BD 2014-02-18 17:04:27 +0100
  • a6f740e1f8 bunch of stuff Dander7BD 2014-02-18 16:44:38 +0100
  • 702e143e4b GameServer - Merged with GameLogic dean11 2014-02-18 16:40:30 +0100
  • 22f9daf0d8 Connection between server and client is stable dean11 2014-02-18 16:38:08 +0100
  • 95c70fe0b2 Merge branch 'GameClientGraphics' of https://github.com/dean11/Danbias into GameClientGraphics lindaandersson 2014-02-18 15:54:17 +0100
  • 611e75b505 Toggle wireframe with "T" lindaandersson 2014-02-18 15:54:09 +0100
  • 02312c53a4 changed debug models and tinted pink spheres lanariel 2014-02-18 15:41:59 +0100
  • a068ce7ddb Merge branch 'GameClientGraphics' of https://github.com/dean11/Danbias into GameClientGraphics lanariel 2014-02-18 15:21:01 +0100
  • 60d44d76d8 using new models lanariel 2014-02-18 15:20:53 +0100
  • e37dd606ba Merge remote-tracking branch 'origin/GameServer' into GameClient Dander7BD 2014-02-18 15:11:03 +0100
  • 996f660990 Fixes and bugtraps Dander7BD 2014-02-18 15:09:01 +0100
  • 3218e7b847 Connect to Dennis Dander7BD 2014-02-18 15:08:47 +0100
  • e8b0e75ed7 Render rigid body from lvl format lindaandersson 2014-02-18 15:07:40 +0100
  • 0971bc407e Small fix lanariel 2014-02-18 14:23:38 +0100
  • 86ef521abd LevelLoader - Added new CollisionGeometry_TriangleMesh. Pontus Fransson 2014-02-18 14:10:12 +0100
  • e72f2224be Removed Misc\Misc from additionalDependencies. Pontus Fransson 2014-02-18 14:09:18 +0100
  • be8b7537b5 GL - merging Erik Persson 2014-02-18 13:47:40 +0100
  • ded860c98b Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient lanariel 2014-02-18 13:43:41 +0100
  • 3f4038a12d Backface change and enable render wireframe lanariel 2014-02-18 13:43:32 +0100
  • c583543d36 Merge commit '0a70839211c9b1d87f2313817cb5a1000fe34ef0' into GameClient lindaandersson 2014-02-18 13:32:32 +0100
  • bfa748047f GL - added RigidBody data on client for debuging output lindaandersson 2014-02-18 13:31:36 +0100
  • c89ec7bbcd Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-18 13:12:33 +0100