Commit Graph

641 Commits

Author SHA1 Message Date
09d1f819a6 organised Leaflet map and Google Maps into wrappers 2021-05-02 12:14:20 +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
8f0cfd4489 replaced spans with divs again and fixed the css issue
All checks were successful
default-pipeline default-pipeline #142
2021-04-29 12:08:04 +02:00
3122696364 added the visibility reset to resetRound and reverted the span div replacement in the view
All checks were successful
default-pipeline default-pipeline #140
2021-04-29 09:07:44 +02:00
462f6cde80 Merge branch 'feature/return-to-starting-point-button' of gitea.e5tv.hu:esoko/mapguesser into feature/return-to-starting-point-button
All checks were successful
default-pipeline default-pipeline #139
2021-04-29 09:05:32 +02:00
3f4fa83d87 reverted replacing spans with divs 2021-04-29 09:04:50 +02:00
f0b0de405c Merge branch 'develop' into feature/return-to-starting-point-button
All checks were successful
default-pipeline default-pipeline #138
2021-04-29 08:25:52 +02:00
ffc4aaf110 fixed findings
All checks were successful
default-pipeline default-pipeline #137
2021-04-29 08:24:20 +02:00
58cdc1be8d
Merge pull request 'fix typo' (#29) from feature/modify-author into develop
All checks were successful
default-pipeline default-pipeline #134
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/29
2021-04-29 00:58:57 +02:00
4039202268
fix typo
All checks were successful
default-pipeline default-pipeline #133
2021-04-29 00:58:20 +02:00
4677cc5229
Merge pull request 'generalize author attribution' (#28) from feature/modify-author into develop
All checks were successful
default-pipeline default-pipeline #131
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/28
2021-04-29 00:53:26 +02:00
8800724aa9
generalize author attribution
All checks were successful
default-pipeline default-pipeline #130
2021-04-29 00:52:46 +02:00
3d52c967b6 reformatted: added new line breaks to the game.css
All checks were successful
default-pipeline default-pipeline #127
2021-04-28 18:30:58 +02:00
5c8f3d6fb9 returns to start when clicked on home symbol
All checks were successful
default-pipeline default-pipeline #126
2021-04-28 18:26:46 +02:00
b9927f79fc added a new button to the view for the return to starting point feature 2021-04-28 17:58:48 +02:00
56f3a9b380 Merge pull request 'Stuck scoring at zero fixed by regular map area update in session' (#24) from bugfix/scoring-stuck-at-zero into develop
All checks were successful
default-pipeline default-pipeline #124
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/24
Reviewed-by: Pőcze Bence <bence@pocze.ch>
2021-04-27 20:36:41 +02:00
a0d41c388b Merge branch 'develop' into bugfix/scoring-stuck-at-zero
All checks were successful
default-pipeline default-pipeline #123
2021-04-27 17:56:52 +02:00
092cc63148 Merge pull request 'jump to coordinate feature added to the header stripe' (#25) from feature/jump-to-specific-coordinates-in-mapeditor into develop
All checks were successful
default-pipeline default-pipeline #122
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/25
Reviewed-by: Pőcze Bence <bence@pocze.ch>
2021-04-27 17:56:35 +02:00
95553296bd removed extra line break
All checks were successful
default-pipeline default-pipeline #121
2021-04-27 17:54:47 +02:00
9330227879 Merge branch 'feature/jump-to-specific-coordinates-in-mapeditor' of gitea.e5tv.hu:esoko/mapguesser into feature/jump-to-specific-coordinates-in-mapeditor
All checks were successful
default-pipeline default-pipeline #120
2021-04-27 17:50:10 +02:00
faaff33841 removed #jumpForm and reformatted the code 2021-04-27 17:48:45 +02:00
508a6899d8 Merge branch 'develop' into bugfix/scoring-stuck-at-zero
All checks were successful
default-pipeline default-pipeline #119
2021-04-27 17:36:18 +02:00
be0f7b64b8 refactored comment
All checks were successful
default-pipeline default-pipeline #118
2021-04-27 17:35:06 +02:00
15e3248ee1 Merge branch 'develop' into feature/jump-to-specific-coordinates-in-mapeditor
All checks were successful
default-pipeline default-pipeline #117
2021-04-27 17:26:44 +02:00
04a897c958 Merge pull request 'folder name db changed to database in the path' (#23) from bugfix/change-path-to-renamed-folder into develop
All checks were successful
default-pipeline default-pipeline #116
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/23
Reviewed-by: Pőcze Bence <bence@pocze.ch>
2021-04-27 17:25:54 +02:00
845d77ebda area of map is updated in the session at each game preparation to avoid outdated map area and wrong score calculation
All checks were successful
default-pipeline default-pipeline #115
2021-04-27 16:46:40 +02:00
8bc3fda49b jump to coordinate feature added to the header stripe
All checks were successful
default-pipeline default-pipeline #114
2021-04-27 10:18:28 +02:00
d78817180b folder name db changed to database in the path
All checks were successful
default-pipeline default-pipeline #113
2021-04-26 20:21:21 +02:00
0f810bd2ba
Merge pull request 'feature/MAPG-228-deploy-signed-and-verified-tags-only' (#22) from feature/MAPG-228-deploy-signed-and-verified-tags-only into develop
All checks were successful
default-pipeline default-pipeline #111
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/22
2021-04-25 15:16:46 +02:00
9d1fc8b60c
MAPG-228 prune local tags when fetching
All checks were successful
default-pipeline default-pipeline #107
2021-04-25 15:11:49 +02:00
dd46fb3d32
MAPG-228 check if the Release* tag is signed and verified 2021-04-25 15:11:20 +02:00
1a40e3a18d
Merge pull request 'MAPG-226 change remaining time calculation' (#21) from feature/MAPG-226-change-timeout-algorithm into develop
All checks were successful
default-pipeline default-pipeline #106
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/21
2021-04-10 19:00:20 +02:00
1aa5d3b43e
MAPG-226 change remaining time calculation 2021-04-10 18:59:27 +02:00
a418d5cf66
Merge pull request 'MAPG-213 move visibility workaround to Game.showResultMap' (#20) from bugfix/MAPG-213-result-map-not-show-on-mobile-after-reload into develop
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/20
2021-04-04 23:41:05 +02:00
5cae286a5b
MAPG-213 move visibility workaround to Game.showResultMap 2021-04-04 23:40:27 +02:00
c5d2591371
Merge pull request 'MAPG-223 send error if member already guessed' (#19) from feature/MAPG-223-user-should-not-be-able-to-guess-after-round-is-over into develop
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/19
2021-04-04 23:29:04 +02:00
cf59f937c9
MAPG-223 send error if member already guessed
All checks were successful
default-pipeline default-pipeline #104
2021-04-04 23:28:44 +02:00
257f59c96e
Merge pull request 'MAPG-222 fixes: skip invalid guessPosition, hide showSummaryButton, handle countdown time if timeout is 0' (#18) from bugfix/MAPG-222-show-summary-can-be-clicked-when-game-is-restarted into develop
All checks were successful
default-pipeline default-pipeline #98
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/18
2021-04-04 23:05:47 +02:00
c2f5806394
MAPG-222 fixes: skip invalid guessPosition, hide showSummaryButton, handle countdown time if timeout is 0
All checks were successful
default-pipeline default-pipeline #96
2021-04-04 23:04:07 +02:00
ac0b71fe09
Merge pull request 'feature/MAPG-213-user-shouldn-t-be-able-to-re-guess-when-page-is-reloaded' (#17) from feature/MAPG-213-user-shouldn-t-be-able-to-re-guess-when-page-is-reloaded into develop
All checks were successful
default-pipeline default-pipeline #94
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/17
2021-04-04 22:31:29 +02:00
19f7b50002
MAPG-213 show results immediately if user already guessed
All checks were successful
default-pipeline default-pipeline #91
2021-04-04 22:24:40 +02:00
6342bb1e79
MAPG-213 send round data at initialization if user guessed 2021-04-04 22:18:00 +02:00
3abdb6910e
MAPG-213 clean up init
All checks were successful
default-pipeline default-pipeline #90
2021-04-04 20:52:28 +02:00
7d2588f7cd
Merge pull request 'feature/MAPG-219-disable-continue-if-timeout-is-not-reached' (#16) from feature/MAPG-219-disable-continue-if-timeout-is-not-reached into develop
All checks were successful
default-pipeline default-pipeline #88
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/16
2021-04-04 19:23:08 +02:00
be40acdb2d
MAPG-219 disable continue button until round is over
All checks were successful
default-pipeline default-pipeline #84
2021-04-04 18:48:31 +02:00
a2f2080959
MAPG-219 send 'end_round' when all members are finished
All checks were successful
default-pipeline default-pipeline #83
2021-04-04 17:43:37 +02:00