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

..

Engine

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

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

Game

WIP shoot

2016-01-24 17:16:18 +01:00