verysecrethero 8845054965 Merge remote-tracking branch 'origin/master' into PerformanceTiming ...

# Conflicts:
#	resources/Schema/Entities/NewMap.xml

2016-02-17 16:59:26 +01:00

..

Engine

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

2016-02-17 16:59:26 +01:00

Game

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