Commit Graph

856 Commits

Author SHA1 Message Date
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
cc49c56075
Merge pull request 'feature/MAPG-205-set-timeout-in-multiplayer-rooms' (#15) from feature/MAPG-205-set-timeout-in-multiplayer-rooms into develop
All checks were successful
default-pipeline default-pipeline #82
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/15
2021-04-04 14:22:59 +02:00
69329b9f81
MAPG-205 show countdown time
All checks were successful
default-pipeline default-pipeline #80
2021-04-04 14:22:10 +02:00
20914b466e
MAPG-205 add elements for showing countdown 2021-04-04 14:20:12 +02:00
3630637ec1
MAPG-205 handle round timeout on frontend 2021-04-04 14:20:12 +02:00
42224b074e
MAPG-205 set timeout for rounds 2021-04-04 14:20:12 +02:00
0e8ed14305
MAPG-205 delete unnecessary empty lines 2021-04-03 23:39:20 +02:00
d3a12fb6f1
Merge pull request 'feature/MAPG-204-show-guesses-from-others' (#14) from feature/MAPG-204-show-guesses-from-others into develop
All checks were successful
default-pipeline default-pipeline #76
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/14
2021-04-03 22:13:52 +02:00
3f9d104adc
MAPG-204 show guesses from others
All checks were successful
default-pipeline default-pipeline #72
2021-04-03 22:10:21 +02:00
9e5d20796c
MAPG-204 clean up result sending 2021-04-03 18:24:43 +02:00
7433813337
Merge pull request 'MAPG-208 error handling adaptations' (#13) from bugfix/MAPG-208-error-messages into develop
All checks were successful
default-pipeline default-pipeline #75
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/13
2021-03-21 16:39:43 +01:00
42854fe975
MAPG-208 error handling adaptations
All checks were successful
default-pipeline default-pipeline #53
2021-03-21 14:37:08 +01:00
71681f1e55
Merge pull request 'MAPG-207 don't use MapGuesser.showmodal for modal 'multi'' (#12) from bugfix/MAPG-207-prevent-closing-multi-modal into develop
All checks were successful
default-pipeline default-pipeline #50
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/12
2021-03-21 12:47:35 +01:00
1cf0ab44fd
MAPG-207 don't use MapGuesser.showmodal for modal 'multi'
All checks were successful
default-pipeline default-pipeline #49
2021-03-21 12:45:57 +01:00
fc9eb183f1
Merge pull request 'MAPG-203 fix wrong variable name' (#11) from bugfix/MAPG-203-fix-condition-in-js into develop
All checks were successful
default-pipeline default-pipeline #46
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/11
2021-03-20 22:26:33 +01:00
d431a693fc
MAPG-203 fix wrong variable name
All checks were successful
default-pipeline default-pipeline #45
2021-03-20 22:24:47 +01:00
ace490b7e9
Merge pull request 'MAPG-203 use MULTI_WS_URL environment variable' (#10) from feature/MAPG-203-fine-tune-env-variables into develop
All checks were successful
default-pipeline default-pipeline #43
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/10
2021-03-20 21:24:20 +01:00
e3771d36ce
MAPG-203 use MULTI_WS_URL environment variable
All checks were successful
default-pipeline default-pipeline #42
2021-03-20 21:21:40 +01:00
6e03476173
Merge pull request 'bugfix/MAPG-203-fix-singleplayer' (#9) from bugfix/MAPG-203-fix-singleplayer into develop
All checks were successful
default-pipeline default-pipeline #39
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/9
2021-03-20 21:00:14 +01:00
f3ec71d6dd
MAPG-203 fix condition in game.js
All checks were successful
default-pipeline default-pipeline #38
2021-03-20 20:59:10 +01:00
c2f0a1dd51
MAPG-203 fix signatures in GameController 2021-03-20 20:58:57 +01:00
a417fbd760
Merge pull request 'feature/MAPG-203-initial-multiplayer-implementation' (#8) from feature/MAPG-203-initial-multiplayer-implementation into develop
All checks were successful
default-pipeline default-pipeline #37
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/8
2021-03-20 20:46:36 +01:00
a9cda56586
MAPG-203 install NPM packages on install and update
All checks were successful
default-pipeline default-pipeline #36
2021-03-20 19:45:21 +01:00
02fcbd2f9c
MAPG-203 prepare GameFlowController for multiplayer 2021-03-20 19:45:21 +01:00
2f665381c3
MAPG-203 prepare GameController for multiplayer 2021-03-20 19:45:21 +01:00
573440868e
MAPG-203 add new routes for multiplayer 2021-03-20 19:45:21 +01:00
79490a0616
MAPG-203 add class for multiplayer internal connection (PHP-NodeJS TCP) 2021-03-20 19:45:21 +01:00
ed343f2359
MAPG-203 add new environment variables 2021-03-20 19:45:20 +01:00
563f900423
MAPG-203 implement game mode selection UI 2021-03-20 19:45:20 +01:00
24a10c534e
MAPG-203 frontend adaptations for multiplayer 2021-03-20 19:44:48 +01:00
0cbb7ba145
MAPG-203 add debugger config for NodeJS 2021-03-20 19:44:48 +01:00
5dd2ce0d5a
MAPG-203 add cleanup for multi_rooms to db:maintain 2021-03-20 19:44:48 +01:00
e5fb725c69
MAPG-203 add new table and model for multi_room 2021-03-20 19:44:48 +01:00
fc40c18679
MAPG-203 multiplayer handler server (NodeJS) 2021-03-20 19:44:48 +01:00
4fabc39d44
MAPG-203 restructure Docker stack 2021-03-20 19:44:48 +01:00
2120fbebbc
MAPG-203 add Dockerfile for multiplayer (NodeJS) 2021-03-20 19:44:47 +01:00