BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
103 Commits 116 Branches 0 Tags
75402b0f938eb166c5080c37cc7bb2df8750ec1b
Commit Graph

103 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
verysecrethero 75402b0f93 Working on OctTree tests 2015-12-09 10:08:08 +01:00
verysecrethero 7ac2aaef15 Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree 
# Conflicts:
#	src/Engine/Core/OctTree.cpp
 2015-12-08 11:16:34 +01:00
verysecrethero 06f56d13d1 added some octTreeTest tests and a few comments in OctTree 2015-12-08 11:14:01 +01:00
William Moberg b87e543420 Merge branch 'master' into OctTree 2015-12-08 10:47:27 +01:00
William Moberg fa3816e55d Fixed flawed unit test. 2015-12-08 10:44:12 +01:00
Jace ed8d0fb608 Merge pull request #6 from teamfisk/Rendering 
Rendering
 2015-12-08 10:39:54 +01:00
viktorljung c717dd7049 Removed sprite RenderQueue and moved FrameBuffer to rendering instead of rendering/util 2015-12-08 10:37:24 +01:00
viktorljung d556f964e6 merge fixes 2015-12-08 10:15:12 +01:00
viktorljung e7427bf3ad Merge remote-tracking branch 'origin/master' into Rendering 
# Conflicts:
#	include/Game/HardcodedTestWorld.h
 2015-12-08 10:15:00 +01:00
William Moberg 648ba502bb Added small test for OctTree. 2015-12-07 17:27:57 +01:00
viktorljung 9e1a4b83ae Linked picking to entities 2015-12-07 17:26:42 +01:00
viktorljung 9c589a0dc6 Added support for color tinting 2015-12-07 16:33:03 +01:00
William Moberg 000ad6358f Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree 2015-12-07 16:26:49 +01:00
William Moberg 04a8eeebe8 Added test get methods and some comments. 2015-12-07 16:25:01 +01:00
viktorljung 1df63aecd5 Added a RenderQueueFactory that produces a RenderQueueCollection for the Renderer to use. 
Still needs more work
 2015-12-07 16:24:34 +01:00
William Moberg 955c9ce534 Removed superfluous function declaration. 2015-12-07 16:00:34 +01:00
William Moberg e8d23f3b3f Added AABBVsAABB function. 2015-12-07 15:59:41 +01:00
stiffly 3bfd08e780 Adapted to folder name change in the code. Networking -> Network 2015-12-07 15:48:17 +01:00
Viktor Ljung 9b830526f8 Merge pull request #4 from teamfisk/ecs 
Tests for ECS
 2015-12-07 15:25:39 +01:00
Jace 604a7791af Merge pull request #5 from teamfisk/Networking 
Networking
 2015-12-07 15:23:11 +01:00
sippeangelo 6991a2be26 Renamed Networking -> Network 2015-12-07 15:22:26 +01:00
stiffly dbac9a9669 Added filter to CMakeLists.txt. 2015-12-07 15:03:03 +01:00
antc13 83e2429c36 Maya Exporter WIP 2015-12-07 14:44:34 +01:00
stiffly 48339934b6 Created skeleton for Server/Client logic. 2015-12-07 14:32:49 +01:00
verysecrethero 89aa8c44b0 Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree 2015-12-07 10:03:55 +01:00
verysecrethero f0e407bec2 Started on OctTreeTest (Merging with OctTree) 2015-12-07 10:03:36 +01:00
sippeangelo 7f88a8b2d2 Merge remote-tracking branch 'origin/master' into ecs 2015-12-04 09:46:30 +01:00
sippeangelo 25258f7e78 Better test for World and ECS 2015-12-04 09:45:50 +01:00
sippeangelo aeb6c39603 Created ComponentWrapperFactory to make test mocking easier and manual component registration a little less painful 2015-12-03 19:31:55 +01:00
William Moberg 8e21b1fe35 Added ray collision detection in leaf nodes. Fixed possible bug in OctTree::AddBox 2015-12-03 19:25:40 +01:00
viktorljung 96a10ada38 fixed so the picking works with the new framebuffer class 2015-12-03 19:20:30 +01:00
viktorljung a82c7c1e3b Merge branch 'Rendering' of github.com:teamfisk/TacticalZ into Rendering 
# Conflicts:
#	include/Engine/Rendering/Renderer.h
#	src/Engine/Rendering/Renderer.cpp
 2015-12-03 19:06:24 +01:00
viktorljung dc8cc92ec2 Added a GenerateTexture function 2015-12-03 19:04:57 +01:00
Jace 175762777d Merge pull request #3 from teamfisk/Rendering 
Basic 3D picking and forward rendering
 2015-12-03 18:39:53 +01:00
viktorljung aaa6b6ef20 Added FrameBuffer wrapper class 2015-12-03 18:32:01 +01:00
Tleety 45a48bbbe5 Merge remote-tracking branch 'origin/master' into Rendering 2015-12-03 18:15:56 +01:00
Tleety 1c06c06816 Added a ScreenCoords class with some util functions to clean up the Renderer class. 2015-12-03 18:14:52 +01:00
Tleety e950dd9206 Merge pull request #2 from teamfisk/ecs 
Barebones Entity Component System
 2015-12-03 18:05:20 +01:00
verysecrethero 17133b316a Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree 2015-12-03 17:31:07 +01:00
verysecrethero 28a290600b BOOST MEM LEAK VS VISUAL STUDIO MEM LEAKS COMMENTED TESTS 2015-12-03 17:30:12 +01:00
William Moberg af5b3a9302 Fixed wrong paths and added an outDistance to RayVsAABB. 2015-12-03 17:24:53 +01:00
William Moberg abb61d2cd6 Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree 
# Conflicts:
#	include/Engine/Core/Collision.h
#	src/Engine/Core/Collision.cpp
 2015-12-03 17:11:35 +01:00
William Moberg 2f13f5da7a Relocated AABB and Ray in Collision.h to their own files. Started implementation on OctTree. 2015-12-03 17:03:27 +01:00
sippeangelo 9fb8af8491 Merge branch 'master' into ecs 2015-12-03 16:55:32 +01:00
sippeangelo 032b384f3f Created framework for a hardcoded world for TESTING PURPOSES 2015-12-03 16:45:03 +01:00
viktorljung 6a24ed534a fixup! fixup! Added 3D picking of models to renderer 2015-12-03 16:43:08 +01:00
viktorljung 4dc658ff65 fixup! Added 3D picking of models to renderer 2015-12-03 16:36:08 +01:00
sippeangelo d3d2e594fe Basic and working entity system with a really ugly test case 2015-12-03 15:07:35 +01:00
viktorljung 9654140fb2 Merge branch 'Rendering' of github.com:teamfisk/TacticalZ into Rendering 
# Conflicts:
#	src/Engine/CMakeLists.txt
 2015-12-03 15:03:52 +01:00
Tleety 64aa3a1064 rendering/util now added to CMakeLists.txt 2015-12-03 15:02:14 +01:00