antc13 4c5d17b203 Merge remote-tracking branch 'origin/master' into Importer ...

# Conflicts:
#	resources/Schema/Entities/RenderingWorld.xml
#	resources/Shaders/ForwardPlus.frag.glsl
#	src/Engine/Editor/EditorSystem.cpp
#	src/Engine/Network/Server.cpp
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Tests/OctTreeTestGameClass.cpp
#	src/Tests/OctTreeTestHardCodedTestWorld.h
#	src/Tests/ResourceManagerTest.cpp

2016-01-24 14:40:52 +01:00

..

CollidableOctreeSystem.h

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

2016-01-21 16:16:35 +01:00

Collision.h

Animations PROBABLY works fine if all joints got keyframes.

2016-01-23 18:02:42 +01:00

CollisionSystem.h

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

2016-01-21 16:16:35 +01:00

ETrigger.h

Fixed comment on Trigger events.

2015-12-17 13:48:35 +01:00

TriggerSystem.h

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

2016-01-21 16:16:35 +01:00