viktorljung 7d4a4ed7cf Merge remote-tracking branch 'origin/master' into Animations ...

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

2016-02-11 14:38:23 +01:00

..

Components

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

2016-02-10 19:24:35 +01:00

Entities

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

2016-02-11 14:38:23 +01:00

Types

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

2016-02-10 17:02:00 +01:00

Components.xsd

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

2016-02-10 17:02:00 +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