FakeShemp 28e9ba1208 Merge branch 'master' into Shadows ...

# Conflicts:
#	include/Engine/Rendering/DrawFinalPass.h
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/FrameBuffer.cpp
#	src/Engine/Rendering/Renderer.cpp

2016-03-03 03:00:05 +01:00

..

Collision

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

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

Core

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

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

Editor

Merge branch 'master' into Shadows

2016-03-03 03:00:05 +01:00

GUI

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

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

Input

Fixes #66 warnings

2016-02-01 17:53:01 +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 branch 'master' into Shadows

2016-03-03 03:00:05 +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

CMakeLists.txt

Added static class PerformanceTimer. Changed CMakeLists for engine to include boost timer. Added F2,F3 functions in editor. Added some timing, more to be added

2016-02-16 16:57:46 +01:00