Jace 7e12d00874 Merge branch 'master' into CoolDeathAnimation ...

# Conflicts:
#	include/Engine/Rendering/ModelJob.h
#	resources/Shaders/ForwardPlus.frag.glsl
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/RenderSystem.cpp

2016-01-27 10:43:23 +01:00

..

Components

Merge branch 'master' into CoolDeathAnimation

2016-01-27 10:43:23 +01:00

Entities

Merge branch 'master' into CoolDeathAnimation

2016-01-27 10:43:23 +01:00

Types

Merge branch 'master' into CoolDeathAnimation

2016-01-27 10:43:23 +01:00

Components.xsd

Merge branch 'master' into CoolDeathAnimation

2016-01-27 10:43:23 +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