Teejoon 77eaa45702 Merge remote-tracking branch 'origin/master' into HEAD ...

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

2016-03-01 12:11:27 +01:00

..

Components

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

2016-03-01 12:11:27 +01:00

Entities

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

2016-03-01 12:11:27 +01:00

Types

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

2016-03-01 12:11:27 +01:00

Components.xsd

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

2016-03-01 12:11:27 +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