Teejoon 77eaa45702 Merge remote-tracking branch 'origin/master' into HEAD ...

Conflicts:
	src/Engine/Rendering/CubeMapPass.cpp
	src/Engine/Rendering/DrawFinalPass.cpp

2016-03-01 12:11:27 +01:00

..

Collision

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

2016-03-01 12:11:27 +01:00

Core

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

2016-03-01 12:11:27 +01:00

Editor

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

2016-03-01 12:11:27 +01:00

GUI

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

2016-02-19 13:17:31 +01:00

Input

You can now AssaultDash in the air

2016-02-17 11:47:10 +01:00

Network

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

2016-03-01 12:11:27 +01:00

Rendering

We only uses one depth buffer now

2016-02-29 11:44:29 +01:00

Sound

When using a PlaySoundOnEntity Event, you no longer have to provide the child of an entity as parameter.

2016-02-10 11:15:49 +01:00

Common.h

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

2016-01-25 01:21:15 +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