lustlion
/
Mothback
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge

This commit is contained in:
bizcochito 2022-01-18 21:12:13 +01:00
parent 69ceec024b
commit a183dac913
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main.lua
View File

@ -1,5 +1,5 @@
<<<<<<< HEAD
function love.load() function love.load()
arrow = 0
do_pause = false do_pause = false
@ -49,7 +49,7 @@ function love.load()
table.insert(LoadedEntities,Decoration:New(200,89,animation.decoration.candelabra,80)) table.insert(LoadedEntities,Decoration:New(200,89,animation.decoration.candelabra,80))
table.insert(LoadedEntities,Fairy:New(200,88)) table.insert(LoadedEntities,Fairy:New(200,88))
gravity = 0.05 gravity = 0.2
end end
function love.update(dt) function love.update(dt)
@ -76,7 +76,7 @@ end
function love.wheelmoved(_, y) function love.wheelmoved(_, y)
if editor_mode then if editor_mode then
if palette then if palette then
p_scroll = p_scroll + y p_scroll = p_scroll + y or 0
else else
local oscale = game.scale local oscale = game.scale
game.scale = math.max(0.1,game.scale + y/16) game.scale = math.max(0.1,game.scale + y/16)
@ -140,4 +140,5 @@ function love.draw()
else else
drawGame() drawGame()
end end
love.graphics.print(arrow,10,40)
end end