verysecrethero 73ab9bb4c6 Merge remote-tracking branch 'origin/master' into AssaultDash ...

# Conflicts:
#	src/Game/Systems/PlayerMovementSystem.cpp

2016-02-03 09:52:54 +01:00

..

Engine

DoubleJumping now in InputController instead.

2016-02-02 15:10:11 +01:00

Game

Merge remote-tracking branch 'origin/master' into AssaultDash

2016-02-03 09:52:54 +01:00