Merge branch 'master' into v0.1.0
This commit is contained in:
commit
0d2fc4bf6b
@ -41,7 +41,6 @@ function gui:newMenu(title, sx, position, trans, callback, t,t2)
|
||||
function menu:Open(show)
|
||||
if show then
|
||||
if not menu.lock then
|
||||
menu.visible = true
|
||||
menu.lock = true
|
||||
local t = to()
|
||||
t.OnStop(function()
|
||||
@ -89,7 +88,6 @@ function gui:newMenu(title, sx, position, trans, callback, t,t2)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
menu.OnCreate = processor:newConnection()
|
||||
local items = {}
|
||||
function menu:addItem(text)
|
||||
|
||||
3
init.lua
3
init.lua
@ -95,7 +95,6 @@ local function Hook(funcname, func)
|
||||
love[funcname] = function(...) func({}, ...) end
|
||||
end
|
||||
end
|
||||
|
||||
-- Incase you define one of these methods, we need to process this after that
|
||||
updater:newTask(function()
|
||||
-- System
|
||||
@ -577,7 +576,6 @@ function gui:newBase(typ, x, y, w, h, sx, sy, sw, sh, virtual)
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
setmetatable(c, self)
|
||||
c.__index = self.__index
|
||||
c.__variables = {clip = {false, 0, 0, 0, 0}}
|
||||
@ -1282,7 +1280,6 @@ function gui:newImageBase(typ, x, y, w, h, sx, sy, sw, sh)
|
||||
c.scaleX = c.scaleX * -1
|
||||
end
|
||||
end
|
||||
|
||||
function c:getSource()
|
||||
return IMAGE
|
||||
end
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user