Tleety 4ffb03fdd5 Merge remote-tracking branch 'origin/master' into SmallFixes-Tobias ...

# Conflicts:
#	src/Engine/Rendering/DrawFinalPass.cpp

2016-02-23 10:02:53 +01:00

..

Licenses

Fixes for #34 (Licenses)

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

Schema

Merge branch 'master' of https://github.com/teamfisk/TacticalZ into SSAO

2016-02-22 14:51:42 +01:00

Shaders

Merge remote-tracking branch 'origin/master' into SmallFixes-Tobias

2016-02-23 10:02:53 +01:00

DefaultConfig.ini

Hopeless attempts to fix network bugs

2016-02-12 05:17:09 +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