c7dad79e72
Merge branch 'master' into JumpHeightAdjustment
...
# Conflicts:
# resources/Schema/Components.xsd
# resources/Schema/Entities/Player.xml
# resources/Schema/Entities/PlayerRed.xml
# src/Game/Systems/PlayerMovementSystem.cpp
2016-02-29 17:28:40 +01:00
Jace
bb76c9d248
WIP multi-weapon behaviours
2016-02-29 06:58:57 +01:00
89d0d5753f
Fix for player teleporting to (0,0,0). Saves player previous position in CollisionSystem instead of Physics component so it won't be saved when editing Players.
2016-02-25 16:16:24 +01:00
cd315bbaa0
Added DoubleJump component and JumpSpeed in Player component so jumpheight can be adjusted for regular jump and double jump.
2016-02-25 12:12:44 +01:00
fe3e0bac5b
Changed SpritIndicator values on player
2016-02-22 18:45:02 +01:00
fa4f007604
Changed name from Indicator to SpriteIndicator. Can now be an indicator for a single team or every one
2016-02-22 18:35:00 +01:00
adceccf402
SSAO now working. Changed in DrawFinalePass so that th AOTexture is on texture position 0 and only get binded once.
...
Changed so that the picking pass get drawn once in the beginning so that the AO shatde could calculate AO from the depthbuffer generated during pthe pickingpass.
In the ImGUI debugg window there is now sliders to change the behavior of the AO shader. Only the minimum ambient lightning is HardCoded in to the frowardPlus fragmentshaders with a define in the begining.
2016-02-22 14:48:20 +01:00
Jace
ca457d9c00
Player names
2016-02-12 09:07:59 +01:00
Jace
b48d491ad7
Complete blue and red player entities
2016-02-12 07:45:51 +01:00
Jace
71533b52ae
Map fix
2016-02-12 02:10:42 +01:00
William Moberg
Jace
Teejoon