William Moberg 562afac9d1 Merge branch 'master' into Importer ...

# Conflicts:
#	src/Engine/Collision/Collision.cpp
#	src/Engine/Collision/CollisionSystem.cpp
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Game/Systems/SpawnerSystem.cpp

2016-03-14 00:42:07 +01:00

..

Collision

Merge branch 'master' into Importer

2016-03-14 00:42:07 +01:00

Core

Merge branch 'master' into Movement

2016-03-13 22:22:36 +01:00

Editor

Turned the Transform namespace into TransformSystem so it would be able to subscribe to EntityDeleted and clean up after itself

2016-03-13 00:57:00 +01:00

GUI

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

2016-03-09 11:49:42 +01:00

Input

fixup! fixup! Disabled InputCommand processing while you fiddle with editor UI elements

2016-03-07 19:59:57 +01:00

Network

Merge branch 'master' into Movement

2016-03-13 22:22:36 +01:00

Rendering

Merge branch 'master' into Importer

2016-03-14 00:42:07 +01:00

Sound

Now listens to SetCamera event and the background music should be working properly.

2016-03-13 17:35:05 +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