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

99 Commits

Author SHA1 Message Date
William Moberg beb0967c3b Merge branch 'master' into OrderedSystemPipeline 
# Conflicts:
#	src/Game/Game.cpp
 2016-01-07 16:49:20 +01:00
verysecrethero 0e0a361a38 HotFix: Updated the CMakeList.txt in src/Game so it has the HealthSystem.cpp. This is needed otherwise the solution cant find that file 2016-01-07 16:36:18 +01:00
verysecrethero e52c0c9633 Now using the easier/cleaner way of getting/setting the HealthProperties 2016-01-07 15:27:39 +01:00
William Moberg c4642cc530 Merge branch 'master' into OrderedSystemPipeline 
# Conflicts:
#	include/Engine/Core/SystemPipeline.h
 2016-01-07 15:07:16 +01:00
verysecrethero a1ed79dfbf HealthSystemTest has been created. This runs a single test simple test with HealthEvents and HealthSystem. Also some minor changes 2016-01-07 14:53:31 +01:00
verysecrethero 638c236ceb HealthSystem tested and working. Also the 3 new PlayerEvents seems to work. TODO: a proper test in the testclass 2016-01-07 14:53:31 +01:00
verysecrethero f67f22c82d Added Healthrelated events and start of HealthSystem, also reverted the crash "fix" 2016-01-07 14:53:31 +01:00
William Moberg fa8775a72e Renamed vars and added some comments. 2016-01-07 10:28:18 +01:00
Jace 34cbbb3eb1 Fixed exit crash(es) 2016-01-06 11:20:16 +01:00
William Moberg de8461e257 SystemPipeline should update systems in order depending on input update priority in AddSystem. 2015-12-18 15:33:25 +01:00
stiffly 330f08b926 Merge remote-tracking branch 'origin/master' into Networking 
# Conflicts:
#	include/Game/PlayerSystem.h
#	src/Game/Game.cpp
#	src/Game/PlayerSystem.cpp
 2015-12-18 14:18:53 +01:00
stiffly a0255f1b31 Now uses config file to determine if client or server should be started. 2015-12-18 13:34:21 +01:00
stiffly a858dab8b6 Network not longer threaded 2015-12-18 12:00:14 +01:00
stiffly 5c1a93021b Client now reads address and port from config file. Default address is set to local host. 2015-12-18 11:22:13 +01:00
stiffly 076030a252 Fixes, mostly name changes 2015-12-17 17:28:43 +01:00
William Moberg 46ae2d39af Merge branch 'master' into OctTree 
# Conflicts:
#	src/Game/Game.cpp
 2015-12-17 16:44:01 +01:00
stiffly 50822d09fc Merge remote-tracking branch 'origin/master' into Networking 
# Conflicts:
#	src/Game/Game.cpp
 2015-12-17 14:10:02 +01:00
stiffly 4bb4e29515 More cleaning code 2015-12-17 13:23:15 +01:00
Jocke 6eebce05af Merge remote-tracking branch 'origin/Networking' into Networking 2015-12-16 14:58:36 +01:00
Jocke 58a9d38e26 Added a class that client and server inherits from. 
Class and server now share the same pointer i game.
You are now able to start a client and a server on the same computer.
 2015-12-16 14:56:53 +01:00
stiffly 50ccf96268 Movement code not buggy anymore. Also changed package to not allocate more data than needed. 2015-12-16 13:52:16 +01:00
William Moberg d10df6ae09 TriggerSystem implemented and working. 2015-12-16 12:22:15 +01:00
Jace 322aedaf72 Basic transformation widgets 2015-12-16 09:47:38 +01:00
stiffly 3f602c9d63 Test code 2015-12-15 17:55:08 +01:00
stiffly 082b3fd3df Removed old input events from client 2015-12-15 17:22:46 +01:00
William Moberg 04a01104b5 Merge branch 'master' into OctTree 
# Conflicts:
#	src/Engine/CMakeLists.txt
#	src/Game/Game.cpp
 2015-12-15 17:11:11 +01:00
stiffly 889e0bb3d3 Cleaned up PlayerSystem. Sets velocity to 0 every frame. 2015-12-15 16:35:09 +01:00
William Moberg e2417be8c7 Very simple CollisionSystem made, 'Z','Y' to toggle on/off. 2015-12-15 15:36:28 +01:00
stiffly 478c692315 Refactoring. Client and server has Update Loop that runs before any game logic each frame. 2015-12-15 14:53:56 +01:00
William Moberg 170610bcb1 Added a TriggerSystem, seems to work as intended. 2015-12-15 14:49:52 +01:00
stiffly 0a8a9e5099 Merge remote-tracking branch 'origin/master' into Networking 
# Conflicts:
#	src/Engine/Rendering/RenderState.cpp
#	src/Game/Game.cpp
 2015-12-15 11:50:01 +01:00
stiffly b698a0d36f WIP 
Adding models now crashes. Threading
Added a create player event that currently is not used.
 2015-12-15 11:21:46 +01:00
William Moberg 59095c2ce5 Started on CollisionSystem and TriggerSystem. Moved collision code to Collision folder. 2015-12-14 17:08:00 +01:00
stiffly 3f77da4a07 Merge remote-tracking branch 'origin/master' into Networking 
# Conflicts:
#	include/Game/Game.h
#	resources/DefaultConfig.ini
#	src/Game/Game.cpp
 2015-12-14 17:07:12 +01:00
Jace b66cf47ff0 Revert "Clearing raw input events from event broker to encourage use of input commands instead" 
This reverts commit 2e7e8d3546.
 2015-12-14 13:57:52 +01:00
Jace e5084e13ec Added EditorSystem 2015-12-14 13:57:51 +01:00
Jace 8a6030bf57 Added support for "Impure" systems, which only update once per frame and contain their own logic for manipulating the world, instead of relying on a single list of components. 2015-12-14 13:57:51 +01:00
Jace 7db1feac17 Added basic ImGui implementation 2015-12-14 13:57:45 +01:00
Jace d16cbe84f0 Merge remote-tracking branch 'origin/master' into Input 
# Conflicts:
#	src/Engine/Rendering/Renderer.cpp
 2015-12-14 13:40:22 +01:00
Jace a7ed455766 Merge branch 'master' into Input 2015-12-14 13:19:38 +01:00
Tleety d182e6c453 Merge remote-tracking branch 'origin/master' into RendererDecoupling 
# Conflicts:
#	src/Game/Game.cpp
 2015-12-14 13:16:56 +01:00
Jace e76a6b74a3 Merge branch 'master' of github.com:teamfisk/TacticalZ 
# Conflicts:
#	src/Game/Game.cpp
 2015-12-14 11:41:59 +01:00
Jace e82911cb8b Renderer FOV setting in Config.ini 2015-12-14 11:39:13 +01:00
Jace 30474b70df MouseInputHandler 2015-12-12 13:42:46 +01:00
Jace 2e7e8d3546 Clearing raw input events from event broker to encourage use of input commands instead 2015-12-12 13:42:35 +01:00
Jace 013f911ae2 Added MouseInputHandler and firstPersonInputController to aid in creation of first person movement. 2015-12-12 13:42:34 +01:00
Jace 35624008e7 InputProxy with a KeyboardInputHandler to translate keyboard keys to input commands. Input origins are bound to commands through the BindOrigin event, or through loading them from a config file. 2015-12-12 13:42:34 +01:00
Jace bffc97f310 Groundwork for input command proxy 2015-12-12 13:42:33 +01:00
Tleety 45b87ed6b1 ShaderProgram is now a Resource. 
All shaderprograms are now pointers and loaded with Resourcemanager.
 2015-12-11 16:53:46 +01:00
Tleety 53d5736420 Fixed a bugg with RenderState. 
Renderstate now also handles the Frambuffer binding.
 2015-12-11 16:07:12 +01:00