ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
ntr 2018-11-20 15:36:41 +11:00
parent cd346252cc
commit 70eca5580d
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/scenes/menu.js
View File

@ -8,15 +8,12 @@ class Menu extends Phaser.Scene {
} }
create() { create() {
<<<<<<< HEAD
this.add.text(0, 0, 'cryps.gg', TEXT.HEADER); this.add.text(0, 0, 'cryps.gg', TEXT.HEADER);
=======
this.scene.sleep('Passives'); this.scene.sleep('Passives');
this.add.text(0, 0, 'cryps.gg', { fontFamily: 'Arial', fontSize: 24, color: '#ffffff', fontStyle: 'bold' });
this.input.keyboard.on('keydown_F', () => { this.input.keyboard.on('keydown_F', () => {
this.scene.wake('Passives'); this.scene.wake('Passives');
}, 0, this); }, 0, this);
>>>>>>> ab0aebc49f285e1f0a71035790e3089eadce25f2
} }
} }