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

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

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

..

Licenses

Fixes for #34 (Licenses)

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

Schema

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

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

Shaders

Merge pull request #103 from teamfisk/WeaponSystem

2016-02-11 23:16:44 +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