From 0246fa394e313af4c6da5f7c0b3b95b1f7b136c6 Mon Sep 17 00:00:00 2001 From: Felix Kloft Date: Mon, 13 May 2013 17:11:04 +0200 Subject: [PATCH 1/2] added two patterns to gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 0642e5d0..d2d07c24 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ build localbuildsettings.py *.pyc *.swp +*~ +*.bak From e03899b96f29b3c5c90d13a63268e8095899551d Mon Sep 17 00:00:00 2001 From: Felix Kloft Date: Mon, 13 May 2013 17:11:43 +0200 Subject: [PATCH 2/2] Small bugfix (one semicolon which causes one line of text to be ignored) --- code/boot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/boot.js b/code/boot.js index 80710d29..876a854f 100644 --- a/code/boot.js +++ b/code/boot.js @@ -275,7 +275,7 @@ window.setupPlayerStat = function() { + 'XM:\t' + PLAYER.energy + ' / ' + xmMax + '\n' + 'AP:\t' + digits(ap) + '\n' + (level < 8 ? 'level up in:\t' + lvlUpAp + ' AP' : 'Congrats! (neeeeerd)') - + '\n\Invites:\t'+PLAYER.available_invites; + + '\n\Invites:\t'+PLAYER.available_invites + '\n\nNote: your player stats can only be updated by a full reload (F5)'; $('#playerstat').html(''