Compare commits

..
Author SHA1 Message Date
bence 58cdc1be8d Merge pull request 'fix typo' (#29) from feature/modify-author into develop
default-pipeline default-pipeline #134
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/29
2021-04-29 00:58:57 +02:00
bence 4039202268 fix typo
default-pipeline default-pipeline #133
2021-04-29 00:58:20 +02:00
bence 4677cc5229 Merge pull request 'generalize author attribution' (#28) from feature/modify-author into develop
default-pipeline default-pipeline #131
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/28
2021-04-29 00:53:26 +02:00
bence 8800724aa9 generalize author attribution
default-pipeline default-pipeline #130
2021-04-29 00:52:46 +02:00
balazs 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
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
balazs a0d41c388b Merge branch 'develop' into bugfix/scoring-stuck-at-zero
default-pipeline default-pipeline #123
2021-04-27 17:56:52 +02:00
balazs 95553296bd removed extra line break
default-pipeline default-pipeline #121
2021-04-27 17:54:47 +02:00
balazs 508a6899d8 Merge branch 'develop' into bugfix/scoring-stuck-at-zero
default-pipeline default-pipeline #119
2021-04-27 17:36:18 +02:00
balazs be0f7b64b8 refactored comment
default-pipeline default-pipeline #118
2021-04-27 17:35:06 +02:00
balazs 845d77ebda area of map is updated in the session at each game preparation to avoid outdated map area and wrong score calculation
default-pipeline default-pipeline #115
2021-04-27 16:46:40 +02:00
3 changed files with 5 additions and 2 deletions

No files matched your search

+1 -1
View File
@@ -8,6 +8,6 @@
"ws": "^7.4.4" "ws": "^7.4.4"
}, },
"scripts": {}, "scripts": {},
"author": "Pőcze Bence <bence@pocze.ch>", "author": "Pőcze Bence and The MapGuesser Contributors <bence@pocze.ch>",
"license": "GNU AGPL 3.0" "license": "GNU AGPL 3.0"
} }
+3
View File
@@ -92,6 +92,9 @@ class GameController
'rounds' => [], 'rounds' => [],
'currentRound' => -1 'currentRound' => -1
]); ]);
} else { // update the area of the map in the session in any case
$state['area'] = $map->getArea();
$session->set('state', $state);
} }
return new JsonContent([ return new JsonContent([
+1 -1
View File
@@ -29,6 +29,6 @@
</main> </main>
<footer> <footer>
<p><span class="bold"><?= $_ENV['APP_NAME'] ?></span> <?= str_replace('Release_', '', VERSION) ?></p><!-- <p><span class="bold"><?= $_ENV['APP_NAME'] ?></span> <?= str_replace('Release_', '', VERSION) ?></p><!--
--><p>&copy; Pőcze Bence <?= (new DateTime(REVISION_DATE))->format('Y') ?></p> --><p>&copy; The MapGuesser Contributors <?= (new DateTime(REVISION_DATE))->format('Y') ?></p>
</footer> </footer>
@endsection @endsection