William Moberg a3b3351e55 Merge branch 'master' into Dirtybit ...

# Conflicts:
#	include/Engine/Rendering/ExplosionEffectJob.h
#	src/Game/Systems/ExplosionEffectSystem.cpp

2016-03-12 17:59:50 +01:00

..

Collision

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

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

Core

Fixed so calculating absolute positions, etc. works. Sets the field of all children to dirty if a transform field is altered. Will also set Position to dirty if Scale or Orientation is altered.

2016-03-12 17:51:03 +01:00

Editor

Editor should now set dirty flag when component field changes

2016-03-12 05:17:56 +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 remote-tracking branch 'origin/master' into Dirtybit

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

Rendering

Merge branch 'master' into Dirtybit

2016-03-12 17:59:50 +01:00

Sound

Updated the ENTIRE CODEBASE TO MATCH

2016-03-12 00:38:33 +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