viktorljung 8422742a9e Merge remote-tracking branch 'origin/master' into Animations ...

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

2016-03-02 13:50:08 +01:00

..

Licenses

Fixes for #34 (Licenses)

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

Schema

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

2016-03-02 13:50:08 +01:00

Shaders

Transparancy with shild fix

2016-03-01 23:14:23 +01:00

DefaultConfig.ini

Fixed draw final pass with shided objects having to many if-statments.

2016-03-02 11:59:48 +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