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

48 Commits

Author SHA1 Message Date
Jocke 24dada149f Cleaned up code in Client.h and Client.cpp. 
Moved ping code into Ping() function.
 2015-12-08 17:18:03 +01:00
Jocke d1880754f5 Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking 2015-12-08 16:42:32 +01:00
stiffly 27b44d2511 Input events for Client done. Instead of windows getAsyncKeyState(); 2015-12-08 16:41:48 +01:00
Jocke 94adaf8ae3 Added support for multiplayer. 
Reactored code, clumped together variables in PlayerDefinition.h.
Integrated server with entity system.
 2015-12-08 16:41:22 +01:00
stiffly 6dc5112c26 Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking 
# Conflicts:
#	include/Engine/Network/Client.h
#	src/Game/Game.cpp
 2015-12-08 16:15:50 +01:00
stiffly e92119c99e WIP trying to get Eventsystem to work in client. 2015-12-08 16:13:53 +01:00
Jocke c48c9e1f86 Added leak check when using windows (WinLeakCheck.h). 
Added server to project.
A server can now be started in the project.
 2015-12-08 13:54:18 +01:00
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
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
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
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
stiffly 48339934b6 Created skeleton for Server/Client logic. 2015-12-07 14:32:49 +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
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
sippeangelo d3d2e594fe Basic and working entity system with a really ugly test case 2015-12-03 15:07:35 +01:00
Tleety 64aa3a1064 rendering/util now added to CMakeLists.txt 2015-12-03 15:02:14 +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 1a963e823e Scale, Rotate and Translate widgets up and working 2015-12-01 17:46:09 +01:00
sippeangelo 6ca1977e78 Added Xerces dependency 2015-12-01 17:04:03 +01:00
sippeangelo 6ded34d160 Made Rendering/Util visible to CMake project 2015-12-01 17:04:03 +01:00
viktorljung 07d037ae57 Added Fly Camera and Vertex Colors 2015-12-01 15:56:26 +01:00
viktorljung 04d10bf7af Functioning basic renderer for models 2015-12-01 14:07:10 +01:00
viktorljung 1fdf312af4 Set up Renderer base and shader compilation 2015-12-01 10:35:59 +01:00
sippeangelo 793b2f44cc Proper GLFW message handling and pinkness! 2015-11-30 17:28:24 +01:00
sippeangelo 872879c013 Engine puzzle completed 2015-11-30 17:02:24 +01:00
sippeangelo 52278d7bc2 More CMake bullshit 2015-11-30 11:16:43 +01:00
sippeangelo 16eb70dd59 Added Model and related classes 2015-11-24 10:55:54 +01:00
sippeangelo 34e095b54b Added Config File resource 2015-11-24 10:38:10 +01:00
sippeangelo b61642e4e8 Added Resource Manager 2015-11-24 10:37:58 +01:00
sippeangelo 5f9dce4303 Added Input 2015-11-24 10:37:50 +01:00
sippeangelo 0a1f0d96db Added Event Broker 2015-11-24 10:37:21 +01:00
sippeangelo 059dee76ed Initial CMake bullshit 2015-11-24 10:36:49 +01:00
sippeangelo 381e0fbbab Added utility stuff 2015-11-20 17:17:29 +01:00
sippeangelo 63674946ca Initial directory structure 2015-11-20 15:01:37 +01:00