Commit Graph

754 Commits

Author SHA1 Message Date
Mike Primm
2863dd0acc Put timeout on read lock used by web server - make sure it can't be indefinite 2011-06-28 22:33:11 -05:00
Mike Primm
48fea32500 Tighten up lock release logic on I/O and other exceptions
Make version in plugin.yml string so that 0.20 isn't 0.2
2011-06-28 22:13:42 -05:00
mikeprimm
b4b11329c2 Merge pull request #248 from mikeprimm/master
Fix 'visibleregions' option on JSON implementation of WorldGuard regions
2011-06-28 09:07:28 -07:00
Mike Primm
f118ada39e Fix 'visibleregions' option on JSON (gotta kill those parallel code
paths at some point....)
2011-06-28 11:00:05 -05:00
mikeprimm
1a23f24b81 Merge pull request #247 from mikeprimm/master
Fix break in processing center: coordinates due to mistake in url-parameter code
2011-06-27 18:49:40 -07:00
Mike Primm
edf898ae1a Fix "center" processing - broke it with URL args change :< 2011-06-27 20:38:26 -05:00
FrozenCow
bf29c09522 Changed version to 0.20. 2011-06-27 21:44:12 +02:00
Jason Booth
d3b621f90b Fix Security Exploit 2011-06-27 21:27:23 +02:00
FrozenCow
47620fe79e Revert "Disallow .. in file path. Also logging, imports"
This reverts commit 1bc275ea46.
2011-06-27 21:26:52 +02:00
zeeZ
1bc275ea46 Disallow .. in file path. Also logging, imports 2011-06-27 22:48:39 +08:00
mikeprimm
d4f0161e14 Merge pull request #245 from mikeprimm/master
Add icon for Biome maps, and color mapping for SKY biome
2011-06-26 22:08:35 -07:00
Mike Primm
d59c8f1506 Add SKY biome mappings 2011-06-27 00:07:00 -05:00
Mike Primm
752a076236 Add default icon for Biome maps 2011-06-26 22:36:17 -05:00
mikeprimm
8089e75ab2 Merge pull request #244 from mikeprimm/master
Add support for URL-based parameter overrides for selecting world, map, zoom, and center coordinates
2011-06-26 20:12:49 -07:00
Mike Primm
3720c2adf7 Add support for URL-based parameter to override initial world, map, zoom, and center coordinate settings 2011-06-26 22:05:43 -05:00
mikeprimm
dbbff3d04f Merge pull request #243 from mikeprimm/master
Add verbose: false option to make dynmap much less chatty during startup
2011-06-26 12:33:55 -07:00
Mike Primm
b937c4bf38 Add option to have Dynmap STFU during start (verbose: false)
Add softdep, authors, stats commands to plugin.yml
2011-06-26 14:31:40 -05:00
mikeprimm
54f5de4c2c Merge pull request #241 from mikeprimm/master
Change autogenerate-to-visbilitylimits to have 3 options: none, map-only, permanent
2011-06-25 14:07:57 -07:00
Mike Primm
39281188bc Change autogenerate-to-visibilitylimits to have options for map-only (temporary generated chunks) versus permanent (world growing)
Fix exception catching code in thread pool
2011-06-25 16:01:06 -05:00
mikeprimm
4678c53a48 Merge pull request #240 from mikeprimm/master
Add option to use visibilitylimits to define area to automatically prime chunk generation
2011-06-24 23:23:06 -07:00
Mike Primm
6dac7f0689 Add autogenerate-to-visibilitylimits option to allow automatic priming/generating of chunks within defined visibility area
Avoid rendering tiles with nothing but empty chunks
Limit size of hash-file cache, and move hash files to world-specific tile directories
2011-06-25 01:13:40 -05:00
mikeprimm
3310e07c9b Merge pull request #239 from mikeprimm/master
Add support for 'chunkgenerated' render trigger, now that CB has functional chunk generate events
2011-06-24 17:14:16 -07:00
Mike Primm
3674ba3786 Add support for now-functional chunk generate detection
(chunkgenerated render trigger)
2011-06-24 19:10:10 -05:00
mikeprimm
f81dc8cdac Merge pull request #238 from mikeprimm/master
Fix bigworld+iso-maps+zoom-out issue with directory name logic inconsistency
2011-06-24 12:20:23 -07:00
Mike Primm
f3ac3d9be4 Another bigworld+isomaps+zoom-out fix - directory name inconsistency 2011-06-24 14:18:21 -05:00
mikeprimm
fcb865ea28 Merge pull request #237 from mikeprimm/master
Fix occasional broken zoom-out tiles due to hash code calculation error
2011-06-24 10:06:27 -07:00
Mike Primm
5bb3249dfe Fix hash code problem with zoomed-out tiles - caused incomplete
updates
2011-06-24 11:44:21 -05:00
mikeprimm
eb12834ee3 Merge pull request #236 from mikeprimm/master
Add invalidate events to zoom out processing - avoids problems with linux file time resolution
2011-06-24 06:32:20 -07:00
Mike Primm
214fec208d Add queued update triggers for zoom-out updates - deals with file time
resolution issues on Linux (1 second is too long to be reliable)
2011-06-24 08:25:26 -05:00
mikeprimm
ec948f980e Merge pull request #235 from mikeprimm/master
Add file hashing to reduce zoom-out tile recalc, fix bigworld support
2011-06-24 00:50:05 -07:00
Mike Primm
d63db655d8 More tuning on zoom-out, fix zoomout on bigworld on iso-maps 2011-06-24 02:46:16 -05:00
mikeprimm
2ab7339381 Merge pull request #234 from mikeprimm/master
Per request, add 'trustclientname' option to sendMessage on InternalClientUpdaeComponent
2011-06-23 14:40:26 -07:00
Mike Primm
c2ee0ebd42 Add requestion option to trust client-provided name in sendMessage for
internal web server
2011-06-23 16:35:17 -05:00
mikeprimm
654769af1e Merge pull request #233 from mikeprimm/master
Fix reported trap in Armor calculation when player has incomplete set of armor
2011-06-23 06:13:32 -07:00
Mike Primm
244419d686 Fix reported traps in Armor calculation when armor is incomplete - not
sure how this didn't happen more - possibly bukkit behavior change?
2011-06-23 08:08:33 -05:00
mikeprimm
6d6a5f4db0 Merge pull request #232 from mikeprimm/master
Add support for configurable extra zoom out levels on each world - generates more tiers of zoomed images
2011-06-22 23:10:35 -07:00
Mike Primm
f722c6fdc8 Finish zoom out on normal and 'bigworld' mode, fix marker coordinates 2011-06-23 00:53:56 -05:00
Mike Primm
9db23444db Fix problem with coordinate offsets due to negative coordinate walk on
kzedmaps
2011-06-22 17:24:12 -05:00
Mike Primm
8e102446fe First pass UI support for extra zoom out levels 2011-06-22 16:43:41 -05:00
Mike Primm
e7e4406e77 Finish rest of zoom out core logic - still need to finish web UI 2011-06-22 13:56:21 -05:00
Mike Primm
bec1108fa1 Settable zoom out code - incomplete prototype 2011-06-22 08:27:21 -05:00
mikeprimm
42f4d4e4a6 Merge pull request #230 from mikeprimm/master
Add support for optional 'visibleregions' list attribute for regions component, to limit visible region population
2011-06-20 16:50:48 -07:00
Mike Primm
a7c6a20dcc Add support for visibleregions list for regions component - limit
which regions are shown
2011-06-20 18:48:23 -05:00
mikeprimm
90bff11417 Merge pull request #229 from mikeprimm/master
Fix reading of webpath by regions component - load from top-level setting, instead of component local config
2011-06-20 15:36:18 -07:00
Mike Primm
2c3e8fbdc0 Fix reading of 'webpath' by Regions component - was reading its own
config instead of top-level one
2011-06-20 17:33:01 -05:00
mikeprimm
690be9d80a Merge pull request #228 from mikeprimm/master
Add delay-retry on image file writes, to recover from locked file exceptions from external web servers
2011-06-20 15:01:08 -07:00
Mike Primm
e584e3202b Add delay-retry loop for handling temporarily locked image file writes 2011-06-20 16:58:07 -05:00
mikeprimm
427249b5a9 Merge pull request #226 from mikeprimm/master
Add support for biome-data-based shading on surface map renderer
2011-06-20 14:11:42 -07:00
Mike Primm
6efbf3a3df Update biomecolored to support biome-type-based,
biome-temperature-based and biome-rainfail-based shading
2011-06-20 16:00:28 -05:00
Mike Primm
edf7d4f5c8 Add biome-based coloring option for surface map 2011-06-20 00:09:22 -05:00