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

# Conflicts:
#	resources/DefaultConfig.ini
#	resources/Schema/Entities/CP_Rocky2.xml

2016-03-14 02:51:09 +01:00

..

Components

Merge pull request #218 from teamfisk/DashEffect

2016-03-14 00:58:00 +01:00

Entities

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

2016-03-14 02:51:09 +01:00

Types

Merge branch 'master' into Movement

2016-03-13 22:22:36 +01:00

Components.xsd

Merge branch 'master' into Movement

2016-03-13 22:22:36 +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