Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Gummibeer committed Jan 22, 2017
2 parents eb862ca + 9378588 commit d68113e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 0 deletions.
Binary file added src/img/gravcore-startscreen-team.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/js/scenes/engine/phaser/menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ Menu.prototype = {
this.background_logo.anchor.setTo(0.5, 0.5);
this.background_logo.width = this.game.world.width;
this.background_logo.height = this.game.world.height;
this.creditBtn = this.add.sprite(this.game.world.width-380,this.game.world.height-70,'credit_button');
this.creditBtn.inputEnabled = true;
this.creditBtn.input.useHandCursor = true;
this.creditBtn.events.onInputDown.add(function(){
that.game.state.start('Credit');
}, this);
var that = this;
var style = {font: "bold 32px Arial", fill: "#fff", boundsAlignH: "center", boundsAlignV: "middle"};
var yPosition = 0;
Expand Down
1 change: 1 addition & 0 deletions src/js/scenes/engine/phaser/preloader.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Preloader.prototype = {
this.load.image('credits', 'src/img/credits.jpg');

this.load.image('menu_logo', 'src/img/gravcore-startscreen-logo.png');
this.load.image('credit_button', 'src/img/gravcore-startscreen-team.png');

this.load.image('charackter', 'src/img/Char.png');

Expand Down

0 comments on commit d68113e

Please sign in to comment.