viktorljung 0f17f9a888 Merge remote-tracking branch 'origin/master' into Rendering ...

# Conflicts:
#	include/Engine/Editor/EditorSystem.h
#	include/Engine/Rendering/EPicking.h
#	include/Engine/Rendering/Renderer.h
#	include/Game/Game.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Test.xml
#	src/Engine/Editor/EditorSystem.cpp
#	src/Engine/Rendering/RawModel.cpp
#	src/Engine/Rendering/RenderQueueFactory.cpp
#	src/Engine/Rendering/Renderer.cpp
#	src/Game/Game.cpp

2016-01-12 16:13:20 +01:00

..

Collision

Fixed comment on Trigger events.

2015-12-17 13:48:35 +01:00

Core

Added ComponentInfo::FieldsInOrder to be able to loop through component fields in a consistent order based on the component XSD definition

2016-01-11 14:56:53 +01:00

Editor

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

2016-01-12 16:13:20 +01:00

GUI

Camera component and RenderQueue changes

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

Input

MouseInputHandler

2015-12-12 13:42:46 +01:00

Network

Network not longer threaded

2015-12-18 12:00:14 +01:00

Rendering

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

2016-01-12 16:13:20 +01:00

Sound

Initial directory structure

2015-11-20 15:01:37 +01:00

Common.h

Added an macro IF_DEBUG_IS(x) that executes if run in debug mode, AABB has a check so max and min corners are set properly in debug mode.

2015-12-17 13:31:54 +01:00

GLM.h

Engine puzzle completed

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

OpenGL.h

Engine puzzle completed

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