Jace 0c56a05144 Merge branch 'master' of github.com:teamfisk/TacticalZ ...

# Conflicts:
#	resources/Schema/Entities/Player.xml
#	src/Engine/Network/Server.cpp

2016-01-24 21:21:51 +01:00

..

Licenses

Fixes for #34 (Licenses)

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

Schema

Merge branch 'master' of github.com:teamfisk/TacticalZ

2016-01-24 21:21:51 +01:00

Shaders

Removed temp variables & the "forced" animation in DrawFinalPass

2016-01-24 15:30:20 +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