viktorljung 08328a781c Merge remote-tracking branch 'origin/master' into Animations ...

# Conflicts:
#	assets
#	include/Engine/Rendering/Model.h
#	src/Engine/Collision/Collision.cpp

2016-02-10 14:13:08 +01:00

..

Components

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

2016-02-10 11:33:45 +01:00

Entities

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

2016-02-10 14:13:08 +01:00

Types

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

2016-02-10 11:33:45 +01:00

Components.xsd

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

2016-02-10 11:33:45 +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