FakeShemp 28e9ba1208 Merge branch 'master' into Shadows ...

# Conflicts:
#	include/Engine/Rendering/DrawFinalPass.h
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/FrameBuffer.cpp
#	src/Engine/Rendering/Renderer.cpp

2016-03-03 03:00:05 +01:00

..

Components

Begin clean-up

2016-03-01 19:10:13 +01:00

Entities

Merge branch 'master' into Shadows

2016-03-03 03:00:05 +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