Tleety a2b938d8f6 Merge branch 'master' into CPArrow ...

# Conflicts:
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Entities/PlayerRed.xml

2016-03-02 13:58:44 +01:00

..

Collision

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

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

Core

Should now correctly track if another player takes your last capture point

2016-03-02 13:56:35 +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

Fixed draw final pass with shided objects having to many if-statments.

2016-03-02 11:59:48 +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