Merge branch 'master' into v0.1.0

This commit is contained in:
Ryan Ward 2024-10-31 00:33:39 -04:00 committed by GitHub
commit 0d2fc4bf6b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 6 deletions

View File

@ -41,7 +41,6 @@ function gui:newMenu(title, sx, position, trans, callback, t,t2)
function menu:Open(show) function menu:Open(show)
if show then if show then
if not menu.lock then if not menu.lock then
menu.visible = true
menu.lock = true menu.lock = true
local t = to() local t = to()
t.OnStop(function() t.OnStop(function()
@ -89,7 +88,6 @@ function gui:newMenu(title, sx, position, trans, callback, t,t2)
end end
end end
end end
menu.OnCreate = processor:newConnection() menu.OnCreate = processor:newConnection()
local items = {} local items = {}
function menu:addItem(text) function menu:addItem(text)

View File

@ -95,7 +95,6 @@ local function Hook(funcname, func)
love[funcname] = function(...) func({}, ...) end love[funcname] = function(...) func({}, ...) end
end end
end end
-- Incase you define one of these methods, we need to process this after that -- Incase you define one of these methods, we need to process this after that
updater:newTask(function() updater:newTask(function()
-- System -- System
@ -577,7 +576,6 @@ function gui:newBase(typ, x, y, w, h, sx, sy, sw, sh, virtual)
end end
return false return false
end end
setmetatable(c, self) setmetatable(c, self)
c.__index = self.__index c.__index = self.__index
c.__variables = {clip = {false, 0, 0, 0, 0}} c.__variables = {clip = {false, 0, 0, 0, 0}}
@ -613,7 +611,7 @@ function gui:newBase(typ, x, y, w, h, sx, sy, sw, sh, virtual)
c.OnSizeChanged = testVisual .. multi:newConnection() c.OnSizeChanged = testVisual .. multi:newConnection()
c.OnPositionChanged = testVisual .. multi:newConnection() c.OnPositionChanged = testVisual .. multi:newConnection()
c.OnLeftStickUp = testVisual .. multi:newConnection() c.OnLeftStickUp = testVisual .. multi:newConnection()
c.OnLeftStickDown = testVisual .. multi:newConnection() c.OnLeftStickDown = testVisual .. multi:newConnection()
c.OnLeftStickLeft = testVisual .. multi:newConnection() c.OnLeftStickLeft = testVisual .. multi:newConnection()
@ -1282,7 +1280,6 @@ function gui:newImageBase(typ, x, y, w, h, sx, sy, sw, sh)
c.scaleX = c.scaleX * -1 c.scaleX = c.scaleX * -1
end end
end end
function c:getSource() function c:getSource()
return IMAGE return IMAGE
end end