Merge branch 'master' into vulkan

2018-04-26 22:48:49 +02:00
parent a2691ee12e 8695e11436
commit 43bb487801
191 changed files with 5200 additions and 3554 deletions
--- a/build/scripts/tools/ndk_server.lua
+++ b/build/scripts/tools/ndk_server.lua
@@ -27,6 +27,8 @@ TOOL.FilesExcluded = {
 	"../SDK/**/CameraComponent.*",
 	"../SDK/**/Canvas.*",
 	"../SDK/**/Console.*",
+	"../SDK/**/DebugComponent.*",
+	"../SDK/**/DebugSystem.*",
 	"../SDK/**/GraphicsComponent.*",
 	"../SDK/**/LightComponent.*",
 	"../SDK/**/ListenerComponent.*",