Merge branch 'master' into vulkan

This commit is contained in:
Lynix
2016-12-06 16:46:24 +01:00
129 changed files with 7831 additions and 2689 deletions

View File

@@ -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.*"