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

238 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jace af14d60493 Added MouseScroll event to input manager 2015-12-14 13:57:49 +01:00
Jace 0465fdb16d Added ImGui for compilation 2015-12-14 13:57:49 +01:00
Jace 0c6ac1e060 Added ImGui to README 2015-12-14 13:57:48 +01:00
Jace 7db1feac17 Added basic ImGui implementation 2015-12-14 13:57:45 +01:00
Jace 653b4689b5 Added KeyboardChar event for keyboard text input 2015-12-14 13:56:24 +01:00
Adam Byléhn 6723e71fee Merge pull request #14 from teamfisk/Input 
Input
 2015-12-14 13:55:11 +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 95ce024bb6 Merge pull request #13 from teamfisk/RendererDecoupling 
Renderer decoupling
 2015-12-14 13:39:20 +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
verysecrethero bf08ffe392 Added InputManagerTest 2015-12-14 11:02:23 +01:00
verysecrethero 5f5cab1171 Added Tests for ResourceManager 2015-12-14 10:55:49 +01:00
Jace 30474b70df MouseInputHandler 2015-12-12 13:42:46 +01:00
Jace 03e226ffea Refactored InputProxy to gracefully handle cases where multiple origins send the same command 2015-12-12 13:42:35 +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 5d46a10a4e Added GetAll function to config file that returns a list of all top level keys in a config file 2015-12-12 13:42:33 +01:00
Jace 784a04b8ad Fixed bug in config file overriding. Previously it was silently overwriting the whole default config and relied on hardcoded values for defaults. 2015-12-12 13:42:33 +01:00
Jace bffc97f310 Groundwork for input command proxy 2015-12-12 13:42:33 +01:00
Jace 7464facab9 Next generation raptor copter 2015-12-12 03:38:17 +01:00
Tobias Dahl f14c62f3d3 Merge pull request #12 from teamfisk/PlayerSystem 
Player system
 2015-12-11 17:15:00 +01:00
Tleety d406059c79 Small bugfix. 2015-12-11 17:00:06 +01:00
Tleety 59b261534a Cleaned some comments and random annoyances in Renderer 2015-12-11 16:57:02 +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
verysecrethero b3bb0e543f Added EventBroker Test from the other project 2015-12-11 16:17:23 +01:00
Tleety 53d5736420 Fixed a bugg with RenderState. 
Renderstate now also handles the Frambuffer binding.
 2015-12-11 16:07:12 +01:00
stiffly 3da69c8a1b Fixed indentation 2015-12-11 15:29:57 +01:00
stiffly 16d636a87c Removed Initialize function for systems. 2015-12-11 15:23:56 +01:00
stiffly 4da33ff4ec Fixed movement on a "player" cube. Very simple system atm 2015-12-11 15:00:57 +01:00
stiffly c2435fda2d Added Component to Components.xsd and Entity.xsd 2015-12-11 14:27:54 +01:00
Tleety 433331e752 DrawPass now moved to it's own class to make renderer cleaner. 2015-12-11 14:22:54 +01:00
stiffly 094c7fbb44 Added system to CMakeLists.txt. 2015-12-11 14:20:36 +01:00
stiffly 0b60979c7b Added a Initialize function for systems. 2015-12-11 14:03:00 +01:00
Tleety 2366cd3520 Merge remote-tracking branch 'origin/master' into RendererDecoupling 2015-12-11 13:52:41 +01:00
Tleety 725a8896ce PickingPass now publishes an event that others can listen to to get pickingdata. 2015-12-11 13:51:08 +01:00
stiffly 80f028edf2 Added a very basic PlayerSystem, and a PlayerComponent. 2015-12-11 13:45:19 +01:00
Tleety 8c563a2d76 Merge remote-tracking branch 'origin/Picking' into RendererDecoupling 
# Conflicts:
#	include/Engine/Rendering/Renderer.h
#	src/Engine/Rendering/Renderer.cpp
 2015-12-11 11:21:58 +01:00
Tleety 91edab34bc PickingPass now sets state and clear it when done. 
PickingState now it's own class so renderer is a bit cleaner.
 2015-12-11 11:18:30 +01:00
verysecrethero d8b1f4e514 ConfigFileTest attempt to explore the memleaks further 2015-12-10 17:46:17 +01:00
Jace 6326a60a79 Merge pull request #11 from teamfisk/Picking 
Picking
 2015-12-10 17:24:12 +01:00
verysecrethero c651face4c ConfigFile now has tests covering the whole class 2015-12-10 17:20:47 +01:00
verysecrethero de044dabd3 Added ConfigFileTests! 2015-12-10 16:55:28 +01:00
viktorljung bb900c5110 Added picking event 2015-12-10 16:33:33 +01:00
Tleety cefc4e5257 PickingPassState done. 2015-12-10 16:06:25 +01:00
Tleety 37cf42527b RenderState class structure made. 2015-12-10 16:03:48 +01:00
verysecrethero 7804d42fea OctTree debug temporarily disabled because of the new master layout 2015-12-10 13:42:39 +01:00
verysecrethero e535f629bc Merge branch 'master' into PlayerTakeCapturePoint 
# Conflicts:
#	include/Game/Game.h
#	include/Game/HardcodedTestWorld.h
#	src/Game/Game.cpp
 2015-12-10 11:50:29 +01:00