Commit Graph

346 Commits

Author SHA1 Message Date
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
28aaaf1172 Merged in develop (pull request #36)
develop
2020-05-23 00:18:07 +00:00
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
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
3285ce2a4f MAPG-58 make resultinfo fixed height and move out continue button 2020-05-23 02:07:50 +02:00
8fa8b501ed MAPG-57 decrease result's margin to minimal in case of low height 2020-05-23 01:34:40 +02:00
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
e8492994dd MAPG-54 introduce round info - current round number and score 2020-05-23 01:25:43 +02:00
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
cb433ce822 MAPG-55 add title for real marker 2020-05-22 23:55:09 +02:00
5c309cd05f MAPG-55 set markers' z-index (real marker should always be over guess marker) 2020-05-22 23:50:14 +02:00
23b18a8e13 MAPG-55 set marker labels with round numbers 2020-05-22 23:45:31 +02:00
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
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
94037dda31 MAPG-53 check if Core.googleLink is not null before trying to modify it 2020-05-22 23:32:17 +02:00
fd3cd5e673 MAPG-56 change disabled button's cursor to 'not-allowed' 2020-05-22 23:29:04 +02:00
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
f110bb9b18 MAPG-20 rename guessMap to map 2020-05-22 23:23:54 +02:00
96ee250f96 MAPG-20 merge guessMap and resultMap into one map 2020-05-22 23:22:11 +02:00
cc99848ae8 Merged in develop (pull request #28)
Develop
2020-05-22 00:06:33 +00:00
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
dca88ac9a0 MAPG-25 don't query place in GameController 2020-05-22 01:32:30 +02:00
41456098bf MAPG-25 store rounds and score sum in sessionStorage 2020-05-22 01:31:32 +02:00
b0b95fbbee MAPG-25 implement multi round game
refator of JS code
2020-05-21 23:55:59 +02:00
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
25e87e4626 MAPG-51 fix page overflow (showGuessButtonContainer is not absolute in non-mobile mode) 2020-05-21 15:55:18 +02:00
5271dca19a Merged in develop (pull request #25)
Develop
2020-05-21 13:23:12 +00:00
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
3d636be4ea MAPG-40 use Math.floor instead of accidentally used Math.ceil 2020-05-21 15:19:05 +02:00
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
532bc0416d MAPG-39 increase spaces between elements 2020-05-21 15:10:15 +02:00
f6582900c2 Merged in develop (pull request #22)
Develop
2020-05-21 12:09:37 +00:00
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
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
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
521229fc4b MAPG-38 fix resultMap's border-radius 2020-05-21 12:18:17 +02:00
cb000a5887 MAPG-38 turn out motiontracking for the time being 2020-05-21 12:17:53 +02:00
3afadb506b MAPG-38 reset zoom in the documented way 2020-05-21 12:17:18 +02:00
4a2da9c89b Merged in develop (pull request #19)
Develop
2020-05-21 01:28:27 +00:00
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
f0344bfc6c MAPG-35 further adaptations for mobile devices
implicitely fix issue MAPG-17
2020-05-21 03:24:09 +02:00
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
bbd19cc1d8 MAPG-35 re-add border-radius for scoreBarBase 2020-05-21 02:26:36 +02:00
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
cdbcb6ca52 MAPG-35 adapt JS to mobile layout
use null instead of explicit value when reset
2020-05-21 01:59:31 +02:00
4d8ad9f10f MAPG-35 introduce layout for mobile
further style fixes and adjustments
2020-05-21 01:58:47 +02:00
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
6116b94527 MAPG-37 use random_int() for selecting the position 2020-05-20 21:48:37 +02:00
068d581a07 Merged in develop (pull request #14)
MAPG-34 change default zoom to 0
2020-05-20 18:40:39 +00:00
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