From 28b79a9fd250bf0a668037c910af4972cafaaf4a Mon Sep 17 00:00:00 2001
From: Jacob Wahlgren <jacob.wahlgren@gmail.com>
Date: Tue, 29 Sep 2015 20:59:17 +0200
Subject: [PATCH 1/5] Improve gitignore

---
 .gitignore | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index bf1ba79..4ff9ef8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -148,4 +148,7 @@ node_modules
 .lock-wscript
 
 ### Webpack
-dist/
\ No newline at end of file
+dist/
+
+### OS X files
+/**/.DS_Store

From 54161d247a4d591685b7859bd332374b1190ae41 Mon Sep 17 00:00:00 2001
From: Jacob Wahlgren <jacob.wahlgren@gmail.com>
Date: Tue, 29 Sep 2015 21:01:24 +0200
Subject: [PATCH 2/5] Fix protocol regex

---
 src/server_interface/server_interface.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server_interface/server_interface.js b/src/server_interface/server_interface.js
index de898d6..21a1224 100644
--- a/src/server_interface/server_interface.js
+++ b/src/server_interface/server_interface.js
@@ -1,7 +1,7 @@
 'use strict';
 
 // checks if the string begins with either ws:// or wss://
-var wsProtocolFinder = /ws(s)*:\/\//;
+var wsProtocolFinder = /ws(s)?:\/\//;
 var SOCKET_OPEN = 1;
 
 var MAIN_LOBBY = 1;

From 469284e14c17c4f827005f1e48f98a463cce67ed Mon Sep 17 00:00:00 2001
From: Jacob Wahlgren <jacob.wahlgren@gmail.com>
Date: Tue, 29 Sep 2015 21:30:50 +0200
Subject: [PATCH 3/5] Display player resources as 'Max mana'

More user friendly than 'MAX_MANA'.
---
 src/game_board/game_board.html | 2 +-
 src/game_board/module.js       | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/game_board/game_board.html b/src/game_board/game_board.html
index 04b4799..ba8022d 100644
--- a/src/game_board/game_board.html
+++ b/src/game_board/game_board.html
@@ -12,7 +12,7 @@
                     ng-class="{'selected': info.selected, 'targetable': doingAction && targets.indexOf(info.id) !== -1}">{{info.name}}</h4>
                 <ul style="list-style: none outside none; margin: 0; padding: 0;">
                     <li ng-repeat="(name, value) in info.properties">
-                        <b>{{name}}</b>: {{value}}
+                        <b>{{name | capitalize}}</b>: {{value}}
                     </li>
                     <li><b>CARDS: </b>{{info.zones.Hand.length()}}</li>
                 </ul>
diff --git a/src/game_board/module.js b/src/game_board/module.js
index 4ad9b28..aaa13f4 100644
--- a/src/game_board/module.js
+++ b/src/game_board/module.js
@@ -62,4 +62,10 @@ module.exports = angular.module('cardshifter.gameBoard', [ngRoute, ngAnimate, se
         replace: true,
         template: require('../card_model/card_template.html')
     };
+  })
+  .filter('capitalize', function() {
+      return function(input, scope) {
+          input = input.replace(/_/g, ' ');
+          return input.substring(0, 1).toUpperCase() + input.substring(1).toLowerCase();
+      }
   });

From e555f0ec5eab06de326919a8f7ef10a8ca4eeec1 Mon Sep 17 00:00:00 2001
From: Jacob Wahlgren <jacob.wahlgren@gmail.com>
Date: Tue, 29 Sep 2015 21:50:46 +0200
Subject: [PATCH 4/5] Display as 'Cards' instead of 'CARDS'

---
 src/game_board/game_board.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game_board/game_board.html b/src/game_board/game_board.html
index ba8022d..480aa02 100644
--- a/src/game_board/game_board.html
+++ b/src/game_board/game_board.html
@@ -14,7 +14,7 @@
                     <li ng-repeat="(name, value) in info.properties">
                         <b>{{name | capitalize}}</b>: {{value}}
                     </li>
-                    <li><b>CARDS: </b>{{info.zones.Hand.length()}}</li>
+                    <li><b>Cards: </b>{{info.zones.Hand.length()}}</li>
                 </ul>
                 <!-- Action buttons -->
                 <div class="player-actions">

From 4f6041c7f495f90f1987d69a5b20bdb854e8d45c Mon Sep 17 00:00:00 2001
From: Jacob Wahlgren <jacob.wahlgren@gmail.com>
Date: Thu, 1 Oct 2015 02:23:03 +0200
Subject: [PATCH 5/5] Rename filter to 'formatResourceName'

---
 src/game_board/game_board.html | 2 +-
 src/game_board/module.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/game_board/game_board.html b/src/game_board/game_board.html
index 480aa02..0a681ce 100644
--- a/src/game_board/game_board.html
+++ b/src/game_board/game_board.html
@@ -12,7 +12,7 @@
                     ng-class="{'selected': info.selected, 'targetable': doingAction && targets.indexOf(info.id) !== -1}">{{info.name}}</h4>
                 <ul style="list-style: none outside none; margin: 0; padding: 0;">
                     <li ng-repeat="(name, value) in info.properties">
-                        <b>{{name | capitalize}}</b>: {{value}}
+                        <b>{{name | formatResourceName}}</b>: {{value}}
                     </li>
                     <li><b>Cards: </b>{{info.zones.Hand.length()}}</li>
                 </ul>
diff --git a/src/game_board/module.js b/src/game_board/module.js
index aaa13f4..096f1b4 100644
--- a/src/game_board/module.js
+++ b/src/game_board/module.js
@@ -63,7 +63,7 @@ module.exports = angular.module('cardshifter.gameBoard', [ngRoute, ngAnimate, se
         template: require('../card_model/card_template.html')
     };
   })
-  .filter('capitalize', function() {
+  .filter('formatResourceName', function() {
       return function(input, scope) {
           input = input.replace(/_/g, ' ');
           return input.substring(0, 1).toUpperCase() + input.substring(1).toLowerCase();