Commit Graph

21 Commits

Author SHA1 Message Date
William Moberg bdcb33d992 Mouse always unlocked on game start and on disconnecting (i.e when menu shows). 2016-03-10 12:46:06 +01:00
William Moberg 06614aa907 SpectatorCameraSystem handles the overwatch cameras. Set camera to a class pick screen when connecting. Cannot spawn until both team and class has been picked.
Preparations for class aware PlayerSpawnSystem.
2016-03-04 05:41:29 +01:00
William Moberg 98366ec038 PickClass used for class-picking, SwapToClassPick to swap camera. 2016-03-03 16:59:17 +01:00
William Moberg 8859f652b9 Input ClassPick now switches to a camera with class buttons, they do nothing now and have test textures. 2016-03-03 15:48:55 +01:00
verysecrethero 4b8f1d95a3 Added static class PerformanceTimer. Changed CMakeLists for engine to include boost timer. Added F2,F3 functions in editor. Added some timing, more to be added 2016-02-16 16:57:46 +01:00
William Moberg 40ae2b8cbb DefaultInput key 'K' to kill player, since we can't respawn when alive. Also moved TakeDamage InputCommand to HealthSystem. 2016-02-12 00:52:58 +01:00
verysecrethero a8ab49f202 Merge remote-tracking branch 'origin/master' into DoubleJumpEffect
# Conflicts:
#	include/Game/Systems/PlayerMovementSystem.h
2016-02-11 15:19:01 +01:00
verysecrethero a53ab7f745 A few fixes for DashAbility. Default DoubleTapToDash is now set to false. 2016-02-10 20:46:16 +01:00
Jace 2c0f66d9c7 Merge remote-tracking branch 'origin/master' into WeaponSystem
# Conflicts:
#	include/Engine/Collision/FillFrustumOctreeSystem.h
#	include/Engine/Core/Octree.h
#	include/Engine/Rendering/RenderSystem.h
#	include/Game/Game.h
#	resources/DefaultInput.ini
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Rendering/RenderSystem.cpp
#	src/Game/Game.cpp
#	src/Game/Systems/PlayerMovementSystem.cpp
2016-02-10 17:02:00 +01:00
verysecrethero b6b96c5f11 Added DoubleJumpHexagon entity. Spawned DoubleJumpHexagon as the player doublejumps. Fixed DoubleJumping bug where you couldnt doublejump on rocks (where velocity wasnt 0.0) 2016-02-10 11:51:58 +01:00
Jace 5cea3bed3a Work in progress weapon system 2016-02-09 23:27:04 +01:00
William Moberg 59bdc614f2 Put SpecialAbility on left shift, and Sprint on left shift in DefaultInput. 2016-02-05 17:34:19 +01:00
Jace 65f5bc673f Functional translation widget in global and local space 2016-02-01 15:47:56 +01:00
Jocke 97d70f8e32 Fixed in client for shoot event. Weapon system now damages health on any target not only players. 2016-01-24 11:36:01 +01:00
Jace 0469460029 Input binding format changed to allow custom values for bindings. Relevant code must clamp input values to prevent speedhaxx! 2016-01-15 16:32:04 +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 50822d09fc Merge remote-tracking branch 'origin/master' into Networking
# Conflicts:
#	src/Game/Game.cpp
2015-12-17 14:10:02 +01:00
Jace b87f559291 Updated default configs with editor stuff 2015-12-17 10:46:49 +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 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