Teejoon 46eaedb186 Merge remote-tracking branch 'origin/master' into Importer ...

Conflicts:
	resources/Schema/Entities/Player.xml
	src/Engine/Collision/CollisionSystem.cpp
	src/Engine/Rendering/DrawFinalPass.cpp

2016-03-02 13:19:40 +01:00

..

Collision

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

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

Core

ECaptured: added NextCapturePoint entitywrapper. Changed CapturePointID to CapturePointTakenID. Fixed so CapturePoints works in singleplayer again. Captured event is now sent in the next Update, since the information for NextCapturePoint is needed

2016-03-01 17:34:30 +01:00

Editor

Fixed editor camera speed changing when scrolling on UI elements

2016-03-01 22:47:43 +01:00

GUI

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

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

Input

Moved the Dash CoolDown (CoolDownTimer) to the component (DashAbility). Fixed 2 warnings

2016-03-01 17:57:18 +01:00

Network

AmmoPickups and HealthPickups will only spawn on the server. When a ammo pickup is taken the Server will send an Event to that

2016-03-01 17:55:00 +01:00

Rendering

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

2016-03-02 13:19:40 +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