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

84 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jocke 8f55e90d2d Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking 
# Conflicts:
#	include/Game/Game.h
 2015-12-08 11:11:12 +01:00
Jocke b5a010a517 Network now runs on it's own thread. 
Network now sends Disconnect message when game is terminated.
 2015-12-08 11:02:40 +01:00
stiffly ee41721a75 Merge remote-tracking branch 'origin/master' into Networking 2015-12-08 10:41:04 +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
stiffly 2c993e82d6 Added the old prototype logic to Client.h. Can now communicate with a external server(on prototype). 2015-12-07 16:55:12 +01:00
stiffly cbbb7deaea Copy pasta error. Corrected #ifndef 2015-12-07 16:53:33 +01:00
stiffly de5bdef58c Rectangle definition conflicted with a definition included by <boost/asio.hpp>. 2015-12-07 16:52: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 d8d63f804a Added utility headers for network interface. 2015-12-07 16:11:27 +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
sippeangelo 5a0a60821f Merge branch 'master' of github.com:teamfisk/TacticalZ 2015-12-02 15:03:01 +01:00
sippeangelo 8aa72735e7 Fixed Tests running the game when it really shouldn't. 2015-12-02 15:02:18 +01:00