Teejoon d8f9f15d34 Merge branch 'master' into DDS ...

Conflicts:
	assets
	src/Engine/Rendering/Texture.cpp
	src/Engine/Rendering/Util/CommonFunctions.cpp
	src/Game/Game.cpp

2016-03-10 19:55:25 +01:00

..

Components

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

2016-03-09 19:38:55 +01:00

Entities

Merge branch 'master' into DDS

2016-03-10 19:55:25 +01:00

Types

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

2016-03-09 11:49:42 +01:00

Components.xsd

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

2016-03-09 11:49:42 +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