Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-09-29 06:07:25 +02:00
Code Issues Projects Releases Wiki Activity
3,112 Commits 7 Branches 130 Tags 27 MiB
cc9f6f0bc4
Commit Graph

242 Commits

Author SHA1 Message Date
Mike Primm
b8d08a8ce2 Fix chain models 2022-02-05 00:52:30 -06:00
Mike Primm
bdfa148bfb Fix bamboo models 2022-02-04 23:19:47 -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
e1af7ad952 Fix null check in PHP 2022-02-04 15:40:38 -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
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
47edac3a33 Fix markup label handling on areas, lines, circles 2022-01-28 18:53:00 -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
04104d125c Update tp Leaflet 1.8.0-dev for tile seam fix (hopefully) 2022-01-18 20:08:20 -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
04ef31fa3b Switch label on markers to be stored as HTML fragment 2022-01-12 20:48:28 -06:00
Mike Primm
2f3f2350b3 Fix lantern render details 2021-12-30 16:55:43 -06:00
Mike Primm
f577d8f6f4 Update ColorSchemes, support block state based lookup 2021-12-28 16:27:01 -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
Mike Primm
450921569c Improve forge chunk generate handling 2021-12-25 21:46:28 -06:00
Mike Primm
efceaf2d8d Fix placed lanterns, sout lanterns 2021-12-22 22:09:16 -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
634eb5fd2f Add support for largeplayerfaces option for bigger player markers 2021-12-07 21:38:59 -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
SNDST00M: M.U.N.I.N
bb3d5e240c
Fix selectWorld typo when world is a string 2021-09-30 19:21:28 +01: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
Robb Currall
db8b1d49c1
chore: run formatter tools against PHP code 
Run formatting tools against the PHP source code to meet PSR12 standards

The tools used to format the code (for anyone interested in validating
the changes are:
* [PHP-CS-FIXER](https://github.com/FriendsOfPHP/PHP-CS-Fixer)
* [PHPCS](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Fixing-Errors-Automatically)
 2021-08-05 10:56:41 -04:00
Mike Primm
31bbe96051 Add basic support for banner rendering 2021-06-26 18:15:20 -05:00
Mike Primm
8e516e944a Fix moss_carpet texture 2021-06-26 13:15:21 -05:00
mikeprimm
bc51a14006
Merge pull request #3343 from Programie/v3.0 
Prevent updating map while invisible
 2021-06-21 13:10:57 -05:00
jzdm
cc9071e85b
Working web chat with PostgreSQL 
Webchat basically working when using PostgreSQL. No chatlengthlimit.
 2021-06-18 09:16:06 +02:00
Mike Primm
0ecd764264 Add more 1.17 blocks (dripstone, moss, roots) 2021-06-13 21:58:01 -05:00
Mike Primm
b42cc789a8 Add waxed copper blocks, other blocks 2021-06-13 13:26:23 -05:00
Mike Primm
eb41195984 Add more 1.17 blocks (mostly copper related) 2021-06-13 09:49:40 -05:00
Mike Primm
d16900f76d Add missing deepslate blocks 2021-06-12 15:33:08 -05:00
Mike Primm
709ac9bdb1 Update texture resources for 1.17, add deepslate blocks for 1.17 2021-06-12 15:05:19 -05:00
Michael Wieland
ce34a4db84 Prevent updating map while invisible 2021-04-19 19:06:38 +02:00
Michael Wieland
fabaf487d9 Fixed not replacing {timestamp} placeholder in configuration request 2021-02-25 17:57:13 +01:00
mikeprimm
5f9e93c312
Merge pull request #3223 from mooinglemur/mooinglemur-patch-1 
Allow for URI-unsafe player names
 2021-01-09 18:10:06 -06:00
mooinglemur
33411d9ee5
Allow for URI-unsafe player names 
Some plugins allow for a player name prefix. If this contains a username-unsafe character like %, it can break player face rendering on the map.
 2020-12-26 10:06:15 -07:00
KovuTheHusky
400ce55e70
Add 1.16 biomes 2020-12-24 10:52:44 -05:00
Paul
9983bef353
Fixed jquery file name 2020-10-16 16:42:37 +03:00
Mike Primm
531c1eecb6 Handle undefined marker set errors 2020-09-20 19:56:28 -05:00
Mike Primm
1ab80de88e Merge branch 'v3.0' of git@github-home:webbukkit/dynmap.git into v3.0 2020-09-20 18:55:59 -05:00
Mike Primm
aca83f114f Update jQuery 2020-09-20 18:55:40 -05:00
KasaneKona
e2ad413f90 Fix podzol being biome tinted 2020-09-18 23:16:16 +01:00
Mike Primm
19949528a0 Fix chest rendering (block state case problem) 2020-08-20 21:42:25 -05:00
Mike Primm
6e35b7e872 Fix 'improved' menu icon PR 2020-08-17 19:41:33 -05:00
mikeprimm
1bbe0bea30
Merge pull request #3008 from Kimax89/master 
better map icon logic
 2020-08-16 12:41:27 -05:00
FedUpWith-Tech
60a98e43b7
Fix typo in worlds.txt 2020-08-07 21:41:36 -04:00
reviiii
55bcffe92a
Add animations to customMarkers 2020-07-23 13:54:39 +02:00
Mike Primm
e0b9e6bfe7 Fix pozdol with snow 2020-07-19 23:43:29 -05:00
Mike Primm
ec2350c753 Fix piston rendering 2020-07-19 19:53:48 -05:00
Mike Primm
63a044fe08 Fix stone slab texture 2020-07-19 17:32:23 -05:00
Klaus Kirkeby
79e98278d4 better map icon logic 
This changes the way maps should be named in worlds.txt and how the sidebar shows the icons.

Added missing map icons.
 2020-07-04 19:15:52 +02:00
Mike Primm
d9152d11c8 Handle new 1.16.1 wall state and render logic 2020-06-27 14:17:52 -05:00
Mike Primm
b700dbbfc0 Fix target block 2020-06-27 12:35:25 -05:00
Mike Primm
b8e751457c Finish first pass for 1.16.1 blocks 2020-06-27 00:49:59 -05:00
Mike Primm
b4d6140e82 More 1.16.1 blocks - about 3/4 done 2020-06-26 22:27:50 -05:00
Mike Primm
1c82497d81 Some more 1.16.1 blocks - about 1/2 done 2020-06-26 01:56:47 -05:00
Mike Primm
4fee9c3e55 Add initial set of 1.16.1 block definitions (about 1/3 of them) 2020-06-26 01:13:09 -05:00
Mike Primm
75b801365e Add 1.16.1 image resources 2020-06-25 20:54:01 -05:00
Mike Primm
139ca7b7d7 Drop old model and blockstate resources 2020-06-25 20:51:28 -05:00
Mike Primm
7105efdf0d Adjust parchmentbw 2020-05-16 17:55:01 -05:00
Mike Primm
28875286ea Add parchmentbw for no shadow b/w render lighting 2020-05-16 17:30:59 -05:00
Mike Primm
4d44903571 Add blackandwhite mode with threshold for two tone 2020-05-16 17:26:16 -05:00