viktorljung 0d287ad5d1 Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement ...

# Conflicts:
#	resources/Schema/Entities/RayAssaultBlue.xml

2016-03-13 16:45:57 +01:00

..

Components

Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement

2016-03-13 16:45:57 +01:00

Entities

Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement

2016-03-13 16:45:57 +01:00

Types

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

2016-03-13 15:17:15 +01:00

Components.xsd

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

2016-03-13 15:17:15 +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