added gitlab ci stuff:

This commit is contained in:
Tyrel Souza 2016-04-08 00:24:27 -04:00
parent 695268518a
commit aebe1f2648
2 changed files with 12 additions and 1 deletions

9
.gitlab-ci.yml Normal file
View File

@ -0,0 +1,9 @@
pages:
script:
- mkdir .public
- cp -r * .public
- mv .public public
artifacts:
paths:
- public

View File

@ -13,11 +13,14 @@ game.state.add('play', {
game.load.spritesheet('character', 'assets/arrow_tileset.png', 32, 32);
game.stage.backgroundColor = '#787878';
// load map data
game.load.tilemap('forest1', 'assets/tilemaps/maps/Forest1.json', null, Phaser.Tilemap.TILED_JSON);
game.load.tilemap('forest2', 'assets/tilemaps/maps/Forest2.json', null, Phaser.Tilemap.TILED_JSON);
game.load.tilemap('forest3', 'assets/tilemaps/maps/Forest3.json', null, Phaser.Tilemap.TILED_JSON);
game.load.tilemap('fall1', 'assets/tilemaps/maps/Fall1.json', null, Phaser.Tilemap.TILED_JSON);
game.load.tilemap('fall2', 'assets/tilemaps/maps/Fall2.json', null, Phaser.Tilemap.TILED_JSON);
//load tilesheet data
game.load.image('tiles', 'assets/tilemaps/tiles/tilesheet_complete.png');
this.layers = {};
},
@ -58,7 +61,6 @@ game.state.add('play', {
// collisions between trees
game.physics.p2.convertTilemap(this.map, "Trees");
for (var i in TREE_IDS){
this.map.setCollision(TREE_IDS[i], true, "Trees");
}