verysecrethero bc227c3d61 Merge remote-tracking branch 'origin/master' into AndersTestNetwork ...

# Conflicts:
#	include/Game/Systems/DamageIndicatorSystem.h
#	src/Game/Systems/DamageIndicatorSystem.cpp
#	src/Game/Systems/SoundSystem.cpp

2016-02-25 10:30:35 +01:00

..

Collision

Merge branch 'master' into BoxModelCollision

2016-02-19 14:17:17 +01:00

Core

Misc TestBranch testing

2016-02-22 17:46:49 +01:00

Editor

Refactored System constructor to take a struct instead of a bunch of parameters to reduce future pain and to be able to extend it with IsClient and IsServer flags.

2016-02-08 13:33:55 +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 AndersTestNetwork

2016-02-25 10:30:35 +01:00

Rendering

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

2016-02-24 15:45:30 +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