Compare commits

...

12 Commits

Author SHA1 Message Date
d42280eb10 only the image is rotated, not the whole div
All checks were successful
default-pipeline default-pipeline #141
2021-04-29 09:18:24 +02:00
0739c65961 Merge branch 'feature/return-to-starting-point-button' into feature/in-game-compass 2021-04-29 09:11:32 +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
ea599809b8 Merge branch 'feature/return-to-starting-point-button' into feature/in-game-compass 2021-04-29 08:34:39 +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
5 changed files with 16 additions and 12 deletions

View File

@ -8,6 +8,6 @@
"ws": "^7.4.4"
},
"scripts": {},
"author": "Pőcze Bence <bence@pocze.ch>",
"author": "Pőcze Bence and The MapGuesser Contributors <bence@pocze.ch>",
"license": "GNU AGPL 3.0"
}

View File

@ -157,6 +157,7 @@
#navigation .navigationItem {
margin-top: 10px;
opacity: 70%;
cursor: pointer;
}
#navigation .navigationItem:hover {
@ -188,9 +189,9 @@
}
#showGuessButtonContainer {
position: absolute;
left: 60px;
left: 65px;
bottom: 30px;
right: 60px;
right: 20px;
z-index: 2;
}
#guess {

View File

@ -334,6 +334,9 @@
document.getElementById('guess').style.visibility = null;
document.getElementById('guess').classList.remove('result');
// needs to be set visible after the show guess map hid it in mobile view
document.getElementById("navigation").style.visibility = 'visible';
Game.initialize();
},
@ -358,7 +361,10 @@
document.getElementById('panoCover').style.visibility = 'hidden';
document.getElementById('showGuessButton').style.visibility = null;
document.getElementById('guess').style.visibility = null;
document.getElementById('guess').classList.remove('result')
document.getElementById('guess').classList.remove('result');
// needs to be set visible after the show guess map hid it in mobile view
document.getElementById("navigation").style.visibility = 'visible';
Game.map.setOptions({
draggableCursor: 'crosshair'
@ -380,12 +386,9 @@
Game.loadPano(Game.panoId, Game.pov);
// needs to be set visible after the show guess map hid it in mobile view
document.getElementById("navigation").style.visibility = 'visible';
// update the compass
const heading = Game.panorama.getPov().heading;
document.getElementById("compass").style.transform = "rotate(" + heading + "deg)";
document.getElementById("compass").style.transform = "translateY(-50%) rotate(" + heading + "deg)";
},
handleErrorResponse: function (error) {
@ -864,7 +867,7 @@
Game.rewriteGoogleLink();
const heading = Game.panorama.getPov().heading;
document.getElementById("compass").style.transform = "rotate(" + heading + "deg)";
document.getElementById("compass").style.transform = "translateY(-50%) rotate(" + heading + "deg)";
});
if (COOKIES_CONSENT) {

View File

@ -60,12 +60,12 @@
</div>
</div>
<div id="navigation">
<div id="compass" class="navigationItem">
<div class="navigationItem">
<span>
<img src="<?= $_ENV['STATIC_ROOT'] ?>/img/circle_background.svg?rev=<?= REVISION ?>" alt="Circle Background" class="circleBackground" />
</span>
<span>
<img src="<?= $_ENV['STATIC_ROOT'] ?>/img/compass.svg?rev=<?= REVISION ?>" alt="compass icon" class="navigationIcon" />
<img id="compass" src="<?= $_ENV['STATIC_ROOT'] ?>/img/compass.svg?rev=<?= REVISION ?>" alt="compass icon" class="navigationIcon" />
</span>
</div>
<div id="returnToStart" class="navigationItem">

View File

@ -29,6 +29,6 @@
</main>
<footer>
<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>
@endsection