Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-24 03:05:28 +01:00
Code Issues Projects Releases Wiki Activity
2,972 Commits 7 Branches 130 Tags 27 MiB
9cd7a3489a
Commit Graph

507 Commits

Author SHA1 Message Date
Mike Primm
88cea7c6e6 Add tables tags, <hr> to sanitizer 2022-02-05 00:02:30 -06:00
Mike Primm
e70f2845e8 Make sanizing consistent between initial and updates, add <center> 2022-02-04 23:50:49 -06:00
Mike Primm
bdfa148bfb Fix bamboo models 2022-02-04 23:19:47 -06:00
Mike Primm
fec2d1af03 Fix webpath update path 2022-02-04 23:14:31 -06:00
Mike Primm
6b208dd038 Add update-webpath-files setting to allow disable of web file updating 2022-02-04 21:47:33 -06:00
Mike Primm
716635c20e Create standalone directory, if needed, during storage startup 2022-02-04 20:09:07 -06:00
Mike Primm
e1af7ad952 Fix null check in PHP 2022-02-04 15:40:38 -06:00
Mike Primm
8e7b57bd89 Handle botched version upgrade on pristine mysql/mariadb 2022-02-03 15:24:57 -06:00
Mike Primm
26a987c98d Fix content type on webp 2022-02-03 15:24:37 -06:00
Mike Primm
8efdbed0b4 Fix SQL in PHP for NewImage 2022-02-03 15:12:59 -06:00
Mike Primm
327833832d Handle rollover from newImage to Image in MySQL PHP 2022-02-03 09:24:36 -06:00
DartCZ
b1a320d4bb
Include t.newImage after db structure changes 2022-02-03 13:47:43 +01:00
Mike Primm
4b8fa4a81d Switch slabs and wall torches to state= (test case) 2022-02-02 00:10:48 -06:00
Mike Primm
66082093de Add state= mapping for replacing data= in models and textures 
(eventually)
 2022-02-01 23:50:58 -06:00
Mike Primm
592ad5028e Fix cocoa model 2022-01-31 08:52:50 -06:00
Mike Primm
18740c4c2b Restore depricated method in PatchBlockModel 2022-01-30 16:12:46 -06:00
Mike Primm
e22ad9b8bf Start prep for shadow lighting rework 2022-01-30 14:23:00 -06:00
Mike Primm
fd420f739f Force cleanup of lingering render jobs (avoid shutdown exceptions) 2022-01-30 13:29:37 -06:00
Mike Primm
7fe8feb08d Fix lever models 2022-01-30 13:29:11 -06:00
Mike Primm
3823767c77 Fix cake ; handle defaulted UV values the odd ways MC seems to 2022-01-30 12:34:26 -06:00
Mike Primm
df3f6a2c19 Fix Sculk Sensor 2022-01-30 02:15:18 -06:00
Mike Primm
2ba2eb8517 Fix observer, handle vertical flips in modellist 2022-01-30 01:16:47 -06:00
Mike Primm
fcdb7d04b5 Switch azalea leaves to transparent 2022-01-30 00:14:25 -06:00
Mike Primm
f61288b7fd Fix azalea leaves (do not foliage shade) 2022-01-29 23:51:41 -06:00
Mike Primm
18325c4b96 Add the other glazed terracotta block fixes 2022-01-29 17:30:29 -06:00
Mike Primm
cd11283685 Fix for soul campfire, switch torches to modellist, add origin for 
rotate
 2022-01-29 16:54:36 -06:00
Mike Primm
64fe6d8b39 Fix comparator and repeater models 2022-01-29 13:07:35 -06:00
Mike Primm
f433454ac2 Finish modellist implementation, use for campfire, comparator 2022-01-29 03:57:04 -06:00
Mike Primm
c6c46bdd41 Makes sure popups for circles, areas, lines had correct class 2022-01-28 19:42:34 -06:00
Mike Primm
e5cab354ea Mark label as markup:true for UI (for alternate UIs) 2022-01-28 19:06:28 -06:00
Mike Primm
47edac3a33 Fix markup label handling on areas, lines, circles 2022-01-28 18:53:00 -06:00
Mike Primm
2d0a45795a Alter MySQL schema update to avoid tile table lock issues (hopefully) 2022-01-26 20:20:52 -06:00
Mike Primm
ea79274938 Add model element rotation to modellist 2022-01-23 22:33:47 -06:00
Mike Primm
d8cf759671 Remove debug noise 2022-01-23 21:49:49 -06:00
Mike Primm
4452777585 Add more vanilla model friendly modellist type for model file, use for 
comparator
 2022-01-23 21:44:26 -06:00
Mike Primm
a3df8251f9 Freshen colorschemes to 1.18, deprecate dead RPs, drop block number 
mappings
 2022-01-22 15:13:46 -06:00
Mike Primm
a20c43960a Fix texture rotations on crafting table, furnace 2022-01-21 16:25:40 -06:00
Mike Primm
4a97d31585 Fix carved pumpkin and jack-o-lantern rotations 2022-01-21 15:47:08 -06:00
Mike Primm
df83858675 Fix End Portal models 2022-01-20 00:02:54 -06:00
Mike Primm
363d95e10b Finish piston head fix 2022-01-19 22:44:53 -06:00
Mike Primm
18f2bba608 Fix piston head models 2022-01-19 22:38:25 -06:00
Mike Primm
83cfe0b1ea Add contents level to composter model 2022-01-19 21:23:39 -06:00
Mike Primm
44e3ebbff3 Fix for grindstone block 2022-01-19 20:58:23 -06:00
Mike Primm
bfb11c36f5 Fix model and texture definitions for bells 2022-01-19 19:50:57 -06:00
Mike Primm
7afb6e5fb8 Fix off-by-one on max chunk section 2022-01-18 23:55:17 -06:00
Mike Primm
2dd6664bdb Add connectionString to SQLException reports, if defined 2022-01-18 22:07:07 -06:00
Mike Primm
4268b0b6c8 Make SQLException reporting more verbose 2022-01-18 21:57:48 -06:00
Mike Primm
04104d125c Update tp Leaflet 1.8.0-dev for tile seam fix (hopefully) 2022-01-18 20:08:20 -06:00
Mike Primm
c887df5ad8 Limit MySQL purgemap deletes 2022-01-16 21:49:52 -06:00
Mike Primm
45299a153c Finish upgrade SQL 2022-01-16 20:22:16 -06:00
Mike Primm
bbdebbffa6 Update DB schemas for bigger blobs - make MySQL/MariaDB more common 2022-01-16 13:38:06 -06:00
mikeprimm
ebb312c90e
Merge pull request #3611 from JLyne/multipolygon-fix 
Fix 3D areas
 2022-01-15 18:21:59 -06:00
James Lyne
3ebc1b4123 Fix references to removed MultiPolygon constructor 2022-01-14 15:39:49 +00:00
Mike Primm
b85a159bda Handle manual edits of markers.yml, update of non-markup values 2022-01-12 22:19:12 -06:00
Mike Primm
04ef31fa3b Switch label on markers to be stored as HTML fragment 2022-01-12 20:48:28 -06:00
mikeprimm
a19674c20c
Merge pull request #3599 from JurgenKuyper/v3.0 
update tiles storage to use mediumblob
 2022-01-10 10:59:30 -06:00
James Lyne
27aa077116 Add %uuid% placeholder for skin-url 2022-01-07 23:06:48 +00:00
JurgenKuyper
a81a6a9486
update tiles storage to use mediumblob 
set type to mediumblob to allow for boost type 3 to be stored
 2022-01-06 10:53:18 +01:00
Mike Primm
2f3f2350b3 Fix lantern render details 2021-12-30 16:55:43 -06:00
Mike Primm
c48ed688b2 Make state sensitive custom models cache more efficient (save memory) 2021-12-29 18:41:54 -06:00
Mike Primm
0166895a7f Tune memory use on generic chunks, lighting lookup performance 2021-12-28 22:14:19 -06:00
Mike Primm
adcfedd68e Kill debug noise 2021-12-28 16:28:12 -06:00
Mike Primm
f577d8f6f4 Update ColorSchemes, support block state based lookup 2021-12-28 16:27:01 -06:00
Mike Primm
44bcf6bbab Update links 2021-12-28 14:57:00 -06:00
Mike Primm
dbf595c38d Update colormaps 2021-12-28 14:51:58 -06:00
Mike Primm
332292c42c Fix mushroom stem render, cleanup System.out uses 2021-12-28 14:37:20 -06:00
mikeprimm
48ba0b2e41
Merge pull request #3571 from JLyne/tabcomplete 
Add tab completions for commands
 2021-12-28 10:16:05 -06:00
Mike Primm
8b510102f9 Add basic horizontal light spread to fallback sky lighting 2021-12-26 15:54:57 -06:00
Mike Primm
227a18ceac Check isLightOn flag as well 2021-12-25 22:39:06 -06:00
Mike Primm
450921569c Improve forge chunk generate handling 2021-12-25 21:46:28 -06:00
Mike Primm
b611d34242 Turn on use of good light again 2021-12-24 21:57:14 -06:00
Mike Primm
5b735dab3f Implement basic sky lighting for chunks with broken lighting (spigot) 2021-12-24 21:55:19 -06:00
Mike Primm
3a3a970883 Implement basic sky lighting for chunks with broken lighting 
(forge,fabric)
 2021-12-24 20:38:05 -06:00
Mike Primm
05819b1b74 Further handle broken lighting data... start builder pattern for 
blockstate
 2021-12-24 10:19:02 -06:00
Mike Primm
67ab35658c Switch to assuming sky light data for states below 'light' are crap... 2021-12-24 09:22:32 -06:00
Mike Primm
bd4a34e2ae Shift string safely into Log class, finish hack substitution string 2021-12-24 00:08:52 -06:00
Mike Primm
9e602f50d6 Initial mitigation for folks updating Dynmap but not patching MC for 
some reason
 2021-12-23 14:27:33 -06:00
Mike Primm
895dcf3244 Fix webp v1.2.x 2021-12-22 22:33:10 -06:00
Mike Primm
efceaf2d8d Fix placed lanterns, sout lanterns 2021-12-22 22:09:16 -06:00
Mike Primm
94c91b12b9 Add stack dump for render exceptions (debug) 2021-12-22 21:51:59 -06:00
James Lyne
182d214c83 Improve tab completion for quoted arguments 2021-12-21 15:54:09 +00:00
James Lyne
742e289d56 /dynmapexp tabcompletions 2021-12-21 15:54:09 +00:00
James Lyne
2b2735516b /dmarker tabcompletions 2021-12-21 15:54:09 +00:00
James Lyne
20d93ad3a5 /dmap tabcompletions 2021-12-21 15:54:07 +00:00
James Lyne
c87df916f2 /dynmap tabcompletions 2021-12-21 11:58:54 +00:00
James Lyne
424000a05f Very basic single level spigot tabcomplete 2021-12-21 11:58:54 +00:00
Mike Primm
a5bbe6bdd4 Make pessimistic assumption on lighting to handle broken chunk 
generators
 2021-12-20 18:07:54 -06:00
Mike Primm
99caded016 Update chunk state/version shaders 2021-12-19 23:44:48 -06:00
Mike Primm
24d78e5f78 Add chunkstatus and chunkversion shaders (for problem determination) 2021-12-19 21:02:35 -06:00
Mike Primm
9691656579 Further tune logic for fluid model selection 2021-12-19 14:39:53 -06:00
Mike Primm
3a2b5a2326 Start work on culling for fluids to improve render performance 
(hopefully)
 2021-12-19 12:22:01 -06:00
Mike Primm
003de384ca Handle negative height values for ISO perspective clipping 2021-12-18 20:42:40 -06:00
Mike Primm
9a75210abf Drop generateSky log spam 2021-12-16 14:07:50 -06:00
Mike Primm
69a6bb2a2a Apply lighting workaround to 1.16.5+ 2021-12-16 12:32:10 -06:00
Mike Primm
eff72aeef0 Add simple lighting generation for migrated chunks with missing light 2021-12-15 23:34:53 -06:00
Mike Primm
c2f0a35eb3 Handle biome shading at edges 2021-12-15 21:08:32 -06:00
Mike Primm
54471c6695 Workaround bizarre 1.17->1.18 chunk lifecycle (Spigot, Fabric, Forge) 2021-12-15 20:40:06 -06:00
Mike Primm
3725123b76 Fix handling of single block state sections (zero bit palette) 2021-12-14 23:58:01 -06:00
CylonicRaider
a8f13e9dca Fix boosted top-down-view map artifacts 2021-12-12 22:34:53 +01:00
Mike Primm
0d477db78b Handle negative Y in topo shader 2021-12-12 01:42:39 -06:00
Mike Primm
d5354898cb Avoid initial ERROR when no markers.yml file (first installation) 2021-12-10 00:10:11 -06:00
Mike Primm
f40cc3d6ca Strip META-INF/maven and services - avoid problems with forge 1.18 2021-12-08 20:34:03 -06:00
Mike Primm
634eb5fd2f Add support for largeplayerfaces option for bigger player markers 2021-12-07 21:38:59 -06:00
Mike Primm
1f8d584b88 Revert snakeyaml to avoid windows file problem... 2021-12-07 15:51:50 -06:00
Mike Primm
5e12090f95 Additional tuning 2021-12-07 00:24:05 -06:00
Mike Primm
d42921beb5 Migrate Spigot, Forge, Fabric 1.17.1 to generic chunk handling 2021-12-07 00:01:07 -06:00
Mike Primm
a40830434d Handle fields in yaml config files with "/" - fix for #3533 2021-12-05 20:32:22 -06:00
Mike Primm
06885c0353 Fix BiomeMap NPE, switch Fabric to GenericMapChunkCache 2021-12-05 12:53:42 -06:00
Mike Primm
f56f4378c5 Fix handling of new, additional buiomes 2021-12-05 05:01:59 -06:00
Mike Primm
37fd064434 Put 3D biome code in spigot 1.18 - still working on grass shading... 2021-12-05 01:57:59 -06:00
Mike Primm
983a2a4390 Tie in standard biomes by resource location 2021-12-04 23:01:13 -06:00
Mike Primm
8c51db5608 Try out generic chunk code and 3d biomes on Forge 1.18 2021-12-04 21:33:02 -06:00
Mike Primm
13d2cc05cb More generic chunk and iterator support classes 2021-12-04 12:12:37 -06:00
Mike Primm
d3639bd4a6 Add generic chunk, and builder 2021-12-04 03:04:08 -06:00
Mike Primm
be43072cd1 Start chunk and biome rework - common chunk section class 2021-12-04 01:11:35 -06:00
Mike Primm
76557bf312 Biome shading fixes for 1.18 (Spigot, Fabric, Forge) 2021-12-02 22:18:03 -06:00
Mike Primm
d52f02d88e Some more Spigot 1.18 work - still NOT functional 2021-12-01 00:47:19 -06:00
James Lyne
c97f328f3e Update leaflet images 2021-11-11 22:27:28 +00:00
Mike Primm
5ad8a3cd91 Fix missing candle texture mapping 2021-10-04 15:53:40 -05:00
James Lyne
0630b2f15d Fix DynmapTileLayer sharing object instances 2021-10-04 20:40:07 +01:00
Mike Primm
77525fda47 Fix rails for both pre 1.17 and 1.17 2021-10-03 01:29:47 -05:00
Mike Primm
6be523106d Fix rail rendering 2021-10-03 00:32:07 -05:00
Mike Primm
e8f560e0b6 Add missing 1.17 blocks 2021-10-02 23:23:01 -05:00
Mike Primm
7f719bcead Maintain order on mod support API 2021-10-02 19:31:46 -05:00
Mike Primm
cbfbfb4d58 Add newer ores to hideores support 2021-10-02 17:41:19 -05:00
mikeprimm
296186fba3
Merge pull request #3499 from SNDST00M/hotfix-selectworld-string 
Fix selectWorld typo when world is a string
 2021-10-02 13:39:02 -05:00
mikeprimm
b1be8e4626
Merge pull request #3501 from JLyne/fetchskins-fix 
Always run LoadPlayerImages task in the thread pool
 2021-10-02 13:37:29 -05:00
James Lyne
404bc34e5f Always run LoadPlayerImages task in the thread pool. 
Prevents the main thread being blocked if the mysql connection is lost etc, when fetchskins is disabled.
 2021-10-01 13:44:29 +01:00
SNDST00M: M.U.N.I.N
bb3d5e240c
Fix selectWorld typo when world is a string 2021-09-30 19:21:28 +01:00
gmfamily
937b4e2a34 fix(radius) - gmfamily - process radius as int everywhere (#3478) 2021-09-18 19:47:46 +02:00
mikeprimm
56a683b4b3
Merge pull request #3477 from stormboomer/StormBoomer-Test1 
Add requested Feature to check for MySQL Connector
 2021-09-07 22:08:06 -05:00
mikeprimm
2eee8d4e2d
Merge pull request #3464 from Boothin/v3.0 
Add Essentials RGB hex parsing
 2021-09-07 22:02:51 -05:00
mikeprimm
982b587a37
Merge pull request #3467 from JLyne/leaflet 
Update leaflet version (0.5.1 -> 1.7.1)
 2021-09-07 22:01:52 -05:00
FedUpWith-Tech
0c001eea7c
Change radius value of round area markers to int 2021-08-29 10:42:29 -04:00
stormboomer
70c282ccd0 adding a function to check if a class exists, allows for better addition if other connector classes need to be checked in the future 2021-08-28 22:01:43 +02:00
stormboomer
0872a5bb35 Adds requested feature for #3432 2021-08-28 21:52:38 +02:00
Mike Primm
fa0e87d3c0 Add 'dynmap dumpmemory' command to dump RP image count, mem use 2021-08-27 18:40:53 -05:00
James Lyne
31938d530a Fix player marker updating when players layer is hidden 2021-08-23 15:48:02 +01:00
James Lyne
ca9009e33f Fix tile updating 2021-08-23 15:48:01 +01:00
James Lyne
94ecd3f495 Fix layer control 2021-08-23 15:48:00 +01:00
James Lyne
82119dc32d Extend CustomMarker from L.Marker, add CustomIcon for icon handling 2021-08-23 15:47:58 +01:00
James Lyne
239f13326b Projection fixes 2021-08-23 15:47:57 +01:00
James Lyne
d312f43e5c Initial work, enough to get the map to display 2021-08-23 15:47:55 +01:00
James Lyne
37c6ca04d9 Update leaflet 2021-08-23 15:47:50 +01:00
Jeff P
507dfcefc5 Add essentials RGB hex parsing 2021-08-22 00:11:39 -04:00
Mike Primm
809e45631c Add support for experimental Caves and Caverns data pack 2021-08-21 18:03:07 -05:00
Mike Primm
feb29208a6 Drop code from PR #3443 - doesn't compile, so not tested 2021-08-21 13:02:26 -05:00
mikeprimm
fddba6a15f
Merge pull request #3443 from Boothin/v3.0 
Parse Essentials RGB Hexcode nickname colors
 2021-08-21 10:59:59 -05:00
mikeprimm
9716a1ec61
Merge pull request #3450 from rlcurrall/php-code-format 
chore: run formatter tools against PHP code
 2021-08-21 10:58:23 -05:00
FedUpWith-Tech
a66cbc0817
Remove Broken Dynmap reload command 
This isn't a fix for the reload command it just removes it from being exposed to the user to prevent them from running the command and breaking it  till the reload command can be fixed.
 2021-08-19 21:06:39 -04:00