summaryrefslogtreecommitdiff
path: root/Resources
diff options
context:
space:
mode:
Diffstat (limited to 'Resources')
-rw-r--r--Resources/DefaultContent/Libraries/containers/README.md (renamed from Resources/DefaultContent/Libraries/Container/README.md)0
-rw-r--r--Resources/DefaultContent/Libraries/containers/list.lua (renamed from Resources/DefaultContent/Libraries/Container/list.lua)0
-rw-r--r--Resources/DefaultContent/Libraries/containers/queue.lua (renamed from Resources/DefaultContent/Libraries/Container/queue.lua)0
-rw-r--r--Resources/DefaultContent/Libraries/containers/stack.lua (renamed from Resources/DefaultContent/Libraries/Container/stack.lua)0
-rw-r--r--Resources/DefaultContent/Libraries/containers/tuple.lua (renamed from Resources/DefaultContent/Libraries/Container/tuple.lua)0
-rw-r--r--Resources/DefaultContent/Libraries/containers/vector.lua (renamed from Resources/DefaultContent/Libraries/Container/vector.lua)0
-rw-r--r--Resources/Scripts/EditorApplication.lua4
7 files changed, 2 insertions, 2 deletions
diff --git a/Resources/DefaultContent/Libraries/Container/README.md b/Resources/DefaultContent/Libraries/containers/README.md
index cba8776..cba8776 100644
--- a/Resources/DefaultContent/Libraries/Container/README.md
+++ b/Resources/DefaultContent/Libraries/containers/README.md
diff --git a/Resources/DefaultContent/Libraries/Container/list.lua b/Resources/DefaultContent/Libraries/containers/list.lua
index 59233b9..59233b9 100644
--- a/Resources/DefaultContent/Libraries/Container/list.lua
+++ b/Resources/DefaultContent/Libraries/containers/list.lua
diff --git a/Resources/DefaultContent/Libraries/Container/queue.lua b/Resources/DefaultContent/Libraries/containers/queue.lua
index 126daa8..126daa8 100644
--- a/Resources/DefaultContent/Libraries/Container/queue.lua
+++ b/Resources/DefaultContent/Libraries/containers/queue.lua
diff --git a/Resources/DefaultContent/Libraries/Container/stack.lua b/Resources/DefaultContent/Libraries/containers/stack.lua
index d828c81..d828c81 100644
--- a/Resources/DefaultContent/Libraries/Container/stack.lua
+++ b/Resources/DefaultContent/Libraries/containers/stack.lua
diff --git a/Resources/DefaultContent/Libraries/Container/tuple.lua b/Resources/DefaultContent/Libraries/containers/tuple.lua
index 0646d5a..0646d5a 100644
--- a/Resources/DefaultContent/Libraries/Container/tuple.lua
+++ b/Resources/DefaultContent/Libraries/containers/tuple.lua
diff --git a/Resources/DefaultContent/Libraries/Container/vector.lua b/Resources/DefaultContent/Libraries/containers/vector.lua
index 0b349ce..0b349ce 100644
--- a/Resources/DefaultContent/Libraries/Container/vector.lua
+++ b/Resources/DefaultContent/Libraries/containers/vector.lua
diff --git a/Resources/Scripts/EditorApplication.lua b/Resources/Scripts/EditorApplication.lua
index 305ee87..89efb0d 100644
--- a/Resources/Scripts/EditorApplication.lua
+++ b/Resources/Scripts/EditorApplication.lua
@@ -10,14 +10,14 @@ if app == nil then
Debug.LogError("app is nil")
end
-local mainWindow = GUI.ContainnerWindow.New({400, 400, 800, 500}, GUI.EShowMode.MainWindow, {100, 100}, {700, 700})
+local mainWindow = GUI.ContainerWindow.New({400, 400, 800, 500}, GUI.EShowMode.MainWindow, {100, 100}, {700, 700})
mainWindow:SetTitle("GameLab")
mainWindow:SetIcon("./Icon/GameLab.ico")
app:SetMainWindow(mainWindow)
local guiWindow = GUI.GUIWindow.New()
-guiWindow:SetContainnerWindow(mainWindow)
+guiWindow:SetContainerWindow(mainWindow)
guiWindow:SetPosition({0,0, 500, 400})