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
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
Mike Primm
23ea19e737 Add grayscaledark attribute to control dark color in graytone 2020-05-16 17:06:14 -05:00
Mike Primm
80f8aca6f7 Clean up init of coord widget 2020-05-02 18:19:17 -05:00
Mike Primm
15cf132ada show-mc 2020-05-02 17:50:22 -05:00
Mike Primm
e7fefeae8d Add support for lighting level toned maps: nightspawn daynightspawn 2020-05-02 15:21:47 -05:00
Mike Primm
28f2935fc5 Provide grayscale and graytone in default lighting 2020-05-02 14:11:52 -05:00
Mike Primm
2c3adfb451 Change parchment default to #C09A53 2020-05-02 13:05:05 -05:00
Mike Primm
6a99217676 Add support for grayscale lighting, parchment lighting 2020-05-02 13:00:51 -05:00
mikeprimm
3b09dba95f
Merge branch 'v3.0' into postgres 2020-04-12 19:35:03 -05:00
L0laapk3
7c5d339706 fix centering of markers 2020-04-01 00:14:18 +02:00
baconwaifu
3feb14d8cb Add initial postgres standalone support. EXPERIMENTAL. chat broken. 2020-01-27 22:27:09 -05:00
Mike Primm
b11420f94b Fix ladder model 2020-01-12 20:17:22 -06:00
Mike Primm
fce54cc0e3 Add new 1.15 blocks (beehive, bee nest, honey, honeycomb) 2019-12-15 14:22:14 -06:00
Lennart Becker
59578e6824 Standalone: Load changes immediately after page load 2019-11-29 12:33:03 +01:00
Mike Primm
5b218f0ece Add 1.14 Bell support 2019-06-05 18:25:32 -05:00
Mike Primm
8ca24ff502 Add 1.14 campfile 2019-06-05 17:44:51 -05:00
Mike Primm
15b5b65914 Add 1.14 stonecutter 2019-05-26 00:37:40 -05:00
Mike Primm
145a88e632 Add 1.14 smithing table 2019-05-26 00:18:32 -05:00
Mike Primm
5ba25420a0 Add 1.14 lantern 2019-05-26 00:07:01 -05:00
Mike Primm
48bc5895d4 Add 1.14 lectern 2019-05-18 22:18:38 -05:00
Mike Primm
e8ab5d656c Add 1.14 grindstone 2019-05-18 21:44:13 -05:00
Mike Primm
01e987c046 Add 1.14 sweet berry bush 2019-05-18 20:49:16 -05:00
Mike Primm
9f3c1a7e07 Add 1.14 fletching and cartography tables 2019-05-18 19:36:58 -05:00
Mike Primm
9027e4748c Add 1.14 blast furnace 2019-05-18 19:19:00 -05:00
Mike Primm
8fbd924f0f Add 1.14 smoker 2019-05-18 19:13:05 -05:00
Mike Primm
2c467782f0 Add 1.14 barrels,loom 2019-05-18 18:57:33 -05:00
Mike Primm
3965e75f83 Add more 1.14 blocks 2019-05-18 18:26:52 -05:00
Mike Primm
313b7f3beb Finish new 1.14 walls, add boxlist: model, use for scaffolding 2019-05-17 23:58:15 -05:00
Mike Primm
0fd04cb66a Finish 1.14 slabs 2019-05-17 00:41:47 -05:00
Mike Primm
13f30e7c99 Drop unneeded RP content 2019-05-17 00:25:38 -05:00
Mike Primm
1e5ef89bba Finish up new 1.14 stairs 2019-05-16 23:50:45 -05:00
Mike Primm
ae87554274 Add some 1.14 blocks 2019-05-15 23:31:33 -05:00
Mike Primm
5a2def9ffb Add 1.14 block resources 2019-05-15 22:51:12 -05:00
Mike Primm
1a470fe226 Add model and texture changes for 1.14 signs 2019-05-03 22:22:46 -05:00
Mike Primm
495a6f7ec2 Add ImageLen for SQLLite to PHP (standalone server) 2019-02-04 00:13:02 -06:00
mikeprimm
f4a7d46575
Merge pull request #2433 from KovuTheHusky/biomes-1.13 
Add 1.13 biome mappings and colors
 2019-02-03 22:18:09 -06:00
alpe12
7f8f44737e
Reduce the transfered image size when using SQLite 
https://github.com/webbukkit/dynmap/issues/2415
 2019-01-31 21:03:11 -02:00
KovuTheHusky
96eb4decf5 Add 1.13 biome mappings and colors 2019-01-30 17:32:57 -05:00
Mike Primm
08226b8602 Update default player skin to new format, expect 64x64 2018-12-31 08:37:01 -06:00
Mike Primm
3650dc7d2a Fix scaling of player health bar 2018-12-07 21:33:35 -06:00
Mike Primm
505e6b3b90 Improve ETag caching support for image tiles 2018-12-07 21:32:28 -06:00
Mike Primm
41a6a14fbd Fix 1.13 snow layer model 2018-12-01 23:06:05 -06:00
Mike Primm
fd698de4c0 Fix oak stairs model for pre-1.13 2018-12-01 22:50:44 -06:00
Mike Primm
df43618354 Fix flowerpot model 2018-09-11 00:09:57 -05:00
Mike Primm
fff104b424 Fix sign models 2018-09-10 23:23:53 -05:00
Mike Primm
0a17eb060a Fix 1.13.x chest rendering models 2018-09-09 18:49:57 -05:00
Mike Primm
f058b8ba65 Fix iron trapdoor model, fix orientation of open trapdoors (1.13) 2018-09-09 18:26:40 -05:00
Mike Primm
f8417cbfd9 Fix button models for 1.13.x 2018-09-09 18:05:30 -05:00
Mike Primm
4afef4503a Add hide-land option for Underwater view shader (default = true) 2018-09-05 19:03:29 -05:00
Mike Primm
5dd7abaddb Fix white stained glass in 1.13.x 2018-09-03 15:34:37 -05:00
Mike Primm
d6f43206d1 Fix bubble columns 2018-09-02 10:09:15 -05:00
Mike Primm
9cff98807a Avoid warnings with 1.13.1 specific blocks on 1.13 2018-09-01 20:37:42 -05:00
Mike Primm
a18a1ddc06 Finish fixing new water 2018-09-01 19:16:55 -05:00
Mike Primm
6da97c5e3f Start work on new water model - shift over to using basic version 2018-09-01 16:55:00 -05:00
Mike Primm
3328a206e2 Add new 1.13.1 blocks (dead corals) 2018-08-26 23:50:10 -05:00
Mike Primm
92d323aa85 Fix model file typo 2018-08-26 23:19:07 -05:00
Mike Primm
c1e7be2632 Fix 1.13 door rendering 2018-08-26 22:54:59 -05:00
Mike Primm
5d2b9d17b7 Fix 1.13 redstone wire model 2018-08-26 21:26:46 -05:00
Mike Primm
0ba1d370ca Add huge mushroom skinning for 1.13 2018-08-26 19:42:29 -05:00
Mike Primm
f907875ea4 Fix 1.13 vine model 2018-08-26 18:30:59 -05:00
Mike Primm
4933fc1909 Fix glass pane / iron bars rendering 2018-08-26 17:50:40 -05:00
mikeprimm
400f8ca2eb
Stub mushroom cap mapping for 1.13 2018-08-26 11:54:17 -05:00
mikeprimm
c6d238895f
Fix blue wool typo 2018-08-26 11:40:51 -05:00
Mike Primm
69015851eb Fix prismarine slabs, stairs 2018-08-25 01:10:29 -05:00
Mike Primm
a50005ebe4 Start 1.13 fence gate renderer 2018-08-24 23:33:19 -05:00
Mike Primm
d391d192d6 Fix cave renderer - handle different types of air in 1.13 2018-08-24 02:17:28 -05:00
Mike Primm
f4a99145cf Merge Forge 1.11.2 into common 3.0 gradle build 2018-08-23 07:52:46 -05:00
Mike Primm
f53b753cb5 Fix some 1.12.2 textures 2018-08-22 07:48:35 -05:00
Mike Primm
8d76c70f21 Add conduit 2018-08-22 00:41:37 -05:00
Mike Primm
33fda83c59 Fix rail models for 1.13 2018-08-22 00:28:37 -05:00
Mike Primm
98a9fd6341 Add 1.13 specific fence/wall renderer 2018-08-21 23:48:07 -05:00
Mike Primm
8c7d1f6181 Support 1.13 water toning for biomes 2018-08-21 00:34:04 -05:00
Mike Primm
40545bdcfb Fix models for seagrass 2018-08-21 00:12:28 -04:00
Mike Primm
af05c1dcbd Fix bubbles 2018-08-20 23:51:48 -04:00
Mike Primm
d6c263bdf6 Add missing corals 2018-08-20 23:00:28 -04:00
Mike Primm
dfe2d00447 Fix prismarine blocks 2018-08-20 22:05:46 -04:00
Mike Primm
25eb57c658 Add TexturePackHDUnderwaterShader (clear view underwater) 2018-08-20 21:39:39 -04:00
Mike Primm
2ebab4b7fc Handle waterlogged/water-filled blocks, fix turtle eggs, pickles 2018-08-20 16:19:44 -04:00
Mike Primm
42dfce94bc Add some more 1.13 blocks 2018-08-19 23:42:31 -04:00
Mike Primm
4d1602c418 Handle waterlogged block states 2018-08-19 23:09:55 -04:00
Mike Primm
2a23ec10e9 Finish corals 2018-08-19 00:15:52 -04:00
Mike Primm
6162834bab Start 1.13 specific blocks 2018-08-18 19:20:53 -04:00
Mike Primm
882c75090e Fix orientations for 1.12 models 2018-08-18 18:56:58 -04:00
Mike Primm
667fc7dd15 Finish first pass on pre 1.13 blocks 2018-08-18 17:55:35 -04:00
Mike Primm
2fc1f92e20 Some more blocks 2018-08-18 10:48:24 -04:00
Mike Primm
944a2670dd More blocks 2018-08-18 01:01:47 -05:00
Mike Primm
176fd6741b Even more blocks 2018-08-17 20:48:28 -05:00
Mike Primm
fb366b1b99 More blocks 2018-08-17 03:54:11 -05:00
Mike Primm
00742e09a3 More 1.13 blocks 2018-08-16 08:33:13 -05:00
Mike Primm
14b876c950 Convert more blocks 2018-08-14 03:02:34 -05:00
Mike Primm
8f17133725 Get 1.13 stairs renderer working 2018-08-13 02:52:34 -05:00
Mike Primm
88654fdf9d Add/fix more 1.13 blocks 2018-08-12 02:32:55 -05:00
Mike Primm
1de0f66230 Merge DynmapCoreAPI into common gradle build 2018-08-12 00:53:55 -05:00