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

..

Components

Crouching!

2016-01-23 15:06:47 +01:00

Entities

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

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

Types

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

2016-01-23 11:48:10 +01:00

Components.xsd

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

2016-01-23 11:48:10 +01:00

Types.xsd

Basic movement and camera management between players and editor

2016-01-22 16:12:51 +01:00

xml.xsd

Updated schema

2015-11-25 18:04:11 +01:00