Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-28 21:25:46 +01:00
Code Issues Projects Releases Wiki Activity
931 Commits 7 Branches 130 Tags 27 MiB
81d68d5ac9
Commit Graph

931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
mikeprimm
832a79eb1f Merge pull request #337 from mikeprimm/master 
Fix compass rose on new UI
 2011-07-27 22:44:22 -07:00
Mike Primm
6d66d45d43 Fix compass with new UI 2011-07-28 00:43:13 -05:00
mikeprimm
1a24217a98 Merge pull request #336 from mikeprimm/master 
Fix Residence support with new web UI
 2011-07-27 20:44:02 -07:00
Mike Primm
d483eb1e6f Fix Residence support in updated UI 2011-07-27 22:42:55 -05:00
mikeprimm
f13b0b6c46 Merge pull request #335 from mikeprimm/master 
Fix various new map issues
 2011-07-27 19:30:11 -07:00
Mike Primm
08192df906 Various map update fixes (keeping zoom, center on map change, repaint) 2011-07-27 21:27:35 -05:00
FrozenCow
5aa961388d Removed unnecessary !important from css. 2011-07-27 19:49:43 +02:00
FrozenCow
bea269e8df Fixed zoomin/out icons again. 2011-07-27 19:34:42 +02:00
FrozenCow
0abc944c6e Added logo-component. 2011-07-27 18:51:26 +02:00
FrozenCow
e90087390a Fixed flatmap. 2011-07-27 17:07:28 +02:00
FrozenCow
ce00242253 Made use of mapzoomout+mapzoomin on all maptypes + simplified the client code of the individual maps. 2011-07-27 16:49:49 +02:00
FrozenCow
4f75bf691a Fixed nightday and making use of options.mapzoomin and options.mapzoomout. 2011-07-27 16:49:49 +02:00
FrozenCow
9f19ccf50c Removed old comments. 2011-07-27 16:49:49 +02:00
FrozenCow
2242c0643b Added/upgraded jquery as a local file and moved js and css to their directories. 2011-07-27 16:49:49 +02:00
FrozenCow
31b849683a Upgraded leaflet to latest version. 2011-07-27 16:49:48 +02:00
FrozenCow
5a5fa147d3 Removed some debug messages. 2011-07-27 16:49:48 +02:00
FrozenCow
b944b3b729 Fixed previous maptype/layer being visible in the background. 2011-07-27 16:49:48 +02:00
FrozenCow
90acf73976 Added regions-compatiblity with old configuration. 2011-07-27 16:49:48 +02:00
FrozenCow
51457464c2 Made zoom-in/out for changing tilesizes look better. 2011-07-27 16:49:48 +02:00