 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 |
|
|
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 |
|