William Moberg c7dad79e72 Merge branch 'master' into JumpHeightAdjustment ...

# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Entities/PlayerRed.xml
#	src/Game/Systems/PlayerMovementSystem.cpp

2016-02-29 17:28:40 +01:00

..

Licenses

Fixes for #34 (Licenses)

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

Schema

Merge branch 'master' into JumpHeightAdjustment

2016-02-29 17:28:40 +01:00

Shaders

Debug tool for different CubeMap

2016-02-24 14:47:47 +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