Merge branch 'gemp-dev' into card-dev

# Conflicts:
#	.gitignore

.gitignore

@@ -18,3 +18,4 @@ logs/*
 .idea/
 *.iml
 remote-sync
+replay

gemp-lotr/gemp-lotr-async/src/main/web/game.html

@@ -43,6 +43,9 @@
     <script type="text/javascript" src="js/gemp-022/gameAnimations.js"></script>
     <script type="text/javascript" src="js/gemp-022/merchantUi.js"></script>
     
+    <!-- Audio file downloaded from https://material.io/design/sound/sound-resources.html -->
+    <audio id="awaitAction" src="/gemp-lotr/awaiting_decision.mp3" type="audio/mpeg" preload="metadata"></audio>
+
 
 <script type="text/javascript">
     var ui;

gemp-lotr/gemp-lotr-async/src/main/web/hall.html

@@ -43,6 +43,8 @@
     <script type="text/javascript" src="js/gemp-022/gameAnimations.js"></script>
     <script type="text/javascript" src="js/gemp-022/merchantUi.js"></script>
 
+    <audio id="gamestart" src="/gemp-lotr/fanfare_x.mp3" type="audio/mpeg" preload="metadata"></audio>
+    
 <script type="text/javascript">
     var chat;
     var hall;
@@ -145,6 +147,8 @@
         chat.setBounds(2, 2, innerWidth - 4, middleHeight - 4);
         hall.hallResized(innerWidth, middleHeight);
     }
+    
+    
 </script>
 
 </head>

gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/gameUi.js

@@ -1536,7 +1536,10 @@ var GempLotrGameUI = Class.extend({
                 this.smallDialog.append(but);
             }
             if (!this.replayMode)
+            {
                 this.smallDialog.dialog("option", "buttons", {});
+                this.PlaySound("awaitAction");
+            }
         }
 
         this.smallDialog.dialog("open");
@@ -1798,7 +1801,10 @@ var GempLotrGameUI = Class.extend({
 
         allowSelection();
         if (!this.replayMode)
+        {
             processButtons();
+            this.PlaySound("awaitAction");
+        }
 
         openSizeDialog(this.cardActionDialog);
         this.arbitraryDialogResize(false);
@@ -1940,11 +1946,19 @@ var GempLotrGameUI = Class.extend({
 
         allowSelection();
         if (!this.replayMode)
+        {
             processButtons();
+            this.PlaySound("awaitAction");
+        }
 
         $(':button').blur();
     },
     
+    PlaySound: function(soundObj) {
+        var myAudio = document.getElementById(soundObj);
+        myAudio.play();
+    },
+
     createActionChoiceContextMenu: function (actions, event, selectActionFunction) {
         // Remove context menus that may be showing
         $(".contextMenu").remove();
@@ -2071,7 +2085,10 @@ var GempLotrGameUI = Class.extend({
 
         allowSelection();
         if (!this.replayMode)
+        {
             processButtons();
+            this.PlaySound("awaitAction");
+        }
 
         openSizeDialog(this.cardActionDialog);
         this.arbitraryDialogResize(false);
@@ -2151,7 +2168,10 @@ var GempLotrGameUI = Class.extend({
 
         allowSelection();
         if (!this.replayMode)
+        {
             processButtons();
+            this.PlaySound("awaitAction");
+        }
     },
 
     assignMinionsDecision: function (decision) {
@@ -2199,6 +2219,8 @@ var GempLotrGameUI = Class.extend({
                 that.clearSelection();
 
                 that.decisionFunction(id, "" + assignmentArray);
+                
+                this.PlaySound("awaitAction");
             });
         }
 

gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js

@@ -398,6 +398,11 @@ var GempLotrHallUI = Class.extend({
             .animate({borderTopColor:"#ffffff", borderLeftColor:"#ffffff", borderBottomColor:"#ffffff", borderRightColor:"#ffffff"}, "fast");
     },
     
+    PlaySound: function(soundObj) {
+        var myAudio = document.getElementById(soundObj);
+        myAudio.play();
+    },
+
     processHall:function (xml) {
         var that = this;
 
@@ -678,12 +683,14 @@ var GempLotrHallUI = Class.extend({
                 window.open("/gemp-lotr/game.html?gameId=" + waitingGameId + participantIdAppend, "_blank");
             }
             if (games.length > 0) {
-                var soundPlay = $("<embed src='/gemp-lotr/fanfare_x.wav' hidden='true' autostart='true' loop='false'>");
+                // var soundPlay = $("<embed src='/gemp-lotr/fanfare_x.mp3' hidden='true' autostart='true' loop='false'>");
-                this.tablesDiv.append(soundPlay);
+                // this.tablesDiv.append(soundPlay);
-                setTimeout(
+                // setTimeout(
-                    function() {
+                //     function() {
-                        soundPlay.remove();
+                //         soundPlay.remove();
-                    }, 5000);
+                //     }, 5000);
+                
+                this.PlaySound("gamestart");
             }
 
             if (!this.supportedFormatsInitialized) {