Merge branch 'master' into vulkan

build/scripts/actions/generateheaders.lua

@@ -69,6 +69,15 @@ ACTION.Function = function ()
 		Target = "../SDK/include/NDK/Systems.hpp"
 	})
 	
+	table.insert(paths, {
+		Excludes = {},
+		HeaderGuard = "NDK_WIDGETS_GLOBAL_HPP",
+		Name = "NDK Widgets",
+		SearchDir = "../SDK/include/NDK/Widgets", 
+		TopDir = "NDK", 
+		Target = "../SDK/include/NDK/Widgets.hpp"
+	})
+	
 	for k,v in ipairs(paths) do
 		print(v.Name)
 		local header, err = io.open(v.Target, "w+")

build/scripts/tools/ndk_server.lua

@@ -25,6 +25,7 @@ TOOL.Files = {
 -- Excludes client-only files
 TOOL.FilesExcluded = {
 	"../SDK/**/CameraComponent.*",
+	"../SDK/**/Canvas.*",
 	"../SDK/**/Console.*",
 	"../SDK/**/GraphicsComponent.*",
 	"../SDK/**/LightComponent.*",
@@ -33,6 +34,7 @@ TOOL.FilesExcluded = {
 	"../SDK/**/Particle*Component.*",
 	"../SDK/**/ParticleSystem.*",
 	"../SDK/**/RenderSystem.*",
+	"../SDK/**/*Widget*.*",
 	"../SDK/**/LuaBinding_Audio.*",
 	"../SDK/**/LuaBinding_Graphics.*",
 	"../SDK/**/LuaBinding_Renderer.*"