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

86 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Teejoon bc4cc5db54 Changed how we get skeletons. Made so that we could get the bind pose for each skeleton in the scene 2015-12-18 10:03:00 +01:00
antc13 67017fcaf4 Stepping through the timeline. 2015-12-16 11:33:42 +01:00
antc13 498afb3a5e Merge branch 'MayaExporter' of https://github.com/teamfisk/TacticalZ into MayaExporter 
# Conflicts:
#	tools/MayaExporter/MayaExporter/Menu.h
 2015-12-15 15:41:18 +01:00
antc13 4e535c1102 File Writer WIP. Rework soon™ 2015-12-15 15:24:46 +01:00
FakeShemp 1689370356 Export the skeletons 
Not really tested though
 2015-12-15 11:49:59 +01:00
antc13 60b3ce89b2 Skeleton/Joints WIP 2015-12-14 12:59:54 +01:00
antc13 a22d086e60 Tested some of the Material Code. Seems to work. The project should now be following the code standard properly (hopefully). 2015-12-10 11:18:34 +01:00
FakeShemp 74c1beed20 gitignore 2015-12-09 12:03:01 +01:00
FakeShemp c8cb0ee939 Grab all materials 2015-12-09 11:58:49 +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
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
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
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
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
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
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
viktorljung 0f33089039 Merge remote-tracking branch 'origin/master' into Rendering 2015-12-03 14:59:45 +01:00
viktorljung 983ca485f5 Picking now returning world position 2015-12-03 14:50:14 +01:00
viktorljung 18b63c7ef3 Added 3D picking of models to renderer 2015-12-02 18:00:11 +01:00
viktorljung eb50a747fa Added Hash for Vec2 Unordered_Map 2015-12-02 17:59:21 +01:00
sippeangelo c7430a9338 Fixed ComponentWrapper string scope error 2015-12-02 15:37:20 +01:00
sippeangelo 91f8b4359b Fixed Tests not including dependencies properly 2015-12-02 15:25:27 +01:00
sippeangelo 61b7aa6b3d Merge branch 'master' into ecs 2015-12-02 15:07:55 +01:00
sippeangelo b3e68c6c34 Implemented ComponentPool and initial tests for it 2015-12-02 15:07:48 +01:00
sippeangelo f65b7d591c Fixed Tests running the game when it really shouldn't. 2015-12-02 15:03:18 +01:00