merge

main.lua

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