antc13 aa20b48188 Merge remote-tracking branch 'origin/master' into Importer ...

# Conflicts:
#	resources/Schema/Entities/MovementTest.xml
#	resources/Schema/Entities/Player.xml

2016-01-24 16:22:22 +01:00

..

EditorGUI.cpp

Editor keyboard shortcuts:

2016-01-21 15:58:27 +01:00

EditorRenderSystem.cpp

Changed .obj to .mesh for all meshes.

2016-01-24 16:12:31 +01:00

EditorStats.cpp

Added a stats window

2016-01-18 18:54:57 +01:00

EditorSystem.cpp

Player input properly separated from editor input and server

2016-01-22 21:35:31 +01:00

EditorWidgetSystem.cpp

Fixed input going through editor UI

2016-01-21 17:45:20 +01:00