BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 06f56d13d1 added some octTreeTest tests and a few comments in OctTree verysecrethero 2015-12-08 11:14:01 +01:00
  • 8f55e90d2d Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking Jocke 2015-12-08 11:11:12 +01:00
  • b5a010a517 Network now runs on it's own thread. Jocke 2015-12-08 11:02:40 +01:00
  • b87e543420 Merge branch 'master' into OctTree William Moberg 2015-12-08 10:47:27 +01:00
  • fa3816e55d Fixed flawed unit test. William Moberg 2015-12-08 10:44:12 +01:00
  • ee41721a75 Merge remote-tracking branch 'origin/master' into Networking stiffly 2015-12-08 10:41:04 +01:00
  • ed8d0fb608 Merge pull request #6 from teamfisk/Rendering Jace 2015-12-08 10:39:54 +01:00
  • c717dd7049 Removed sprite RenderQueue and moved FrameBuffer to rendering instead of rendering/util viktorljung 2015-12-08 10:37:24 +01:00
  • d556f964e6 merge fixes viktorljung 2015-12-08 10:15:12 +01:00
  • e7427bf3ad Merge remote-tracking branch 'origin/master' into Rendering viktorljung 2015-12-08 10:15:00 +01:00
  • 648ba502bb Added small test for OctTree. William Moberg 2015-12-07 17:27:57 +01:00
  • 9e1a4b83ae Linked picking to entities viktorljung 2015-12-07 17:26:42 +01:00
  • 2c993e82d6 Added the old prototype logic to Client.h. Can now communicate with a external server(on prototype). stiffly 2015-12-07 16:55:12 +01:00
  • cbbb7deaea Copy pasta error. Corrected #ifndef stiffly 2015-12-07 16:53:33 +01:00
  • de5bdef58c Rectangle definition conflicted with a definition included by <boost/asio.hpp>. stiffly 2015-12-07 16:52:42 +01:00
  • 9c589a0dc6 Added support for color tinting viktorljung 2015-12-07 16:33:03 +01:00
  • 000ad6358f Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree William Moberg 2015-12-07 16:26:49 +01:00
  • 04a8eeebe8 Added test get methods and some comments. William Moberg 2015-12-07 16:25:01 +01:00
  • 1df63aecd5 Added a RenderQueueFactory that produces a RenderQueueCollection for the Renderer to use. viktorljung 2015-12-07 16:24:34 +01:00
  • d8d63f804a Added utility headers for network interface. stiffly 2015-12-07 16:11:27 +01:00
  • 955c9ce534 Removed superfluous function declaration. William Moberg 2015-12-07 16:00:34 +01:00
  • e8d23f3b3f Added AABBVsAABB function. William Moberg 2015-12-07 15:59:41 +01:00
  • 3bfd08e780 Adapted to folder name change in the code. Networking -> Network stiffly 2015-12-07 15:48:17 +01:00
  • 9b830526f8 Merge pull request #4 from teamfisk/ecs Viktor Ljung 2015-12-07 15:25:39 +01:00
  • 604a7791af Merge pull request #5 from teamfisk/Networking Jace 2015-12-07 15:23:11 +01:00
  • 6991a2be26 Renamed Networking -> Network sippeangelo 2015-12-07 15:22:26 +01:00
  • dbac9a9669 Added filter to CMakeLists.txt. stiffly 2015-12-07 15:03:03 +01:00
  • 83e2429c36 Maya Exporter WIP antc13 2015-12-07 14:44:34 +01:00
  • 48339934b6 Created skeleton for Server/Client logic. stiffly 2015-12-07 14:32:49 +01:00
  • 89aa8c44b0 Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree verysecrethero 2015-12-07 10:03:55 +01:00
  • f0e407bec2 Started on OctTreeTest (Merging with OctTree) verysecrethero 2015-12-07 10:03:36 +01:00
  • 7f88a8b2d2 Merge remote-tracking branch 'origin/master' into ecs sippeangelo 2015-12-04 09:46:30 +01:00
  • 25258f7e78 Better test for World and ECS sippeangelo 2015-12-04 09:45:50 +01:00
  • aeb6c39603 Created ComponentWrapperFactory to make test mocking easier and manual component registration a little less painful sippeangelo 2015-12-03 19:07:33 +01:00
  • 8e21b1fe35 Added ray collision detection in leaf nodes. Fixed possible bug in OctTree::AddBox William Moberg 2015-12-03 19:25:40 +01:00
  • 96a10ada38 fixed so the picking works with the new framebuffer class viktorljung 2015-12-03 19:20:30 +01:00
  • a82c7c1e3b Merge branch 'Rendering' of github.com:teamfisk/TacticalZ into Rendering viktorljung 2015-12-03 19:06:24 +01:00
  • dc8cc92ec2 Added a GenerateTexture function viktorljung 2015-12-03 19:04:57 +01:00
  • 175762777d Merge pull request #3 from teamfisk/Rendering Jace 2015-12-03 18:39:53 +01:00
  • aaa6b6ef20 Added FrameBuffer wrapper class viktorljung 2015-12-03 18:32:01 +01:00
  • 45a48bbbe5 Merge remote-tracking branch 'origin/master' into Rendering Tleety 2015-12-03 18:15:56 +01:00
  • 1c06c06816 Added a ScreenCoords class with some util functions to clean up the Renderer class. Tleety 2015-12-03 18:14:52 +01:00
  • e950dd9206 Merge pull request #2 from teamfisk/ecs Tleety 2015-12-03 18:05:20 +01:00
  • 17133b316a Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree verysecrethero 2015-12-03 17:31:07 +01:00
  • 28a290600b BOOST MEM LEAK VS VISUAL STUDIO MEM LEAKS COMMENTED TESTS verysecrethero 2015-12-03 17:30:12 +01:00
  • af5b3a9302 Fixed wrong paths and added an outDistance to RayVsAABB. William Moberg 2015-12-03 17:24:53 +01:00
  • abb61d2cd6 Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree William Moberg 2015-12-03 17:11:35 +01:00
  • 2f13f5da7a Relocated AABB and Ray in Collision.h to their own files. Started implementation on OctTree. William Moberg 2015-12-03 17:03:27 +01:00
  • 9fb8af8491 Merge branch 'master' into ecs sippeangelo 2015-12-03 16:55:32 +01:00
  • 032b384f3f Created framework for a hardcoded world for TESTING PURPOSES sippeangelo 2015-12-03 16:45:03 +01:00
  • 6a24ed534a fixup! fixup! Added 3D picking of models to renderer viktorljung 2015-12-03 16:43:08 +01:00
  • 4dc658ff65 fixup! Added 3D picking of models to renderer viktorljung 2015-12-03 16:33:05 +01:00
  • d3d2e594fe Basic and working entity system with a really ugly test case sippeangelo 2015-12-03 15:07:35 +01:00
  • 9654140fb2 Merge branch 'Rendering' of github.com:teamfisk/TacticalZ into Rendering viktorljung 2015-12-03 15:03:52 +01:00
  • 64aa3a1064 rendering/util now added to CMakeLists.txt Tleety 2015-12-03 15:02:14 +01:00
  • 0f33089039 Merge remote-tracking branch 'origin/master' into Rendering viktorljung 2015-12-03 14:59:45 +01:00
  • 983ca485f5 Picking now returning world position viktorljung 2015-12-03 14:50:14 +01:00
  • 18b63c7ef3 Added 3D picking of models to renderer viktorljung 2015-12-02 18:00:11 +01:00
  • eb50a747fa Added Hash for Vec2 Unordered_Map viktorljung 2015-12-02 17:59:21 +01:00
  • 464650c370 more tests added verysecrethero 2015-12-02 16:31:39 +01:00
  • af294f78b7 czdxvxdfvxvxvc verysecrethero 2015-12-02 16:26:30 +01:00
  • c840183467 Merge remote-tracking branch 'origin/master' into OctTree verysecrethero 2015-12-02 15:43:51 +01:00
  • c7430a9338 Fixed ComponentWrapper string scope error sippeangelo 2015-12-02 15:37:20 +01:00
  • 91f8b4359b Fixed Tests not including dependencies properly sippeangelo 2015-12-02 15:25:27 +01:00
  • 1f99d46a8d Merge branch 'master' into OctTree verysecrethero 2015-12-02 15:15:05 +01:00
  • 61b7aa6b3d Merge branch 'master' into ecs sippeangelo 2015-12-02 15:07:55 +01:00
  • b3e68c6c34 Implemented ComponentPool and initial tests for it sippeangelo 2015-12-02 15:07:48 +01:00
  • fd99562c7a yrryr567yry567 verysecrethero 2015-12-02 15:03:55 +01:00
  • f65b7d591c Fixed Tests running the game when it really shouldn't. sippeangelo 2015-12-02 15:02:18 +01:00
  • 5a0a60821f Merge branch 'master' of github.com:teamfisk/TacticalZ sippeangelo 2015-12-02 15:03:01 +01:00
  • 8aa72735e7 Fixed Tests running the game when it really shouldn't. sippeangelo 2015-12-02 15:02:18 +01:00
  • c698149bdd Added Ray, AABB structs, and basic rayVsAABB test function. William Moberg 2015-12-02 14:24:21 +01:00
  • fa0ace8c68 Added empty OctTree files. William Moberg 2015-12-02 11:32:56 +01:00
  • 1d19c6901e Added collision files. William Moberg 2015-12-02 11:18:52 +01:00
  • 1a963e823e Scale, Rotate and Translate widgets up and working viktorljung 2015-12-01 17:46:09 +01:00
  • 75dcea40f2 Log warning when memory is exceeded in MemoryPool. William Moberg 2015-12-01 17:29:26 +01:00
  • a5affd2dc2 Added barebones ECS prototype sippeangelo 2015-12-01 16:47:54 +01:00
  • 6ca1977e78 Added Xerces dependency sippeangelo 2015-12-01 10:42:08 +01:00
  • 521de59286 Made deploy create a bin folder so it doesn't fail if it's missing sippeangelo 2015-12-01 11:21:33 +01:00
  • 24ef915248 Simplified CMake for Game sippeangelo 2015-12-01 10:40:33 +01:00
  • 6ded34d160 Made Rendering/Util visible to CMake project sippeangelo 2015-12-01 09:51:15 +01:00
  • c147f17c11 Added MemoryPool and ObjectPool to project. William Moberg 2015-12-01 16:03:07 +01:00
  • 07d037ae57 Added Fly Camera and Vertex Colors viktorljung 2015-12-01 15:56:26 +01:00
  • 04d10bf7af Functioning basic renderer for models viktorljung 2015-12-01 14:07:10 +01:00
  • ae759654c1 Made deploy create a bin folder so it doesn't fail if it's missing sippeangelo 2015-12-01 11:21:33 +01:00
  • cf349870de Simplified CMake for Game sippeangelo 2015-12-01 10:40:33 +01:00
  • 1fdf312af4 Set up Renderer base and shader compilation viktorljung 2015-12-01 10:35:59 +01:00
  • 798e42999d Deploy now linking Shaders correctly viktorljung 2015-12-01 10:34:53 +01:00
  • b4b64abc1e Made Rendering/Util visible to CMake project sippeangelo 2015-12-01 09:51:15 +01:00
  • 793b2f44cc Proper GLFW message handling and pinkness! sippeangelo 2015-11-30 17:28:24 +01:00
  • 872879c013 Engine puzzle completed sippeangelo 2015-11-30 17:02:24 +01:00
  • 52278d7bc2 More CMake bullshit sippeangelo 2015-11-30 11:16:43 +01:00
  • 8419d2e7b9 Updated schema with custom type names to better match their C++ counterparts sippeangelo 2015-11-26 16:09:11 +01:00
  • ac05975fd5 Updated schema sippeangelo 2015-11-25 18:04:11 +01:00
  • 55276c0bd2 Made path to json file relative sippeangelo 2015-11-25 12:53:50 +01:00
  • a854570bce Edit the path to the json_key in the script! antc13 2015-11-25 09:54:37 +01:00
  • 6cb4a47b19 Added libraries required for model import sippeangelo 2015-11-24 11:35:38 +01:00
  • 16eb70dd59 Added Model and related classes sippeangelo 2015-11-24 10:55:54 +01:00
  • 34e095b54b Added Config File resource sippeangelo 2015-11-24 10:38:10 +01:00
  • b61642e4e8 Added Resource Manager sippeangelo 2015-11-24 10:37:58 +01:00