William Moberg 4ef76f6c45 Merge branch 'master' into Respawning ...

# Conflicts:
#	resources/Schema/Types/Entity.xsd

2016-03-02 16:51:24 +01:00

..

Licenses

Fixes for #34 (Licenses)

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

Schema

Merge branch 'master' into Respawning

2016-03-02 16:51:24 +01:00

Shaders

Transparancy with shild fix

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

DefaultConfig.ini

Fix so client doesn't override the servers respawn time with its config file. Server or single player client can still override the component with the config RespawnTime.

2016-03-02 14:37:33 +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