Jace 47053285c8 Merge remote-tracking branch 'origin/Menu' into WeaponSystem ...

# Conflicts:
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Types/Entity.xsd

2016-02-12 02:30:38 +01:00

..

Components

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

2016-02-12 02:09:14 +01:00

Entities

Merge remote-tracking branch 'origin/Menu' into WeaponSystem

2016-02-12 02:30:38 +01:00

Types

Merge remote-tracking branch 'origin/Menu' into WeaponSystem

2016-02-12 02:30:38 +01:00

Components.xsd

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

2016-02-12 02:09:14 +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