stiffly 20c6caa408 Merge remote-tracking branch 'origin/master' into Kill-streak-sounds ...

# Conflicts:
#	resources/DefaultConfig.ini

2016-03-03 17:32:04 +01:00

..

Licenses

Fixes for #34 (Licenses)

2016-01-15 17:20:11 +01:00

Schema

Merge remote-tracking branch 'origin/master' into Kill-streak-sounds

2016-03-03 17:32:04 +01:00

Shaders

Revert "Shadows"

2016-03-03 14:24:43 +01:00

DefaultConfig.ini

Merge remote-tracking branch 'origin/master' into Kill-streak-sounds

2016-03-03 17:32:04 +01:00

DefaultInput.ini

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