antc13 4c5d17b203 Merge remote-tracking branch 'origin/master' into Importer ...

# Conflicts:
#	resources/Schema/Entities/RenderingWorld.xml
#	resources/Shaders/ForwardPlus.frag.glsl
#	src/Engine/Editor/EditorSystem.cpp
#	src/Engine/Network/Server.cpp
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Tests/OctTreeTestGameClass.cpp
#	src/Tests/OctTreeTestHardCodedTestWorld.h
#	src/Tests/ResourceManagerTest.cpp

2016-01-24 14:40:52 +01:00

..

Collision

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

2016-01-24 14:40:52 +01:00

Core

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

2016-01-24 14:40:52 +01:00

Editor

Fixed input going through editor UI

2016-01-21 17:45:20 +01:00

GUI

Camera component and RenderQueue changes

2016-01-08 16:21:59 +01:00

Input

Input binding format changed to allow custom values for bindings. Relevant code must clamp input values to prevent speedhaxx!

2016-01-15 16:32:04 +01:00

Network

Added logic to go from spectator to player.

2016-01-20 17:41:16 +01:00

Rendering

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

2016-01-24 14:40:52 +01:00

Sound

Now calculating the velocity for the listener correctly.

2016-01-15 15:43:20 +01:00

Common.h

Added a stats window

2016-01-18 18:54:57 +01:00

GLM.h

EditorWidgetSystem that takes care of moving widgets around

2016-01-21 10:30:19 +01:00

OpenGL.h

Engine puzzle completed

2015-11-30 17:02:24 +01:00