Develop #4

Merged
wariosolis merged 35 commits from develop into master 2017-01-04 00:04:34 +01:00
3 changed files with 9 additions and 2 deletions
Showing only changes of commit 633f2b5a00 - Show all commits
+8
View File
@@ -92,6 +92,13 @@ function bell.update(dt, game, cam)
end end
end end
end end
for key, bell in pairs(bells) do
for key, collision in pairs(bell.collisions) do
for shape, delta in pairs(HC.collisions(bell.collisions[key])) do
bell.enable[key] = true
end
end
end
-- Logic -- Logic
local num_enable = 0 local num_enable = 0
for key, bell in pairs(bells) do for key, bell in pairs(bells) do
@@ -129,6 +136,7 @@ function bell.update(dt, game, cam)
bell.active = true bell.active = true
bell.animation:resume() bell.animation:resume()
bell.sound_good:play() bell.sound_good:play()
bell.animation:resume()
for key, item in pairs(bell.enable) do for key, item in pairs(bell.enable) do
bell.enable[key] = false bell.enable[key] = false
end end
-1
View File
@@ -10,7 +10,6 @@ function game.load()
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 = 6 game.end_level = 6
love.window.setMode(game.window.width, game.window.height) love.window.setMode(game.window.width, game.window.height)
-- Physics -- Physics
+1 -1
View File
@@ -19,7 +19,7 @@ end
-- UPDATE -- UPDATE
function love.update(dt) function love.update(dt)
require('assets/scripts/vendor/lovebird').update() --require('assets/scripts/vendor/lovebird').update()
game.world:update(dt) game.world:update(dt)
game.update(dt) game.update(dt)
camera.update(game) camera.update(game)