FakeShemp 20468cba1b Merge branch 'master' into Shadows ...

# Conflicts:
#	assets
#	include/Engine/Rendering/DrawFinalPass.h
#	include/Engine/Rendering/Renderer.h
#	resources/Shaders/ForwardPlus.frag.glsl
#	resources/Shaders/ForwardPlus.vert.glsl
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/FrameBuffer.cpp
#	src/Engine/Rendering/Renderer.cpp

2016-02-29 18:03:00 +01:00

..

Components

Fix for player teleporting to (0,0,0). Saves player previous position in CollisionSystem instead of Physics component so it won't be saved when editing Players.

2016-02-25 16:16:24 +01:00

Entities

Merge branch 'master' into Shadows

2016-02-29 18:03:00 +01:00

Types

Components for menu/buttons

2016-02-16 14:05:57 +01:00

Components.xsd

Changed name from Indicator to SpriteIndicator. Can now be an indicator for a single team or every one

2016-02-22 18:35:00 +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