viktorljung 89bc063ef0 Merge remote-tracking branch 'origin/Importer' into Animations ...

# Conflicts:
#	src/Engine/Rendering/DrawFinalPass.cpp

2016-02-02 15:01:34 +01:00

..

Licenses

Fixes for #34 (Licenses)

2016-01-15 17:20:11 +01:00

Schema

Merge remote-tracking branch 'origin/Importer' into Animations

2016-02-02 15:01:34 +01:00

Shaders

Some wierd shader faults and merge error fixe

2016-01-27 15:54:36 +01:00

DefaultConfig.ini

Merge remote-tracking branch 'origin/PlayerMovement' into Networking

2016-01-22 16:19:35 +01:00

DefaultInput.ini

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