Merge branch 'develop' into feature/in-game-compass

Merge pull request 'Quickfix for single player game cannot be restarted' (#30) from bugfix/quickfix-for-single-play-cannot-be-restarted into develop
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/30 Reviewed-by: Pőcze Bence <bence@pocze.ch>
2021-04-29 19:00:11 +02:00 · 2021-04-29 18:55:58 +02:00 · 2021-04-29 18:55:22 +02:00 · 2021-04-29 18:46:26 +02:00 · 2021-04-29 18:43:30 +02:00 · 2021-04-29 13:57:32 +02:00
2 changed files with 8 additions and 1 deletions
--- a/public/static/css/mapguesser.css
+++ b/public/static/css/mapguesser.css
@ -12,6 +12,10 @@ html, body {
    padding: 0;
 }

+body {
+    background-color: #cccccc;
+}
+
 button::-moz-focus-inner, input::-moz-focus-inner {
    padding: 0;
    border: 0;
@ -374,6 +378,7 @@ header>p>span:not(:last-child) {
 }

 main {
+    background-color: #ffffff;
    padding: 6px 12px;
 }

--- a/public/static/js/game.js
+++ b/public/static/js/game.js
@ -17,7 +17,7 @@
        adaptGuess: false,
        googleLink: null,

-        readyToContinue: false,
+        readyToContinue: true,
        timeoutEnd: null,
        countdownHandler: null,

@ -97,6 +97,8 @@
            },

            initialize: function (data) {
+                Game.readyToContinue = false;
+
                if (data.history.length === 0 && !data.place) {
                    var div = document.getElementById('players');
Author	SHA1	Message	Date
Balázs Vigh	145cb5f637	Merge branch 'develop' into feature/in-game-compass All checks were successful default-pipeline default-pipeline #151 Details	2021-04-29 19:00:11 +02:00
Balázs Vigh	3d663fb5d6	Merge pull request 'Quickfix for single player game cannot be restarted' (#30) from bugfix/quickfix-for-single-play-cannot-be-restarted into develop All checks were successful default-pipeline default-pipeline #149 Details Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/30 Reviewed-by: Pőcze Bence <bence@pocze.ch>	2021-04-29 18:55:58 +02:00
Balázs Vigh	759f654a0d	Merge pull request 'feature/return-to-starting-point-button' (#26) from feature/return-to-starting-point-button into develop All checks were successful default-pipeline default-pipeline #148 Details Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/26 Reviewed-by: Pőcze Bence <bence@pocze.ch>	2021-04-29 18:55:22 +02:00
Pőcze Bence	c09cce3c97	Merge pull request 'MAPG-167 set background color' (#31) from feature/MAPG-167-set-background-color into develop All checks were successful default-pipeline default-pipeline #147 Details Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/31	2021-04-29 18:46:26 +02:00
Pőcze Bence	276e331a47	MAPG-167 set background color All checks were successful default-pipeline default-pipeline #146 Details	2021-04-29 18:43:30 +02:00
Balázs Vigh	62f4fd7b84	readyToContinue is true by default and set to false only in the multigame initializing All checks were successful default-pipeline default-pipeline #145 Details	2021-04-29 13:57:32 +02:00