Teejoon f59a9e1d2b Merge remote-tracking branch 'origin/master' into MSAA ...

Conflicts:
	resources/Schema/Entities/CP_Rocky2.xml

2016-03-13 21:28:38 +01:00

..

Collision

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

Core

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

2016-03-13 21:28:38 +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

Added pop up for client when server timeouts.

2016-03-13 16:21:55 +01:00

Rendering

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

2016-03-13 21:28:38 +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