Commit Graph

859 Commits

Author SHA1 Message Date
Mike Primm
526d5881c7 Merge remote branch 'upstream/master' 2012-02-07 10:22:55 -06:00
Mike Primm
8f9006e594 Retire 'chunkloaded' trigger, add warning for 'playermove' trigger 2012-02-07 10:21:56 -06:00
Mike Primm
87aabf3eca Add 'show-mcr' option to coord control (show region file ID) 2012-02-07 00:48:28 -06:00
Mike Primm
9b31f30f14 Handle cancelled chat events properly 2012-02-06 20:31:41 -06:00
Mike Primm
dd0f0c7128 Add plugin_enable and plugin_disable event listener 2012-02-06 11:17:38 -06:00
Mike Primm
86c7dee750 Start worlds.txt edit commands - add /dmap worldlist and /dmap worldset 2012-02-05 15:53:24 -06:00
Mike Primm
3b19d11694 Fix break in 1.1 event processing on /dynmap reload 2012-02-05 12:07:44 -06:00
Mike Primm
c7b9bea340 Workaround more Spout custom block flaky crap 2012-02-05 11:45:24 -06:00
Mike Primm
0925212a70 Add log messages for completion of disable - know that we're out of the picture 2012-02-03 23:02:27 -06:00
Mike Primm
d85e810322 Use reflection to improve Spout custom block support - fixes StainedGlass 2012-02-03 22:36:58 -06:00
Mike Primm
417b8d6e31 Add support for greater-than-128 high worlds 2012-02-01 00:40:38 -06:00
Mike Primm
9d529de700 Add Kaevator's Superslopes support 2012-01-30 00:52:07 -06:00
Mike Primm
55bc549a6b Add RailCraft block rendering support 2012-01-29 12:35:12 -06:00
Mike Primm
a1e27a63ed Workaround Spout custom block URL-that-are-temp-filename insanity 2012-01-26 17:12:49 -06:00
Mike Primm
734fbe4cbf Add IC2 Power Converters Rendering Support 2012-01-25 14:40:47 +08:00
Mike Primm
9fd177eba5 Add IC2 Charging Bench Rendering Support 2012-01-25 14:02:22 +08:00
Mike Primm
4a184b9988 Add NetherOres block rendering support 2012-01-25 12:59:06 +08:00
Mike Primm
ef2c657ecc Add option to show player whole body icon (showplayerbody: true) 2012-01-24 14:37:25 +08:00
Mike Primm
6a08c516f6 Add support for SpoutMaterials (custom Spout blocks) 2012-01-24 13:12:20 +08:00
Mike Primm
f6d9b62101 Add smooth-biome-shading option (1.1-style swamp biome shading) 2012-01-23 10:42:56 +08:00
Mike Primm
8e4eaf77aa Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/main/java/org/dynmap/bukkit/DynmapPlugin.java
2012-01-22 16:31:37 -06:00
Mike Primm
49338111a7 Start handling Spout custom IDs (16 bit block IDs) 2012-01-22 16:24:02 -06:00
Mike Primm
5dfc8f7837 Maintain playerList reference in DynmapPlugin - prevents some breakage 2012-01-23 00:49:34 +08:00
Mike Primm
fc319a2d32 Finish split of dynmap and DynmapCore 2012-01-17 23:58:11 -06:00
Mike Primm
aa5d73ea09 Fix support for new biomes to not break running on 1.0.1 2012-01-17 01:07:31 -06:00
Mike Primm
525adf1d73 Multiplier cache doesn't work - drop it 2012-01-16 23:20:11 -06:00
Mike Primm
497071aac9 Clean up warnings, extra imports. Fix post_1_8 logic. Color multiplier cache 2012-01-16 23:06:31 -06:00
Mike Primm
5e9ba1e6e3 Add support for new 1.1 biomes (beach, forest hills, desert hills, taiga hills, small mountains) 2012-01-16 20:43:29 -06:00
Mike Primm
ecf3a64b74 Fix id-by-ip settings - not migrated to servlet code initialization 2012-01-16 19:40:58 -06:00
Mike Primm
8d1def2ea0 Some more cleanup 2012-01-15 23:56:32 -06:00
Mike Primm
eb35dbe1a6 More cleanup and refactoring - get ready to split out core 2012-01-15 23:19:01 -06:00
Mike Primm
1f6eb62cc1 Merge in FrozenCow's latest Jetty updates 2012-01-15 17:45:44 -06:00
Mike Primm
2d42b59a12 Give core its own version file 2012-01-15 17:24:01 -06:00
Mike Primm
b64094795e Checkpoint on split between bukkit-specific and common code core 2012-01-15 16:58:19 -06:00
FrozenCow
22850982a9 Fixed tiles not being loaded from tilespath. 2012-01-14 03:51:36 +01:00
FrozenCow
502fbd5829 Made filtering work properly again. 2012-01-13 22:20:01 +01:00
FrozenCow
58f8a34b49 Made use of Jetty's file handling. Reworked some classes. 2012-01-13 22:20:01 +01:00
Mike Primm
9c49054c89 Merge remote branch 'upstream/jetty' 2012-01-11 20:45:31 -06:00
Mike Primm
a34ba56716 0.29.2 - Fix config caching 2012-01-11 14:09:11 +08:00
Mike Primm
d7a7ee9c5d Centralize World class dependencies in DynmapWorld 2012-01-11 14:09:11 +08:00
Mike Primm
aa2270ae76 Fix issue with render settings on /dynmap reload 2012-01-11 14:09:11 +08:00
FrozenCow
3c4a88a874 Replaced webserver with Jetty. 2012-01-10 20:38:46 +01:00
Mike Primm
db3ab5a437 Switch touch queue to concurrent map - remove synchronize 2012-01-10 14:49:18 +08:00
Mike Primm
530eb0ae9e Shift most of touch processing off server main thread 2012-01-10 12:39:26 +08:00
Mike Primm
478542418c v0.29.1 - Made render improvements default on only for fresh installs: add 'correct-water-lighting', 'correct-biome-shading', 'use-generated-textures' settings to allow enable on existing installs 2012-01-09 12:28:40 +08:00
Mike Primm
3db079f90f More porting prep, tune up invalidates and touches 2012-01-09 01:02:53 +08:00
Mike Primm
42418edf1f Start isolating Bukkit dependencies, prep code for ports 2012-01-08 01:47:11 -06:00
Mike Primm
6cfeee152c Add block-banned-player-chat to block chat from banned players matching IPs known to go with player 2012-01-08 09:10:00 +08:00
Mike Primm
4a80b71a12 Update examples in worlds.txt to HDMap based maps 2012-01-07 15:20:02 +08:00
Mike Primm
55972a4d16 Add better-grass setting, to allow option to render using BetterGrass style rendering of grass and snow block sides 2012-01-07 15:13:53 +08:00
Mike Primm
b66008c262 Add support for 'link' component - button to get hard link to current view 2012-01-06 03:09:53 -06:00
Mike Primm
5a0983d867 Add customization/translation for "Players" and "Map Types" UI labels 2012-01-06 01:02:56 -06:00
Mike Primm
08fc4145b1 Add support for optional spawn-bed layer (show player's spawn beds) 2012-01-04 23:34:32 -06:00
Mike Primm
a8c1558e3c Add hideifsneaking option for hiding players that are sneaking/crouching 2012-01-04 21:59:18 -06:00
Mike Primm
98a1f32e0f Add support for lily pad orientation calculation 2012-01-04 14:26:16 +08:00
Mike Primm
a5bc33e1e9 Add 'followmap' and 'followzoom' to allow setting of map and zoom when starting to follow a player 2012-01-03 15:24:31 +08:00
Mike Primm
204b54155a Add texture generators for fire, lava, water; fix water lighting and biome shading to match MC client; fix lily, birch, pine leaf shading to match client 2012-01-03 13:26:14 +08:00
Mike Primm
950727057d Start RedPower2 support - RedPower2Core and RedPower2World 2012-01-01 21:31:54 -06:00
Mike Primm
446c52e933 Fix exception during rejected chat message 2012-01-02 05:51:35 +08:00
Mike Primm
514e96605b Add 'pinned' choice for showlayercontrol: setting - show expanded layer control 2011-12-31 08:27:56 +08:00
Mike Primm
dc7efc2642 Fix duplicate IDs in ids-for-ip list 2011-12-31 05:05:06 +08:00
Mike Primm
87be292538 Add /dynmap add-id-by-ip and /dynmap del-id-by-ip to allow manual adding and removing of IP to ID mappings 2011-12-31 05:05:05 +08:00
Mike Primm
a743524318 Reconnect active command output to player after restart, logoff/logon 2011-12-30 16:03:18 +08:00
Mike Primm
8c9733b73f Add /dynmap updaterender command - renders starting at selected location until map edge hit OR until rendered tiles match existing tiles (i.e. no changes) 2011-12-30 15:39:29 +08:00
Mike Primm
cefcae2437 Add 'blockfromto' and 'blockphysics' triggers - needed for lava and water flow, as well as falling sand and gravel 2011-12-30 08:47:22 +08:00
Mike Primm
17fd2c1efe Use replace() instead of replaceAll(), where possible 2011-12-29 14:32:13 +08:00
Mike Primm
e009aefb18 Add support for 'use-player-login-ip', 'require-player-login-ip' - map player login IP addresses to web chat addresses 2011-12-29 14:32:13 +08:00
Mike Primm
09fbf312ac Add support for substitution variables in model and texture files - update BuildCraft and IndustrialCraft2 support files to use them (so that custom block ID mappings cna be handled by adding configuration.txt settings) 2011-12-29 14:32:13 +08:00
Mike Primm
babc8cd073 Fix accumulation of weak reference keys (mem leak) in snapshot cache 2011-12-28 14:38:26 +08:00
Mike Primm
93613404ba Adjust handling of transparent biome shading files (grass, foliage), as used in Painter's texture pack 2011-12-23 13:32:27 +08:00
Mike Primm
cd067adfdc Fix issue with white blank tiles at edge of JPG rendered maps 2011-12-23 13:32:27 +08:00
Mike Primm
b872aa039e Handle Essentials-style nickname color coding (&0-&f) in player nicknames 2011-12-23 07:20:48 +08:00
Mike Primm
eafbe62c46 Add support for minzoom attribute on marker sets - hide markers below configurable zoom for each marker set 2011-12-23 04:31:10 +08:00
Mike Primm
7373de85a2 Add support for updating stock shaders.txt, perspectives.txt, lightings.txt with additional defaults. 2011-12-23 04:31:09 +08:00
Mike Primm
44106a799a Add 'allowurlname' setting for 'chat' - permits web name set with playername= parameter 2011-12-23 04:31:09 +08:00
Mike Primm
5dedf1d6e8 Add /dynmap radiusrender <world> <x> <z> <radius> - console usable radiusrender 2011-12-17 13:18:43 +08:00
Mike Primm
96e4742bfe Dial the ticklist workaround to align with proposed numbers in CraftBukkit-Bleeding fix 2011-12-17 07:43:06 +08:00
Mike Primm
9c0f33bd3d Adjust ticklist workaround to handle nether's tendancy to have ticklist processed events beget new ticklist events, more or less constantly.... 2011-12-17 07:26:31 +08:00
Mike Primm
3c849b9d66 Add 'grayplayerswhenhidden' option to allow disable of graying of players in player list when not visible on current map 2011-12-16 01:26:13 +08:00
Mike Primm
5af670de61 Add extra topographical shader, TerraNetworkOrgTopo - thanks to TerraNetworkOrg! 2011-12-16 00:09:48 +08:00
Mike Primm
102012aa91 Detect scaled models that yield full blocks, and optimize to solid 2011-12-15 15:04:17 +08:00
Mike Primm
ba2c3eac1c Add support for cleanup of stale tiles (off edge of map) 2011-12-15 13:26:09 +08:00
Mike Primm
8f66d34752 Make water blocks full blocks - big performance boost 2011-12-15 13:26:09 +08:00
Mike Primm
03b280fe2d Add 'usenormalthreadpriority' setting (makes renders on Windows use normal priority) 2011-12-15 00:35:00 +08:00
Mike Primm
f7dedff413 Add 'showlayercontrol' config setting and URL parameter, to allow hide of layer control 2011-12-15 00:02:37 +08:00
Mike Primm
14ecd5f778 Fix rare boundary condition error 2011-12-11 13:54:38 +08:00
Mike Primm
05aa0960f2 Various performance and concurrency optimizations 2011-12-10 14:15:54 +08:00
Mike Primm
fd887b47b4 Add tiles-rendered-at-once setting, control update tile concurrency 2011-12-10 11:34:02 +08:00
Mike Primm
9bdf13e460 Add TopoHDShader for generating altitude based topology maps 2011-12-10 08:22:24 +08:00
Mike Primm
1b8fe6bba8 Scrub obsolete events from update queue (reduce traffic) 2011-12-09 13:23:16 +08:00
Mike Primm
aea2d29c98 Fix config hashcode inconsistency on world loads (UI reload loop in JSON mode) 2011-12-09 12:22:29 +08:00
Mike Primm
6a86b81417 Start optimize of update event handling 2011-12-08 16:14:51 +08:00
Mike Primm
36b81768cd Add tick list monitoring - deal with 1.0.0 getting behind when rendering 2011-12-07 15:33:42 +08:00
Mike Primm
3e4bc59834 Retire regions components (Residence, Towny, WorldGuard, Factions) 2011-12-05 14:58:17 +08:00
Mike Primm
4f2f968353 Move DynmapWebChatEvent to API 2011-12-05 14:17:04 +08:00
Mike Primm
b936e67a88 Add APIs for hide/show player and for player-oriented web chat input 2011-12-05 14:17:04 +08:00
Mike Primm
19f9733aab Add 'fullrenderplayerlimit' - pause fullrender when number of active players reaches optional limit, resumes after 2011-12-03 13:17:26 +08:00
Mike Primm
de6b90784f Add '/dynmap pause' command to pause/unpause full/radius and update rendering 2011-12-03 06:20:57 +08:00
Mike Primm
8f6982265a Support checking banned IPs from external server proxied requests 2011-12-03 05:32:43 +08:00
Mike Primm
82318346c2 Add 'hidey' option to 'coord' component - option to show just X,Z 2011-12-03 04:32:25 +08:00
Mike Primm
348a37af87 Add support for 8x8 and 32x32 marker icons (default still 16x16) 2011-12-01 15:24:19 +08:00
Mike Primm
52a09d41b4 Add more performance measurements 2011-12-01 15:24:19 +08:00
Mike Primm
edcf1cfd10 Make web UI reload when configuration changes, server restarts 2011-11-30 12:34:13 +08:00
Mike Primm
4af95f57df Fix problem with hashfile code handling dots/periods in world names 2011-11-30 12:12:00 +08:00
Mike Primm
98fd361398 Try inserting build number into version 2011-11-28 07:23:07 +08:00
Mike Primm
6dd4018011 Try another update to see if PEX is appeased 2011-11-28 01:31:39 +08:00
Mike Primm
bd03b36c0e Delay asking for PermissionHandler - might help PEX not freak out 2011-11-28 00:07:27 +08:00
Mike Primm
97f5d0c715 Merge remote branch 'upstream/master' 2011-11-26 16:57:38 -06:00
Mike Primm
609d0e5c60 Fix texture rotation for redstone repeater 2011-11-27 06:55:36 +08:00
Mike Primm
e566a8eae7 Clean up web texture mapping 2011-11-27 06:55:36 +08:00
Mike Primm
cfa54d9a53 Add softdepends for various security managers - make them load first 2011-11-26 16:52:27 -06:00
Mike Primm
a06ed92f36 Fix texture rotation for redstone repeater 2011-11-26 14:22:24 -06:00
Mike Primm
f547913508 Clean up web texture mapping 2011-11-26 13:59:54 -06:00
Mike Primm
4268515089 Drop default from wildcard dynmap.* permission - don't know if its a problem, but.... 2011-11-27 02:56:36 +08:00
Mike Primm
5a96317a34 Drop default from wildcard dynmap.* permission - don't know if its a problem, but.... 2011-11-26 11:58:27 -06:00
Mike Primm
910a2269a8 Don't add <br/> on sign markers when not needed 2011-11-24 01:40:07 -06:00
Mike Primm
6fedc7169e Reduce unneeded multiple saves for persistent marker updates 2011-11-24 01:32:10 -06:00
Mike Primm
ca9d26ef99 Batch up rewrites of marker JSON files - reduce rewriting during rapid updating 2011-11-24 01:09:14 -06:00
Mike Primm
3d8381e621 Switch configuration default for compass-mode to 'newnorth' (1.0.0 optimal) 2011-11-23 23:23:55 -06:00
Mike Primm
ec5712ab56 Add reflection-based support for sky-light level support for hideifundercover 2011-11-24 13:19:38 +08:00
Mike Primm
3f8814dfbc Make corrections to texture mappings on rails - cleans up transparent parts 2011-11-24 10:49:19 +08:00
Mike Primm
54589cd358 Depcrecate the regions plugins (add warnings, disable when replacement plugins are active). Remove example configuration.txt entries. 2011-11-24 07:49:10 +08:00
Mike Primm
0a790b6014 Fix typo 2011-11-23 02:07:07 +08:00
Mike Primm
36653a3187 Add triggered render statistics, new /dynmap triggerstats command 2011-11-23 01:03:03 +08:00
Mike Primm
f886fbc614 Handle special case slab and double-slab renders, invisible stairs 2011-11-22 11:45:27 +08:00
Mike Primm
fc824013b7 Add support and templates for "The End" 2011-11-21 19:25:11 -06:00
Mike Primm
7f7b8c7fcb Add support for 'webpage-title' setting, default title to server-name 2011-11-21 11:36:44 -06:00
Mike Primm
4db2d81fc1 Fix reporting of label markup and description in update events 2011-11-20 10:02:42 -06:00
Mike Primm
e986ab4bfb Fix update notice for area markers - missing description 2011-11-20 13:09:58 +08:00
Mike Primm
040a604e0c Migrate API code to dynmap-api 2011-11-16 13:43:31 +08:00
Salax-
616f46ba26 Fixed minor grammar errors in /dynmap show and /dynmap show player commands. 2011-11-16 13:43:13 +08:00
Mike Primm
bbb5db3524 Add cyrillic-support option for cyrillic codepage hack 2011-11-14 14:21:24 +08:00
Mike Primm
e696988e34 Update default textures to RC2, add dragon egg model 2011-11-13 23:24:43 -06:00
Mike Primm
e0c0729d08 Make hidden players not reported when joining/quitting server 2011-11-13 22:54:41 -06:00
Mike Primm
8be7e8f68a Add 'webmsgformat' setting, deprecate 'webprefix' and 'websuffix' 2011-11-06 12:05:26 +08:00
Mike Primm
ab963fca70 Add vlowres HD as default template set 2011-11-06 06:14:27 +08:00
Mike Primm
34fbe34ce6 Support rendering trapdoors in open and closed states 2011-11-04 13:13:34 +08:00
Mike Primm
1d06fef52b Add initial BuildCraft support 2011-11-03 00:05:10 -05:00
Mike Primm
c953097403 Add /dynmap purgequeue to purge tile update queue 2011-10-30 23:05:33 +08:00
Mike Primm
079f9dc8cd More corrections to texture scale handling with transparent textures 2011-10-30 13:04:35 +08:00
Mike Primm
05511f0495 Add support for config option (ic2-support) for enable of Industrial Craft 2011-10-30 11:58:55 +08:00
Mike Primm
baf29dfa7c Fix scaling of transparencies in textures 2011-10-30 11:58:55 +08:00
Mike Primm
ca62003e06 Defend against trap if renderdata/ directory doesn't exist (deleted by user) 2011-10-29 22:26:14 +08:00
Mike Primm
2eb6d47d87 Update IC2 wire model 2011-10-29 01:29:12 -05:00
Mike Primm
4a6d30f8a2 Add basic wire support rendering for IC2 2011-10-29 00:47:24 -05:00
Mike Primm
14cc26a0f5 Start of Industrial Craft 2 texture support 2011-10-24 23:44:38 -05:00
Mike Primm
d032909412 Add 'hideifshadow' and 'hideifundercover' option for client update: hides player position/health if they are at location below given light level (hideifshadow) or not under open sky (hideifundercover) 2011-10-23 12:59:27 -05:00
Mike Primm
bd0ddb160b Add support for hiding individual subzones on Residence 2011-10-22 18:38:50 -05:00
Mike Primm
3455a8a3d4 Add API for other plugins to trigger map renders due to updated volumes 2011-10-23 06:06:54 +08:00
Mike Primm
36d8a701e0 Add /dynmap sendtoweb command, and published API for sending web messages 2011-10-23 05:53:53 +08:00