Commit Graph

  • 045cfe28fe Renamed Utilities-InlineImpl.h to Utilities-Impl.h Dander7BD 2013-11-28 15:45:09 +0100
  • 0785e54dfd Removed .orig files after merge dean11 2013-11-28 15:19:52 +0100
  • 6e71b6ac54 Fixed merging errors dean11 2013-11-28 15:17:25 +0100
  • cc4835a97b Merge with Physics branch dean11 2013-11-28 15:09:09 +0100
  • d241298308 merging MiscBranch into Physics with conflict fixes Dander7BD 2013-11-28 14:52:13 +0100
  • 9bf84cdc65 Stable Graphics, hard coded texture read in ObjReader.ToModel lanariel 2013-11-28 14:34:52 +0100
  • 4672984b51 Merge remote-tracking branch 'origin/Octree' into Physics Robin Engman 2013-11-28 14:19:11 +0100
  • 632d412f9c Fixed sample and added visit. Robin Engman 2013-11-28 14:18:44 +0100
  • 35f66da760 Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics Robin Engman 2013-11-28 13:43:38 +0100
  • d08644e8e1 Added a force reload feture in resource loading dean11 2013-11-28 13:43:11 +0100
  • f379ed49e5 inertiaTensor removed from API::SphericalBodyDescription Dander7BD 2013-11-28 12:18:06 +0100
  • 2928e08252 SphericalRigidBody factory done Dander7BD 2013-11-28 12:13:14 +0100
  • 89fd71fb02 SimpleRigidBody factory done Dander7BD 2013-11-28 11:58:46 +0100
  • 3a3d6fb151 Added comparison operators to UniquePointer and UniqueArray Dander7BD 2013-11-28 11:15:25 +0100
  • b06a03a543 Improved Collision Event Subscription Dander7BD 2013-11-28 10:26:29 +0100
  • 39c54f4816 Moved Octree.h into the Implementation Filter Dander7BD 2013-11-28 10:24:32 +0100
  • 64565b50de Merge remote-tracking branch 'origin/GameLogicBranch' into Physics Dander7BD 2013-11-28 11:59:15 +0100
  • 3a6cb98b08 SimpleRigidBody factory done Dander7BD 2013-11-28 11:58:46 +0100
  • 5ab1c39e3a GL stable - running from DanBiasGame Linda Andersson 2013-11-28 11:46:20 +0100
  • 92c20b368b merge with GL Linda Andersson 2013-11-28 11:31:00 +0100
  • ac37ff90de Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch Linda Andersson 2013-11-28 11:27:02 +0100
  • 42948a1412 collision and refrence managers updated Erik Persson 2013-11-28 11:23:11 +0100
  • bb7c635223 unstageing graphics Linda Andersson 2013-11-28 11:20:46 +0100
  • 6d12045df9 Merge remote-tracking branch 'origin/Physics' into Octree Robin Engman 2013-11-28 11:20:33 +0100
  • 28dc57cf38 Added basic functionality for container Robin Engman 2013-11-28 11:18:07 +0100
  • 23d3af21c6 Added comparison operators to UniquePointer and UniqueArray Dander7BD 2013-11-28 11:15:25 +0100
  • ecbb606544 Added basic functionality for container. Robin Engman 2013-11-28 11:14:24 +0100
  • 4cab44063d dll problems Linda Andersson 2013-11-28 10:40:23 +0100
  • 07e3aa1697 Improved Collision Event Subscription Dander7BD 2013-11-28 10:26:29 +0100
  • 3a444aaae8 Moved Octree.h into the Implementation Filter Dander7BD 2013-11-28 10:24:32 +0100
  • 9bddfc9ffa changed collision manager Erik Persson 2013-11-28 09:26:29 +0100
  • 0c40ca1be5 Merge branch 'Network' of https://github.com/dean11/Danbias into Network Pontus Fransson 2013-11-28 08:52:22 +0100
  • 00e02b6909 Removed OysterMath from OysterNetworkClient Pontus Fransson 2013-11-28 08:52:11 +0100
  • a59cd54688 enum type naming fixed continued. Sam Mario Svensson 2013-11-28 08:51:21 +0100
  • 0feb4dff7e Merge branch 'Network' of https://github.com/dean11/Danbias into Network Pontus Fransson 2013-11-28 08:41:24 +0100
  • b3ec2f3aa1 fix Erik Persson 2013-11-28 08:41:20 +0100
  • 14eee7d2da Merge branch 'MiscBranch' of https://github.com/dean11/Danbias into Network Pontus Fransson 2013-11-28 08:40:40 +0100
  • d29046652e enum type naming fixed Sam Mario Svensson 2013-11-28 08:40:08 +0100
  • 899e833fca Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch Erik Persson 2013-11-28 08:37:56 +0100
  • acd8681489 asd Erik Persson 2013-11-28 08:33:29 +0100
  • 5eec570768 Added an atomic<int> to the reference counter for thread saftey dean11 2013-11-27 22:39:49 +0100
  • fe7fd6b0b3 Fixed bugs in the threading wrapper dean11 2013-11-27 21:47:32 +0100
  • 972cfa0d39 Fixed bugs with custom loading dean11 2013-11-27 21:12:37 +0100
  • 01515a4d2d merge with physics Linda Andersson 2013-11-27 16:21:57 +0100
  • c06a53addb Merge remote-tracking branch 'origin/Physics' into GameLogicBranch Linda Andersson 2013-11-27 16:18:28 +0100
  • 1a5d1217a3 GL could draw an object but now adding DanBiasGame - problems with dll! Linda Andersson 2013-11-27 16:17:47 +0100
  • 8f6ca79e6b Unstable RenderTexture lanariel 2013-11-27 15:26:29 +0100
  • 6ba10d48c6 Some matrix constructors made explicit Dander7BD 2013-11-27 15:24:09 +0100
  • 36741de19b Evil Incompotent Compiler fix Dander7BD 2013-11-27 15:20:29 +0100
  • 6e24acea2b Listener's Accept() is now threaded. Pontus Fransson 2013-11-27 14:33:08 +0100
  • fd1ac35c45 Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch Linda Andersson 2013-11-27 12:01:01 +0100
  • fb3ae57bbe GL: key input Linda Andersson 2013-11-27 12:00:44 +0100
  • 43b111f0d3 Pull MiscBranch Pontus Fransson 2013-11-27 11:28:11 +0100
  • f02a67b9b1 Merge branch 'MiscBranch' of https://github.com/dean11/Danbias into Network Pontus Fransson 2013-11-27 11:26:54 +0100
  • aeddc032d9 Merge branch 'Network' of https://github.com/dean11/Danbias into Network Pontus Fransson 2013-11-27 11:06:03 +0100
  • 214e29e906 OysterByte Pontus Fransson 2013-11-27 11:01:22 +0100
  • 2ce74e74cc fix Erik Persson 2013-11-27 09:14:44 +0100
  • 61777e23df Merge remote-tracking branch 'origin/Graphics' into GameLogicBranch Erik Persson 2013-11-27 09:12:21 +0100
  • 4b6cdab17b Stable Rendering lanariel 2013-11-27 08:22:20 +0100
  • 48c812b033 Forgot to follow coding standard... dean11 2013-11-26 21:51:40 +0100
  • e4904870b3 Added a threading wrapper with basic functionality that needs real testing dean11 2013-11-26 21:08:34 +0100
  • f9d9479dad Stable Dll read, unstable Pos lanariel 2013-11-26 15:33:05 +0100
  • f6ade9e4fd ErrorMessages everywhere! Sam Mario Svensson 2013-11-26 13:45:03 +0100
  • 2de2ef9cd0 Pre merge Commit lanariel 2013-11-26 13:44:58 +0100
  • c2484a363d Merge branch 'Physics' of https://github.com/dean11/Danbias into Graphics lanariel 2013-11-26 13:43:33 +0100
  • 62b1c68479 Created SphericalRigidBody Dander7BD 2013-11-26 13:28:33 +0100
  • 29362c8c60 Added more API & ICustomBody methods Dander7BD 2013-11-26 13:27:34 +0100
  • 1f27336b3f Added filename paramater in custom load function dean11 2013-11-26 12:09:38 +0100
  • 5e8e106327 add simple input class for testing Linda Andersson 2013-11-26 11:33:16 +0100
  • 97e92f8516 GL: debug fix Erik Persson 2013-11-26 11:32:00 +0100
  • d87e643777 lite saker + debug fönster Erik Persson 2013-11-26 11:30:49 +0100
  • f3be9f03a3 Merge branch 'MiscBranch' of https://github.com/dean11/Danbias into Graphics lanariel 2013-11-26 11:15:19 +0100
  • e5cef4895e Added support for custom loading, unloading and reloading dean11 2013-11-26 10:55:51 +0100
  • 2890c2a9ea Added beginning of Octree class. Robin Engman 2013-11-26 10:21:20 +0100
  • 5cc6ff81b5 Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch Erik Persson 2013-11-26 09:26:04 +0100
  • 2859588d20 added collisionManager Erik Persson 2013-11-26 09:19:59 +0100
  • abfd3116ca Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch Linda Andersson 2013-11-26 09:17:25 +0100
  • f78027a1cf dll - working fix in unique pointer and array - missing copy constructor Linda Andersson 2013-11-26 09:16:51 +0100
  • 973aadac2d Engine tweaks + DefferedVertexDefinition lanariel 2013-11-26 09:09:35 +0100
  • 220f1da8b6 added GameMode class to level Erik Persson 2013-11-26 08:56:31 +0100
  • 45c145439a Fixade crash och flyttade initsockets, shutdownsockets. Pontus Fransson 2013-11-25 20:27:23 +0100
  • 6b57815bb8 Merge branch 'Network' of https://github.com/dean11/Danbias into Network Pontus Fransson 2013-11-25 19:05:28 +0100
  • caabb6702e Fixed code standard, Added packing functions Pontus Fransson 2013-11-25 19:00:33 +0100
  • 26e5fde8b0 Some PhysicsAPI implementations Dander7BD 2013-11-25 16:57:38 +0100
  • a869771ffa Simple Rigid Body implementation Dander7BD 2013-11-25 16:35:56 +0100
  • 311beaac14 ICollideable edited Dander7BD 2013-11-25 14:22:38 +0100
  • ca5e578af5 reconstruction in connection. Sam Mario Svensson 2013-11-25 14:03:32 +0100
  • bc988eff0d ICustomBody Documented Dander7BD 2013-11-25 13:46:05 +0100
  • e2c90a467b reference manager for physics communication Erik Persson 2013-11-25 12:51:58 +0100
  • 0db45bd63f game_dll_usage Linda Andersson 2013-11-25 12:36:25 +0100
  • 241d1b2d3d Merge remote-tracking branch 'origin/Physics' into GameLogicBranch Linda Andersson 2013-11-25 12:34:13 +0100
  • de9a1cae56 Game_Dll_export Linda Andersson 2013-11-25 12:33:27 +0100
  • bf3dcd088b Moar dll fixes for Physics Dander7BD 2013-11-25 12:21:44 +0100
  • 82b8ef7b05 Fixed connection split up connect function and added initiateClient() Sam Mario Svensson 2013-11-25 12:14:01 +0100
  • d600668df7 Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch Linda Andersson 2013-11-25 12:05:23 +0100
  • 0bee758848 Merge remote-tracking branch 'origin/Physics' into GameLogicBranch Dander7BD 2013-11-25 12:04:07 +0100
  • cc67d227ab Dll fixes Dander7BD 2013-11-25 12:03:41 +0100
  • 956fbc21e7 Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch Linda Andersson 2013-11-25 11:57:07 +0100
  • 8ded483442 Merge remote-tracking branch 'origin/Physics' into GameLogicBranch Dander7BD 2013-11-25 11:56:25 +0100
  • 46abe2c8c6 namespace Physics::Error removed Dander7BD 2013-11-25 11:55:58 +0100