Develop #4

Merged
wariosolis merged 35 commits from develop into master 2017-01-04 00:04:34 +01:00
14 changed files with 83 additions and 8 deletions
Showing only changes of commit 3b92144107 - 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 = 2
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()
+2 -2
View File
@@ -6,9 +6,9 @@ local stage1 = {}
local image
function stage1.load(game, camera)
stage1.world = { w = 2560, h= 720}
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)
image = love.graphics.newImage('assets/sprites/background/bg.jpg')
arrows.load(game, stage1, camera)
game.canvas.x = game.window.width
end
+1 -1
View File
@@ -6,7 +6,7 @@ local stage2 = {}
local image
function stage2.load(game, camera)
image = love.graphics.newImage('assets/sprites/background/santabiblia.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 stage2 = {}
local image
function stage2.load(game, camera)
image = love.graphics.newImage('assets/sprites/background/fondo_tocadiscos.jpg')
stage2.world = { w = image:getWidth(), h= 720}
game:setNewSizeWorld(stage2.world.w, stage2.world.h)
arrows.load(game, stage2, camera)
game.canvas.x = game.window.width / 2
end
function stage2.update(dt, game)
arrows.update(dt)
end
function stage2.draw()
love.graphics.draw(image)
arrows.draw()
end
return stage2
+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
Binary file not shown.

Before

Width:  |  Height:  |  Size: 94 KiB

Before

Width:  |  Height:  |  Size: 88 KiB

After

Width:  |  Height:  |  Size: 88 KiB

Before

Width:  |  Height:  |  Size: 81 KiB

After

Width:  |  Height:  |  Size: 81 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 200 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 195 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 138 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 93 KiB

+3 -3
View File
@@ -11,7 +11,7 @@ function love.load()
camera.load(game)
stages.load(game, camera)
stress.load(game, camera)
--bells.load(game, camera)
bells.load(game, camera)
controls.load(game)
end
@@ -22,7 +22,7 @@ function love.update(dt)
camera.update(game)
stages.update(dt, game, camera)
stress.update(dt, game, camera)
-- bells.update(dt, game, camera)
bells.update(dt, game, camera)
controls.update(dt, game, camera)
end
@@ -32,7 +32,7 @@ function love.draw()
function(l,t,w,h)
stages.draw()
stress.draw()
-- bells.draw(game)
bells.draw(game)
end
)
controls.draw()