Compare commits

..

6 Commits

Author SHA1 Message Date
145cb5f637 Merge branch 'develop' into feature/in-game-compass
All checks were successful
default-pipeline default-pipeline #151
2021-04-29 19:00:11 +02:00
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
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
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
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
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
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/31
2021-04-29 18:46:26 +02:00
276e331a47
MAPG-167 set background color
All checks were successful
default-pipeline default-pipeline #146
2021-04-29 18:43:30 +02:00
62f4fd7b84 readyToContinue is true by default and set to false only in the multigame initializing
All checks were successful
default-pipeline default-pipeline #145
2021-04-29 13:57:32 +02:00
2 changed files with 8 additions and 1 deletions

View File

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

View File

@ -17,7 +17,7 @@
adaptGuess: false, adaptGuess: false,
googleLink: null, googleLink: null,
readyToContinue: false, readyToContinue: true,
timeoutEnd: null, timeoutEnd: null,
countdownHandler: null, countdownHandler: null,
@ -97,6 +97,8 @@
}, },
initialize: function (data) { initialize: function (data) {
Game.readyToContinue = false;
if (data.history.length === 0 && !data.place) { if (data.history.length === 0 && !data.place) {
var div = document.getElementById('players'); var div = document.getElementById('players');