Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-12-24 01:27:37 +01:00
Code Issues Projects Releases Wiki Activity
2,726 Commits 7 Branches 130 Tags 27 MiB
04104d125c
Commit Graph

360 Commits

Author SHA1 Message Date
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
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
Jeff P
23a0419c7d
Parse Essentials RGB Hexcode nickname colors 2021-07-28 21:15:33 -04:00
BrainStone
d48f0bcde9
Added fallback in case no tile exists 2021-07-23 01:39:53 +02:00
BrainStone
2a7e69e281
Move timestamp logic into a safe place 2021-07-23 00:35:40 +02:00
BrainStone
e3d5990dbe
Use the latest subtile timestamp 
for zoom out processing, instead of the render start time.
 2021-07-21 23:30:54 +02:00
BrainStone
ed0e5534fd
Impelemted it for SQL style storage 2021-07-20 23:18:04 +02:00
BrainStone
476aa0c133
Set timestamps when rendering starts 
- Currently only implemented for FileTreeMapStorage
 2021-07-20 22:50:01 +02:00
Kosma Moczek
d0926b0ec7 DynmapCore: fix indentation 2021-06-27 19:38:45 +02:00
Kosma Moczek
1fb4d6c244 DynmapCore: fix resource patching 2021-06-27 19:37:03 +02:00
Kosma Moczek
5290cdf9f1 DynmapCore: update processResources to Gradle 7 format 2021-06-27 14:18:53 +02:00
Kosma Moczek
cf121956c3 build.gradle: rename compile -> implementation 2021-06-27 13:51:12 +02:00
Mike Primm
31bbe96051 Add basic support for banner rendering 2021-06-26 18:15:20 -05:00
Mike Primm
3722564e4f Clean up deprecation warning 2021-06-26 13:22:05 -05:00
Mike Primm
8e516e944a Fix moss_carpet texture 2021-06-26 13:15:21 -05:00
Mike Primm
bf67de2ab6 Add fix for changing marker set for areas, circles, lines 2021-06-26 13:07:40 -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
Mike Primm
99d5416acb Add performance tweaks on DynmapBlockState 2021-03-14 14:08:38 -05:00
Michael Wieland
fabaf487d9 Fixed not replacing {timestamp} placeholder in configuration request 2021-02-25 17:57:13 +01:00
Mike Primm
b7e7039c38 Add postgres JDBC to uberjar, shadow to avoid global conflicts 2021-02-07 22:50:41 -06:00
Mike Primm
c77d3b444a Merge branch 'v3.0' of git@github-home:webbukkit/dynmap.git into v3.0 2021-01-09 19:49:57 -06:00
Mike Primm
8244394cc4 Zap warning for lack of webp tools - confusing support headache 2021-01-09 19:49:39 -06:00
mikeprimm
bc1fa86823
Merge pull request #3241 from silentnoodlemaster/v3.0 
Add option to use lossless webp format
 2021-01-09 18:10:31 -06: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
Ben Lönnqvist
3f821a902d
added option webp-l to use lossless webp #3191 2021-01-08 23:45:30 +02:00
Mike Primm
17bf9e982f Bump to 3.1-beta6 (release candidate) 2021-01-01 12:33:40 -06:00
Mike Primm
806e8c056a Initial file filter code 2021-01-01 11:16:40 -06:00
Mike Primm
2b1d0aa955 Add warnings for wrong client update component vs web server disabled 2020-12-31 16:55:52 -06:00
Mike Primm
3344b007c6 Shift internal server check earlier 2020-12-31 16:50:48 -06:00
Mike Primm
95a91d2a89 Add first pass of handling for DB config.php files 2020-12-31 15:56:23 -06:00
mikeprimm
d45112d60c
Merge pull request #3196 from thrimbor/fix_fullrender_format_change 
Fix fullrender deleting the files in the new format instead of the old
 2020-12-30 18:51:44 -06:00
mikeprimm
5e5316d1e8
Merge pull request #3216 from 811Alex/misconfwarn 
Add warning for ClientUpdateComponent misconfiguration, related to disable-webserver
 2020-12-30 18:50:46 -06:00
mikeprimm
e879ed7e41
Merge pull request #3184 from silverwolfg11/path-null-check 
Null check for path environment variable.
 2020-12-30 18:48:17 -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
Alex811
b670449843 Add warning for ClientUpdateComponent misconfiguration, related to disable-webserver 2020-12-19 15:14:32 +02:00
Stefan Schmidt
b0bfa4404f Fix fullrender deleting the files in the new format instead of the old 2020-11-24 05:33:04 +01:00
Silverwolfg11
87087a9c1e Null check for path environment variable. 2020-11-14 23:21:06 -08:00
mikeprimm
a1f045f8ca
Merge pull request #3152 from Puupuls/patch-1 
Fixed jquery file name
 2020-11-08 08:34:25 -06:00
Mike Primm
460e6f9815 Add WEBP support, via cwebp/dwebp tools 2020-10-25 18:40:33 -05:00
Paul
9983bef353
Fixed jquery file name 2020-10-16 16:42:37 +03:00
electron93
dbc158b51a Fix comma on some locales 2020-09-22 16:31:06 +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
Mike Primm
5407f3c026 Split JSON formatter lines (see if this helps with browser issues) 2020-09-20 17:56:20 -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
Mike Primm
60a23a04c8 Handle pre-1.16 chunks in forge 1.16+ 2020-08-15 19:29:29 -05:00
Mike Primm
252f9afcdb Add support for marker set persistence, prevent add to non persistent 2020-08-12 10:08:36 -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
Mike Primm
073a277f77 Zap corner list in listarea - too much output 2020-07-06 19:29:42 -05:00
Mike Primm
24b2a00d23 Add /dmap worldgetlimits, worldaddlimit, worldremovelimit commands 2020-07-04 18:02:30 -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
f911752c0c Fix occasional server shutdown issue due to non-daemon thread 2020-06-07 21:07:10 -05:00
Mike Primm
3727fb622b Fix marker initialization 2020-06-07 20:41:22 -05:00
Mike Primm
295d799b50 Add enterReplacesExits setting for greeting/farewell 2020-05-30 20:29:16 -05:00
Mike Primm
b3dacd6b2c Add support for enqueing enter/exit messages, so that mutliples display 2020-05-30 19:05:01 -05:00
Mike Primm
a67f50350a Shift remaining storage access call off of server thread 2020-05-26 22:34:00 -05:00
Mike Primm
2a7bfb7dc5 Clean up output 2020-05-25 18:58:28 -05:00
Mike Primm
395f45b0f9 Add support for greeting/farewell on circle markers 2020-05-25 18:52:28 -05:00
Mike Primm
7c021d32c9 Fix polygon test 2020-05-25 16:35:28 -05:00
Mike Primm
5e15187e46 Finish support for greeting/farewall text on area markers 2020-05-25 13:55:36 -05:00
Mike Primm
14f55bd6a8 Initial work on greeting/farewall title support for areas 2020-05-25 01:14:20 -05:00
Mike Primm
2be20f4c78 Initial 1.15.2 Forge build 2020-05-23 22:41:11 -05:00
Mike Primm
f039257e19 Add autoReconnect=true for MariaDB 2020-05-21 19:56:22 -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
ee8c919eda Remove block dump 2020-05-16 16:26:54 -05:00
mikeprimm
f151cdc84f
Merge pull request #2896 from owlnull/v3.0 
Add skins support via SkinsRestorer plugin
 2020-05-16 16:18:17 -05:00
Mike Primm
b7dc453879 Drop unsupported versions (1.13.0, 1.13.1, 1.14.0) 2020-05-16 13:29:39 -05:00
Mike Primm
151122a333 Iron out 1.13.2 biomes and chunk loading 2020-05-03 17:35:38 -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
Mike Primm
bfbcde99f3 Handle null container file for 'minecraft' on 1.13.x+ 2020-04-26 17:18:30 -05:00
Mike Primm
27d767ac35 Fix block state iterator 2020-04-26 16:58:55 -05:00
owlnull
578c66e2fe Add skins support via SkinsRestorer plugin 2020-04-23 06:39:54 +05:00
mikeprimm
3b09dba95f
Merge branch 'v3.0' into postgres 2020-04-12 19:35:03 -05:00
mikeprimm
7051af01b7
Merge pull request #2839 from L0laapk3/v3.0 
fix vertical centering of markers
 2020-04-12 19:31:52 -05:00
Paul Straw
3937ece59a Adds worldborderlabel configuration.txt setting 2020-04-02 22:01:30 -07:00
L0laapk3
7c5d339706 fix centering of markers 2020-04-01 00:14:18 +02:00
Ry0taK
c32713e967 Fix unintended redirection to welcome file 2020-02-06 05:47:03 +00:00
baconwaifu
3feb14d8cb Add initial postgres standalone support. EXPERIMENTAL. chat broken. 2020-01-27 22:27:09 -05:00
baconwaifu
09cc25aff2 Fix Postgres column typing for standalone files 2020-01-27 22:26:46 -05:00
RyotaK
f36404460a
Merge branch 'v3.0' into v3.0 2020-01-19 10:14:42 +09:00
Mike Primm
b11420f94b Fix ladder model 2020-01-12 20:17:22 -06:00
RyotaK
4913646f06 Fix indent 2020-01-13 00:11:35 +00:00
RyotaK
604a534e50 Fix dependency format 2020-01-13 00:09:55 +00:00
RyotaK
3991170245 Update Jetty 2020-01-13 00:03:57 +00:00
Mike Primm
e9e34e0e90 Jetty CERT mitigation 2019-12-22 18:13:50 -06:00
Mitch Talmadge
a3cb46e286 Change 'int blkid' to 'String material' for block and sign-change events. 2019-12-19 21:36:09 -07:00
Mike Primm
fce54cc0e3 Add new 1.15 blocks (beehive, bee nest, honey, honeycomb) 2019-12-15 14:22:14 -06:00
Mike Primm
40472f88fd Update PostgresSQL code to handle fullrender resume updates 2019-12-15 01:36:59 -06:00
mikeprimm
49ea99b703
Merge pull request #2633 from Marvosg/v3.0 
Resume full renders (skip already rendered tiles)
 2019-12-15 01:10:28 -06:00
mikeprimm
bf404ee626
Merge branch 'v3.0' into v3.0 2019-12-15 00:46:31 -06:00
mikeprimm
33b4fb7042
Merge pull request #2584 from tiagoad/v3.0 
Fix for disappearing sign-markers on 1.14 (Issue #2533)
 2019-12-15 00:44:27 -06:00
mikeprimm
05dc55abc2
Merge pull request #2618 from baconwaifu/postgres 
Add initial postgres database support.
 2019-12-15 00:42:01 -06:00
mikeprimm
3eebde9170
Merge pull request #2586 from ExerciseBook/v3.0 
HD skins support
 2019-12-15 00:39:51 -06:00
baconwaifu
5fe21ff8c8 Change marker column to BYTEA to make markers work again. 2019-12-14 15:25:56 -05:00
mikeprimm
4e7448dd8f
Merge pull request #2668 from lennartbecker/load-map-updates-immediately 
Standalone: Load changes immediately after page load
 2019-12-14 08:33:44 -06:00
mikeprimm
4a5e14ee73
Merge pull request #2654 from linuxdaemon/v3.0+fix-mariadb-driver-pkg 
Fix MariaDB Driver package name
Thanks!
 2019-12-14 08:29:40 -06:00
Mike Primm
a1351ed094 Force lower case on tiles and matchTiles references in CTM 2019-12-08 01:55:39 -06:00
Mike Primm
f910b1135d Fix texture order handling for mod support API handling for stairs 2019-12-08 01:01:21 -06:00
Mike Primm
24bb87d635 Fix incorrect transparency handling on copyblock: texture handling 2019-12-08 00:59:19 -06:00
Lennart Becker
59578e6824 Standalone: Load changes immediately after page load 2019-11-29 12:33:03 +01:00
linuxdaemon
4ec3964988
Fix MariaDB Driver package name 
The package name for the MariaDB JDBC drivers available from https://mariadb.com/kb/en/library/mariadb-connector-j/ is `org.mariadb` not `com.mariadb`.

Fixes #2653
 2019-11-12 00:59:25 -06:00
Marvos
7980c7dbe5 Implemented functionality to resume full renders by typing "dynmap fullrender resume <world>" or "dynmap fullrender resume <world>:<map>". At the start of the render, existing map tiles are loaded from storage and their location info saved in a set. Before each tile is rendered, the set is checked if it contains the tile about to be rendered. If so, the tile is skipped. Information about skipped tiles is output in the periodic tile update message. 2019-10-21 21:32:49 +02:00
Gabriel Hautclocq
9cf3b74609 fixed disappearing markers (webbukkit#2533), many thanks to tiagoad 2019-10-04 00:51:57 +02:00
Mike Primm
1be9f663c7 Handle meta=0 as undefined in CTM 2019-09-29 17:51:58 -05:00
baconwaifu
8522015edc Add initial postgres support; internal webserver works perfectly 2019-09-26 20:36:09 -04:00
Eric_Lian
7f84262bfb HD skins support 2019-08-14 23:28:20 +08:00
Tiago Dias
8fc95bfc96 Fix for disappearing sign-markers on 1.14 (Issue #2533) 2019-08-14 12:41:24 +01:00
Mike Primm
f1b7741f65 Fix for ConcurrentModificationException in markers code 2019-07-21 13:16:05 -05:00
Mike Primm
286a12c4ef Add experimental option to try to migrate old chunks 2019-06-09 09:59:08 -05:00
mikeprimm
881b7dfefd
Merge pull request #2498 from stormboomer/v3.0 
Added functionality for restarting the scheduled job that stores markers
 2019-06-09 07:31:27 -05:00
mikeprimm
867315fb04
Merge pull request #2482 from rumickon/skin_fix 
Skin fix
 2019-06-09 07:30:02 -05:00
Mike Primm
7f8dcf0eb3 Fix 1.14 biome mapping 2019-06-08 21:47:43 -05: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
Stormboomer
39053e36d9 added method to call marker save scheduled job to Dynmap Core, so that MarkerAPIImpl can be private and might not be used directly by other devs. 2019-06-02 13:27:19 +02:00
Stormboomer
0b8118566c Added functionality for restarting the scheduled job that stores markers to markers.yml. 
This should fix problems with markers not being stored after a dynmap reload, as well as vanishing markers.
 2019-06-01 20:03:10 +02:00