Commit Graph

1900 Commits

Author SHA1 Message Date
mikeprimm
bb279d7e2f Merge pull request #367 from mikeprimm/master
Fix map center consistency between map changes, add fromLatLngToLocation to Projection
2011-08-03 08:26:57 -07:00
Mike Primm
64bd846115 Fix map center consistency on map changes 2011-08-03 10:21:29 -05:00
mikeprimm
db0fadc5de Merge pull request #366 from mikeprimm/master
Fix defaultzoom: 0 not working
2011-08-03 06:14:53 -07:00
Mike Primm
1d0b28c069 Fix defaultzoom: 0 not working 2011-08-03 08:13:59 -05:00
mikeprimm
e6e07bf421 Merge pull request #365 from mikeprimm/master
Don't include face accessory overlay on faces for now - causes 'white face'
2011-08-02 22:49:12 -07:00
Mike Primm
091752aaae Drop accessory face overlay - hardly seems used and causes white faces 2011-08-03 00:40:53 -05:00
mikeprimm
6d75c9ea44 Merge pull request #364 from mikeprimm/master
Fix zoom range and marker position calculation on Kzed and Flat
2011-08-02 19:54:06 -07:00
Mike Primm
ee790f86ed Fix marker position logic and zoom range calculation on Kzed and Flat 2011-08-02 21:51:00 -05:00
mikeprimm
4bf9f9a978 Merge pull request #363 from mikeprimm/master
And another KzedMap Zoom fix - for non-bigworld this time
2011-08-02 14:11:12 -07:00
Mike Primm
257b1c37f1 Fix zoom on KzedMap when bigworld=false 2011-08-02 16:10:04 -05:00
mikeprimm
8cef3fb478 Merge pull request #361 from mikeprimm/master
Fix flat and kzed 'bigworld' support
2011-08-02 08:48:45 -07:00
Mike Primm
40e2b1eb4d Fix bigworld on kzed and flat 2011-08-02 10:48:04 -05:00
mikeprimm
49978e3ac5 Merge pull request #358 from mikeprimm/master
Fix background color support, fix junk on map switches
2011-08-01 22:08:23 -07:00
Mike Primm
e08a2d4407 Fix background color support, provide blank tile to fix refresh junk 2011-08-02 00:07:17 -05:00
mikeprimm
b0a7a6b748 Merge pull request #357 from mikeprimm/master
Update leaflet, lots of little fixes to make IE sane
2011-08-01 21:25:26 -07:00
Mike Primm
0bbcf6510e Make IE sane 2011-08-01 23:21:36 -05:00
Mike Primm
37c9d4b9cd Update leaflet 2011-08-01 21:03:43 -05:00
mikeprimm
9cc51e4cc0 Merge pull request #356 from mikeprimm/master
Band-aid for playermarkers on IE8 - avoid lack of canvas support
2011-08-01 16:32:17 -07:00
Mike Primm
17af53ee1f Band-aid playermarkers on IE8 2011-08-01 18:31:04 -05:00
mikeprimm
f592f5a3bf Merge pull request #355 from mikeprimm/master
Force 'z-order' in 'map' style to zero to make sure components don't wind up behind it
2011-08-01 07:13:05 -07:00
Mike Primm
2fa68b2992 Force z-order for map to prevent components winding up behind it 2011-08-01 09:11:58 -05:00
mikeprimm
fdbd4ab2d1 Merge pull request #354 from mikeprimm/master
Fix zoomout processing problem on kzedmaps due to inconsistent use of name vs prefix
2011-07-31 20:46:47 -07:00
Mike Primm
d845ed207d Get name and prefix use consistent 2011-07-31 22:40:18 -05:00
Mike Primm
4d285b475a Fix zoom out processing for kzed maps - used name not prefix 2011-07-31 22:30:02 -05:00
FrozenCow
05f09f7bb4 Fixed image of popup close button. 2011-07-31 22:24:28 +02:00
mikeprimm
fea152a914 Merge pull request #353 from mikeprimm/master
Clean up player icon transitions to/from visible map
2011-07-31 10:44:24 -07:00
Mike Primm
95c9520cc9 Clean up player marker transitions to/from visible map 2011-07-31 12:41:01 -05:00
mikeprimm
e792bcc7a1 Merge pull request #351 from mikeprimm/master
Avoid trap in regions when 'basenode' in region file cannot be found or is bad
2011-07-31 09:16:47 -07:00
Mike Primm
58df3a8441 Fix trap when bad basenode in region component 2011-07-31 11:14:36 -05:00
mikeprimm
98dee3b404 Merge pull request #350 from mikeprimm/master
Fix biome shading on normal worlds
2011-07-31 08:40:23 -07:00
Mike Primm
2ee49fd82e Merge remote branch 'origin/master' 2011-07-31 10:37:09 -05:00
Mike Primm
c2fe0f772c Fix bug with not doing biome shading on normal worlds 2011-07-31 10:36:43 -05:00
mikeprimm
65f20df60c Merge pull request #349 from mikeprimm/master
Make JSON unicode encoding more thorough - don't assume anything outside ASCII should not be escaped
2011-07-30 00:16:24 -07:00
Mike Primm
b4ce28fd9a Make JSON unicode encoding more thorough - don't assume anything outside ASCII should not be escaped 2011-07-30 02:13:45 -05:00
mikeprimm
5a39ba5d5a Merge pull request #348 from mikeprimm/master
Improve rendering of textures for redstone wire
2011-07-29 23:41:38 -07:00
Mike Primm
6c42b399f4 Improve texture rendering for redstone wire 2011-07-30 01:22:05 -05:00
mikeprimm
f9958fbff8 Merge pull request #346 from mikeprimm/master
Fix autopan on chatballoons - always was on
2011-07-29 12:30:49 -07:00
Mike Primm
29e42137c9 Fix autopan on chatbaloons - can be off now :) 2011-07-29 14:28:29 -05:00
mikeprimm
181e3dccbd Merge pull request #345 from mikeprimm/master
Fix nesting on residence subzones
2011-07-29 08:32:09 -07:00
Mike Primm
95128df6b9 Fix nesting - iterating over areas versus residences 2011-07-29 10:30:59 -05:00
FrozenCow
5bf8010bbb Fixed styling and owner/member texts of regions. 2011-07-29 17:16:27 +02:00
mikeprimm
6259da4e0f Merge pull request #344 from mikeprimm/master
Add subzones for Residence regions support
2011-07-29 07:52:14 -07:00
Mike Primm
47194defca Add support for Subzones (1 tier) 2011-07-29 09:50:50 -05:00
mikeprimm
f8f1e77153 Merge pull request #342 from mikeprimm/master
Fix zoom range to match selected map
2011-07-28 21:53:13 -07:00
Mike Primm
4824388c6b Update zoom range to match selected map 2011-07-28 23:51:53 -05:00
mikeprimm
ee0ad7c3d5 Merge pull request #341 from mikeprimm/master
Fix skylands premature-end-of-render issue
2011-07-28 08:15:30 -07:00
Mike Primm
4622b42aed Fix map edge detection to only use lack-of-chunks: fix skylands
premature end-of-render issue
2011-07-28 10:11:34 -05:00
mikeprimm
bec6b0aec5 Merge pull request #340 from mikeprimm/master
Retire 'snowform' trigger, add 'blockformed', 'blockfaded', 'blockspread' triggers
2011-07-28 08:04:03 -07:00
Mike Primm
8957ab7c31 Fix message - blockform -> blockformed 2011-07-28 10:01:54 -05:00
Mike Primm
b1272d18f8 Retired 'snowformed' event, added 'blockformed', 'blockfaded', 'blockspread' 2011-07-28 08:08:08 -05:00