Develop #4

Merged
wariosolis merged 35 commits from develop into master 2017-01-04 00:04:34 +01:00
12 changed files with 32 additions and 7 deletions
Showing only changes of commit 1fe28914a6 - Show all commits
+1 -1
View File
@@ -9,7 +9,7 @@ function game.load()
game.window = { width = width , height = height } game.window = { width = width , height = height }
game.canvas = { x = width / 2, y= 0, width = canvas_width, height = canvas_height } game.canvas = { x = width / 2, y= 0, width = canvas_width, height = canvas_height }
game.level = 1 game.level = 1
game.end_level = 2 game.end_level = 3
love.window.setMode(game.window.width, game.window.height) love.window.setMode(game.window.width, game.window.height)
+2 -2
View File
@@ -6,9 +6,9 @@ local stage1 = {}
local image local image
function stage1.load(game, camera) function stage1.load(game, camera)
stage1.world = { w = 2560, h= 720} image = love.graphics.newImage('assets/sprites/background/fondo_fotomadre.jpg')
stage1.world = { w = image:getWidth(), h= 720}
game:setNewSizeWorld(stage1.world.w, stage1.world.h) game:setNewSizeWorld(stage1.world.w, stage1.world.h)
image = love.graphics.newImage('assets/sprites/background/bg.jpg')
arrows.load(game, stage1, camera) arrows.load(game, stage1, camera)
game.canvas.x = game.window.width game.canvas.x = game.window.width
end end
+1 -1
View File
@@ -6,7 +6,7 @@ local stage2 = {}
local image local image
function stage2.load(game, camera) function stage2.load(game, camera)
image = love.graphics.newImage('assets/sprites/background/santabiblia.jpg') image = love.graphics.newImage('assets/sprites/background/fondo_tocadiscos.jpg')
stage2.world = { w = image:getWidth(), h= 720} stage2.world = { w = image:getWidth(), h= 720}
game:setNewSizeWorld(stage2.world.w, stage2.world.h) game:setNewSizeWorld(stage2.world.w, stage2.world.h)
arrows.load(game, stage2, camera) 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
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) camera.load(game)
stages.load(game, camera) stages.load(game, camera)
stress.load(game, camera) stress.load(game, camera)
--bells.load(game, camera) bells.load(game, camera)
controls.load(game) controls.load(game)
end end
@@ -22,7 +22,7 @@ function love.update(dt)
camera.update(game) camera.update(game)
stages.update(dt, game, camera) stages.update(dt, game, camera)
stress.update(dt, game, camera) stress.update(dt, game, camera)
-- bells.update(dt, game, camera) bells.update(dt, game, camera)
controls.update(dt, game, camera) controls.update(dt, game, camera)
end end
@@ -32,7 +32,7 @@ function love.draw()
function(l,t,w,h) function(l,t,w,h)
stages.draw() stages.draw()
stress.draw() stress.draw()
-- bells.draw(game) bells.draw(game)
end end
) )
controls.draw() controls.draw()