Develop #4

Merged
wariosolis merged 35 commits from develop into master 2017-01-04 00:04:34 +01:00
5 changed files with 54 additions and 4 deletions
Showing only changes of commit eb71230744 - Show all commits
+2 -2
View File
@@ -9,7 +9,7 @@ function game.load()
game.window = { width = width , height = height }
game.canvas = { x = width / 2, y= 0, width = canvas_width, height = canvas_height }
game.level = 1
game.end_level = 3
game.end_level = 5
love.window.setMode(game.window.width, game.window.height)
@@ -20,7 +20,7 @@ function game.load()
game.world = love.physics.newWorld(0, gravity * world_meter, true) -- Make earth
-- Bells
bells_enable = true
bells_enable = false
game.music = love.audio.newSource("assets/audio/music/theme.mp3")
game:playMusic()
+1 -1
View File
@@ -6,7 +6,7 @@ local stage1 = {}
local image
function stage1.load(game, camera)
image = love.graphics.newImage('assets/sprites/background/fondo_fotomadre.jpg')
image = love.graphics.newImage('assets/sprites/background/fondo_mesilla.jpg')
stage1.world = { w = image:getWidth(), h= 720}
game:setNewSizeWorld(stage1.world.w, stage1.world.h)
arrows.load(game, stage1, camera)
+1 -1
View File
@@ -6,7 +6,7 @@ local stage2 = {}
local image
function stage2.load(game, camera)
image = love.graphics.newImage('assets/sprites/background/fondo_tocadiscos.jpg')
image = love.graphics.newImage('assets/sprites/background/fondo_chimenea.jpg')
stage2.world = { w = image:getWidth(), h= 720}
game:setNewSizeWorld(stage2.world.w, stage2.world.h)
arrows.load(game, stage2, camera)
+25
View File
@@ -0,0 +1,25 @@
local anim8 = require 'assets/scripts/vendor/anim8'
local tools = require 'assets/scripts/tools'
local arrows = require 'assets/scripts/arrows'
local stage4 = {}
local image
function stage4.load(game, camera)
image = love.graphics.newImage('assets/sprites/background/fondo_libros.jpg')
stage4.world = { w = image:getWidth(), h= 720}
game:setNewSizeWorld(stage4.world.w, stage4.world.h)
arrows.load(game, stage4, camera)
game.canvas.x = game.window.width / 2
end
function stage4.update(dt, game)
arrows.update(dt)
end
function stage4.draw()
love.graphics.draw(image)
arrows.draw()
end
return stage4
+25
View File
@@ -0,0 +1,25 @@
local anim8 = require 'assets/scripts/vendor/anim8'
local tools = require 'assets/scripts/tools'
local arrows = require 'assets/scripts/arrows'
local stage5 = {}
local image
function stage5.load(game, camera)
image = love.graphics.newImage('assets/sprites/background/fondo_fotomadre.jpg')
stage5.world = { w = image:getWidth(), h= 720}
game:setNewSizeWorld(stage5.world.w, stage5.world.h)
arrows.load(game, stage5, camera)
game.canvas.x = game.window.width / 2
end
function stage5.update(dt, game)
arrows.update(dt)
end
function stage5.draw()
love.graphics.draw(image)
arrows.draw()
end
return stage5