Merge branch 'master' of https://gitlab.com/spark-imagination/speeltuin
@@ -32,7 +32,13 @@ window.onload = function ()
32
32
{ name: "tile_floor_brown", url: "images/tile/tile_floor_brown.png" },
33
33
{ name: "tile_floor_explosion", url: "images/tile/tile_floor_explosion_anim.png", subImgTotal: 10, perRow: 5 },
34
34
{ name: "fruit", url: "images/object/fruit.png", subImgTotal: 15, perRow: 8 },
35
{ name: "spacebar", url: "images/spacebar.png" }
35
{ name: "spacebar", url: "images/spacebar.png" },
36
37
{ name: "menuButton", url: "images/buttons/menubutton.png", subImgTotal: 1, perRow: 1 },
38
{ name: "btnFruit", url: "images/buttons/menubutton_fruit.png", subImgTotal: 1, perRow: 1 },
39
{ name: "btnToys", url: "images/buttons/menubutton_toys.png", subImgTotal: 1, perRow: 1 },
40
{ name: "btnGames", url: "images/buttons/menubutton_games.png", subImgTotal: 1, perRow: 1 },
41
{ name: "btnPlants", url: "images/buttons/menubutton_plants.png", subImgTotal: 1, perRow: 1 }
36
42
]
37
43
, function ()
38
44
{
@@ -120,6 +126,8 @@ createMainScene = function (game)
120
126
chao = new Chao(60, 60, game.images.chao_default, 0);
121
127
scene.addObject(chao);
122
128
129
scene.addObject(new MenuManager(0, 150, game.images.menuButton, 0));
130
123
131
createSubScene(scene);
124
132
};
125
133
@@ -32,7 +32,13 @@ window.onload = function ()32
{ name: "tile_floor_brown", url: "images/tile/tile_floor_brown.png" },32
{ name: "tile_floor_brown", url: "images/tile/tile_floor_brown.png" },33
{ name: "tile_floor_explosion", url: "images/tile/tile_floor_explosion_anim.png", subImgTotal: 10, perRow: 5 },33
{ name: "tile_floor_explosion", url: "images/tile/tile_floor_explosion_anim.png", subImgTotal: 10, perRow: 5 },34
{ name: "fruit", url: "images/object/fruit.png", subImgTotal: 15, perRow: 8 },34
{ name: "fruit", url: "images/object/fruit.png", subImgTotal: 15, perRow: 8 },35
{ name: "spacebar", url: "images/spacebar.png" }35
{ name: "spacebar", url: "images/spacebar.png" },36
37
{ name: "menuButton", url: "images/buttons/menubutton.png", subImgTotal: 1, perRow: 1 },38
{ name: "btnFruit", url: "images/buttons/menubutton_fruit.png", subImgTotal: 1, perRow: 1 },39
{ name: "btnToys", url: "images/buttons/menubutton_toys.png", subImgTotal: 1, perRow: 1 },40
{ name: "btnGames", url: "images/buttons/menubutton_games.png", subImgTotal: 1, perRow: 1 },41
{ name: "btnPlants", url: "images/buttons/menubutton_plants.png", subImgTotal: 1, perRow: 1 }36
]42
]37
, function ()43
, function ()38
{44
{@@ -120,6 +126,8 @@ createMainScene = function (game)120
chao = new Chao(60, 60, game.images.chao_default, 0);126
chao = new Chao(60, 60, game.images.chao_default, 0);121
scene.addObject(chao);127
scene.addObject(chao);122
128
129
scene.addObject(new MenuManager(0, 150, game.images.menuButton, 0));130
123
createSubScene(scene);131
createSubScene(scene);124
};132
};125
133