viktorljung 89bc063ef0 Merge remote-tracking branch 'origin/Importer' into Animations ...

# Conflicts:
#	src/Engine/Rendering/DrawFinalPass.cpp

2016-02-02 15:01:34 +01:00

..

Components

Merge remote-tracking branch 'origin/Importer' into Animations

2016-02-02 15:01:34 +01:00

Entities

Merge remote-tracking branch 'origin/Importer' into Animations

2016-02-02 15:01:34 +01:00

Types

Added BoneAttachment to Entity.xsd

2016-01-27 17:31:57 +01:00

Components.xsd

Merge remote-tracking branch 'origin/EditorUsefulness' into Animations

2016-01-27 17:16:49 +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