William Moberg e6b3bbeb54 Merge remote-tracking branch 'origin/master' into Respawning ...

# Conflicts:
#	resources/Schema/Types/Entity.xsd

2016-03-02 17:50:59 +01:00

..

Components

Added a default value to Position in FloatingEffect.xml

2016-03-02 17:47:22 +01:00

Entities

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

2016-03-02 17:50:59 +01:00

Types

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

2016-03-02 17:50:59 +01:00

Components.xsd

Added a FloatingEffectSystem to the game. Pickups now move up and down, if so desired.

2016-03-02 17:22:44 +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