Commit Graph
100 Commits
Author SHA1 Message Date
bence c9c23e912f Merged in develop (pull request #44)
Develop
2020-05-24 13:46:59 +00:00
bence 4dbb8a7cba Merged in feature/MAPG-62-minify-svg-after-deployment (pull request #43)
Feature/MAPG-62 minify svg after deployment
2020-05-24 13:44:00 +00:00
bence 334038dc97 MAPG-62 add html-minifier to Dockerfile 2020-05-24 15:43:22 +02:00
bence 0b7012b4d2 MAPG-62 minify SVG files with html-minifier
put minify calls into separate sh script
2020-05-24 15:42:29 +02:00
bence 0c97d0301d Merged in bugfix/MAPG-59-avoid-overlapping-markers-on-summary (pull request #42)
MAPG-59 fix overlapping markers
2020-05-24 13:01:43 +00:00
bence a6541d1152 MAPG-59 fix overlapping markers
- real markers are always over guess markers
- latest marker is always over the old marker in real/guess group
2020-05-24 15:00:58 +02:00
bence b32cfacdad Merged in feature/MAPG-61-prevent-leaving-page-accidentall (pull request #41)
MAPG-61 add onbeforeunload function to prevent accidental leave
2020-05-24 12:47:48 +00:00
bence 92408d6f02 MAPG-61 add onbeforeunload function to prevent accidental leave 2020-05-24 14:47:15 +02:00
bence 830989dc4c Merged in master (pull request #40)
MAPG-60 fix JS syntax error
2020-05-24 12:12:12 +00:00
bence 605149ab71 Merged in feature/MAPG-52-find-new-loading-animation (pull request #39)
MAPG-52 replace loading animation
2020-05-24 12:04:43 +00:00
bence 4641aa81f8 MAPG-52 replace loading animation 2020-05-24 14:02:42 +02:00
bence 9ef0a9ac79 Merged in hotfix/MAPG-60-fix-js-syntax-error (pull request #38)
MAPG-60 fix JS syntax error
2020-05-23 00:35:27 +00:00
bence 1c0e423811 MAPG-60 fix JS syntax error 2020-05-23 02:35:01 +02:00
bence 5006aae59a Merged in master (pull request #37)
MAPG-51 fix page overflow (showGuessButtonContainer is not absolute in non-mobile mode)
2020-05-23 00:19:31 +00:00
bence 28aaaf1172 Merged in develop (pull request #36)
develop
2020-05-23 00:18:07 +00:00
bence df09dff48b Merged in feature/MAPG-58-make-result-info-fixed-height (pull request #35)
MAPG-58 make resultinfo fixed height and move out continue button
2020-05-23 00:09:08 +00:00
bence b2ac6d774b Merged in feature/MAPG-57-decrease-results-margin (pull request #34)
MAPG-57 decrease result's margin to minimal in case of low height
2020-05-23 00:08:41 +00:00
bence 3285ce2a4f MAPG-58 make resultinfo fixed height and move out continue button 2020-05-23 02:07:50 +02:00
bence 8fa8b501ed MAPG-57 decrease result's margin to minimal in case of low height 2020-05-23 01:34:40 +02:00
bence d6cafdeb06 Merged in feature/MAPG-54-show-round-and-score-continously (pull request #33)
MAPG-54 introduce round info - current round number and score
2020-05-22 23:26:48 +00:00
bence e8492994dd MAPG-54 introduce round info - current round number and score 2020-05-23 01:25:43 +02:00
bence 4c850b30a4 Merged in feature/MAPG-55-mark-places-with-labels-on-summa (pull request #32)
Feature/MAPG-55 mark places with labels on summa
2020-05-22 21:57:41 +00:00
bence cb433ce822 MAPG-55 add title for real marker 2020-05-22 23:55:09 +02:00
bence 5c309cd05f MAPG-55 set markers' z-index (real marker should always be over guess marker) 2020-05-22 23:50:14 +02:00
bence 23b18a8e13 MAPG-55 set marker labels with round numbers 2020-05-22 23:45:31 +02:00
bence b7679254c7 Merged in bugfix/MAPG-53-fix-js-exception (pull request #31)
MAPG-53 check if Core.googleLink is not null before trying to modify it
2020-05-22 21:33:03 +00:00
bence e836a6b2b9 Merged in feature/MAPG-56-change-disabled-buttons-cursor (pull request #30)
MAPG-56 change disabled button's cursor to 'not-allowed'
2020-05-22 21:32:56 +00:00
bence 94037dda31 MAPG-53 check if Core.googleLink is not null before trying to modify it 2020-05-22 23:32:17 +02:00
bence fd3cd5e673 MAPG-56 change disabled button's cursor to 'not-allowed' 2020-05-22 23:29:04 +02:00
bence 4a1bb0fef6 Merged in feature/MAPG-20-make-it-work-with-1-map-instance (pull request #29)
Feature/MAPG-20 make it work with 1 map instance
2020-05-22 21:27:50 +00:00
bence f110bb9b18 MAPG-20 rename guessMap to map 2020-05-22 23:23:54 +02:00
bence 96ee250f96 MAPG-20 merge guessMap and resultMap into one map 2020-05-22 23:22:11 +02:00
bence cc99848ae8 Merged in develop (pull request #28)
Develop
2020-05-22 00:06:33 +00:00
bence 67358d91ea Merged in feature/MAPG-25-multi-round-score-localstorage (pull request #27)
Feature/MAPG-25 multi round score localstorage
2020-05-21 23:46:21 +00:00
bence dca88ac9a0 MAPG-25 don't query place in GameController 2020-05-22 01:32:30 +02:00
bence 41456098bf MAPG-25 store rounds and score sum in sessionStorage 2020-05-22 01:31:32 +02:00
bence b0b95fbbee MAPG-25 implement multi round game
refator of JS code
2020-05-21 23:55:59 +02:00
bence eeceed1d58 Merged in hotfix/MAPG-51-fix-page-overflow-scrollbar-visi (pull request #26)
MAPG-51 fix page overflow (showGuessButtonContainer is not absolute in non-mobile mode)
2020-05-21 13:55:55 +00:00
bence 25e87e4626 MAPG-51 fix page overflow (showGuessButtonContainer is not absolute in non-mobile mode) 2020-05-21 15:55:18 +02:00
bence 5271dca19a Merged in develop (pull request #25)
Develop
2020-05-21 13:23:12 +00:00
bence 8cf727a54a Merged in bugfix/MAPG-40-fix-invalid-usage-of-math.ceil (pull request #24)
MAPG-40 use Math.floor instead of accidentally used Math.ceil
2020-05-21 13:19:51 +00:00
bence 3d636be4ea MAPG-40 use Math.floor instead of accidentally used Math.ceil 2020-05-21 15:19:05 +02:00
bence d7fbb717bc Merged in feature/MAPG-39-improve-controllability-mainly-on-mobile- (pull request #23)
MAPG-39 increase spaces between elements
2020-05-21 13:11:13 +00:00
bence 532bc0416d MAPG-39 increase spaces between elements 2020-05-21 15:10:15 +02:00
bence f6582900c2 Merged in develop (pull request #22)
Develop
2020-05-21 12:09:37 +00:00
bence 848c155c62 Merged in feature/MAPG-29-draw-line-on-result-map (pull request #21)
MAPG-29 draw line between the real and guess position on result map
2020-05-21 12:08:42 +00:00
bence 6cd777fc1b MAPG-29 draw line between the real and guess position on result map
minor fixes and improvements in JS
2020-05-21 14:07:37 +02:00
bence f04b0fa24a Merged in feature/MAPG-38-layout-fixes-and-improvements (pull request #20)
Feature/MAPG-38 layout fixes and improvements
2020-05-21 10:21:17 +00:00
bence 521229fc4b MAPG-38 fix resultMap's border-radius 2020-05-21 12:18:17 +02:00
bence cb000a5887 MAPG-38 turn out motiontracking for the time being 2020-05-21 12:17:53 +02:00
bence 3afadb506b MAPG-38 reset zoom in the documented way 2020-05-21 12:17:18 +02:00
bence 4a2da9c89b Merged in develop (pull request #19)
Develop
2020-05-21 01:28:27 +00:00
bence 31e274c8cb Merged in feature/MAPG-35-further-mobile-layout-adaptations (pull request #18)
MAPG-35 further adaptations for mobile devices
2020-05-21 01:25:05 +00:00
bence f0344bfc6c MAPG-35 further adaptations for mobile devices
implicitely fix issue MAPG-17
2020-05-21 03:24:09 +02:00
bence b4615c2cdd Merged in bugfix/MAPG-35-fix-scorebar (pull request #17)
MAPG-35 re-add border-radius for scoreBarBase
2020-05-21 00:31:01 +00:00
bence bbd19cc1d8 MAPG-35 re-add border-radius for scoreBarBase 2020-05-21 02:26:36 +02:00
bence 655815db77 Merged in feature/MAPG-35-make-layout-nice-on-mobile (pull request #16)
feature/MAPG-35-make-layout-nice-on-mobile
2020-05-21 00:10:22 +00:00
bence cdbcb6ca52 MAPG-35 adapt JS to mobile layout
use null instead of explicit value when reset
2020-05-21 01:59:31 +02:00
bence 4d8ad9f10f MAPG-35 introduce layout for mobile
further style fixes and adjustments
2020-05-21 01:58:47 +02:00
bence f039c80eaa Merged in feature/MAPG-37-use-better-random-algorithm (pull request #15)
feature/MAPG-37-use-better-random-algorithm
2020-05-20 19:50:07 +00:00
bence 6116b94527 MAPG-37 use random_int() for selecting the position 2020-05-20 21:48:37 +02:00
bence 068d581a07 Merged in develop (pull request #14)
MAPG-34 change default zoom to 0
2020-05-20 18:40:39 +00:00
bence b673be741a Merged in feature/MAPG-34-let-zoom-be-0-instead-of-1 (pull request #13)
feature/MAPG-34-let-zoom-be-0-instead-of-1
2020-05-20 18:37:01 +00:00
bence 2b88d721d0 MAPG-34 change default zoom to 0 2020-05-20 20:30:19 +02:00
bence d1b0522fdd Merged in develop (pull request #12)
Develop
2020-05-20 14:01:41 +00:00
bence 1219fb55c5 Merged in feature/MAPG-19-create-loading-screen (pull request #11)
feature/MAPG-19-create-loading-screen
2020-05-20 13:57:07 +00:00
bence f647e77366 MAPG-19 show loading gif during loading 2020-05-20 15:54:09 +02:00
bence 51be16395e MAPG-19 add loading.gif 2020-05-20 15:53:14 +02:00
bence 310f36e442 MAPG-19 store gif files in LFS 2020-05-20 15:52:55 +02:00
bence 496021198c Merged in bugfix/MAPG-33-fix-deployment-scripts (pull request #10)
MAPG-33 fix shebang in deployment scripts
2020-05-20 13:12:54 +00:00
bence f87ca60122 MAPG-33 fix shebang in deployment scripts 2020-05-20 15:10:55 +02:00
bence 6437e923c5 Merged in bugfix/MAPG-32-use-ceil-instead-of-round-for-score-percent (pull request #9)
bugfix/MAPG-32-use-ceil-instead-of-round-for-score-percent
2020-05-20 13:03:31 +00:00
bence 961e6e2380 MAPG-32 use default width (0) for scorebar 2020-05-20 15:00:11 +02:00
bence 82f69664c1 MAPG-32 use Math.ceil instead of Math.round for scorebar 2020-05-20 14:59:48 +02:00
bence c36b91d5a8 Merged in feature/MAPG-7-implement-automatic-deployment (pull request #8)
Feature/MAPG-7 implement automatic deployment
2020-05-20 12:51:36 +00:00
bence ba01767c6c MAPG-7 implement install and update scripts
minor adaptations for paths, environment variables and Dockerfile
2020-05-20 13:44:54 +02:00
bence 0bf93f7509 MAPG-7 redirect / to /game 2020-05-20 13:06:40 +02:00
bence 2c9a3ec23c MAPG-7 install nodejs, uglify-js and clean-css into the Docker image
cleanup Docker files
2020-05-20 03:26:51 +02:00
bence c0ad64cbe5 MAPG-7 refactor JS to be more readable
load Google Maps API async
2020-05-20 03:19:53 +02:00
bence 35c749bea4 Merged in bugfix/MAPG-27-reset-pano-zoom-etc-after-loading-new-pano (pull request #7)
bugfix/MAPG-27-reset-pano-zoom-etc-after-loading-new-pano
2020-05-20 00:13:26 +00:00
bence bccd02ce30 MAPG-27 reset pov before loading the next pano 2020-05-20 02:10:47 +02:00
bence 504f53d794 Merged in bugfix/MAPG-26-fix-js-loading (pull request #6)
MAPG-26 remove "async defer" from <script> because they depend on each other
2020-05-20 00:07:19 +00:00
bence 066afa6e2e MAPG-26 remove "async defer" from <script> because they depend on each other 2020-05-20 01:54:14 +02:00
bence 1ace9ae0b2 Merged in feature/MAPG-6-calculate-and-show-score-after-the-guess (pull request #5)
Feature/MAPG-6 calculate and show score after the guess
2020-05-19 23:20:39 +00:00
bence 00ac5e842f MAPG-6 add score calculation to JS 2020-05-20 01:08:01 +02:00
bence 2991dfbe27 MAPG-6 add styles for score and result 2020-05-20 01:07:01 +02:00
bence 916995161f MAPG-6 add score element to game HTML 2020-05-20 01:05:46 +02:00
bence e15421af8b MAPG-6 introduce and unify geo calculations 2020-05-19 19:01:35 +02:00
bence 1d4bfd75d8 Merged in feature/MAPG-4-show-the-real-position-on-a-map-after-the-guess (pull request #4)
Feature/MAPG-4 show the real position on a map after the guess
2020-05-19 14:33:33 +00:00
bence e4c59739dc MAPG-4 show real position after guess
make workflow better
2020-05-19 16:18:12 +02:00
bence dc943fa3cb MAPG-4 rename GuessController to GameController 2020-05-19 16:13:57 +02:00
bence 5c9b54c881 Merged in feature/MAPG-10-check-if-place-has-panorama (pull request #3)
Feature/MAPG-10 check if place has panorama
2020-05-19 01:45:29 +00:00
bence ef95f5b986 MAPG-10 query new position with AJAX
check if pano at position exists
load new pano after guess
2020-05-19 03:44:17 +02:00
bence 9555a43cf9 MAPG-10 reformat Bounds.php 2020-05-19 03:19:50 +02:00
bence e0d65b6e27 MAPG-10 adapt index.php to the new view-controller concept
add GetNewPosition's route to index.php
2020-05-19 03:19:23 +02:00
bence 88e8a4e9e4 MAPG-10 add GetNewPosition controller
remove position selecing from GuessController
adapt GuessController to the new view-controller concept
2020-05-19 03:17:40 +02:00
bence 61cde2d40b MAPG-10 add toArray to Position 2020-05-19 03:14:20 +02:00
bence 037d19b0b3 MAPG-10 refactor view-controller to be able to handle JSON response 2020-05-19 03:13:55 +02:00
bence 55b693df68 Merged in feature/MAPG-15-use-map-bounds-from-the-database (pull request #2)
feature/MAPG-15-use-map-bounds-from-the-database
2020-05-17 22:25:44 +00:00
bence ee636cae78 MAPG-15 read map bounds from the database 2020-05-18 00:23:45 +02:00