Jace 01db8e0615 Merge remote-tracking branch 'origin/master' into Dirtybit ...

# Conflicts:
#	src/Engine/Collision/CollisionSystem.cpp
#	src/Engine/Core/Transform.cpp
#	src/Engine/Editor/EditorSystem.cpp
#	src/Engine/Rendering/AnimationSystem.cpp
#	src/Engine/Rendering/BoneAttachmentSystem.cpp
#	src/Game/Systems/CapturePointSystem.cpp
#	src/Game/Systems/ExplosionEffectSystem.cpp
#	src/Game/Systems/PlayerMovementSystem.cpp

2016-03-12 04:09:53 +01:00

..

Collision

Don't collide against disabled (invisible) models. Triggers uses model vs. box instead of only box vs. box.

2016-03-10 16:05:30 +01:00

Core

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

2016-03-12 04:09:53 +01:00

Editor

Renamed IsAnyParentMissingTransform -> isAnyParentMissingTransform (member function).

2016-03-07 14:34:45 +01:00

GUI

Fuck aff

2016-03-08 16:53:35 +01:00

Input

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

2016-03-12 04:09:53 +01:00

Network

fix.

2016-03-11 14:32:55 +01:00

Rendering

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

2016-03-12 04:09:53 +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