Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-25 03:35:18 +01:00
Code Issues Projects Releases Wiki Activity
2,770 Commits 7 Branches 130 Tags 27 MiB
b1a320d4bb
Commit Graph

386 Commits

Author SHA1 Message Date
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
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
rumickon
d20e35a71e Merge branch 'v3.0' of github.com:webbukkit/dynmap into skin_fix 2019-05-28 19:41:11 +03: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
rumickon
efb28531b5 Merge branch 'v3.0' of github.com:webbukkit/dynmap into skin_fix 2019-05-22 19:45:25 +03: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
rumickon
fcc5a340b9 Return support of old skins format (64x32). Still used. 2019-05-19 01:30:07 +03:00
rumickon
01a3f37b22 Remove unnecessary sides of arms and leg 2019-05-19 00:23:24 +03: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
mikeprimm
641f142cd3
Merge pull request #2475 from Ry0taK/v3.0 
Fix required login bypass vulnerability
 2019-05-04 11:28:31 -05:00
Mike Primm
1a470fe226 Add model and texture changes for 1.14 signs 2019-05-03 22:22:46 -05:00
R0taK
d5596944b0 Fix required login vulnerability 2019-05-02 18:08:56 +09:00
Mike Primm
495a6f7ec2 Add ImageLen for SQLLite to PHP (standalone server) 2019-02-04 00:13:02 -06:00
Mike Primm
eacb7c6398 Add column to record byte length of images for SQLite blobs 2019-02-03 22:48:33 -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
648e11bb53 Add r/w lock around marker file operations and commands 2019-01-27 15:04:05 -06:00
Mike Primm
e7113dc163 Merge branch 'v3.0' of https://github.com/webbukkit/dynmap.git into v3.0 2019-01-27 14:16:22 -06:00
Mike Primm
731b40f680 Update SnakeYAML - see if this helps marker issue 2019-01-27 14:16:12 -06:00
Mike Primm
982a3aab21 Handle old 64x32 skins while still handling new ones 2019-01-04 00:27:01 -06:00
Mike Primm
08226b8602 Update default player skin to new format, expect 64x64 2018-12-31 08:37:01 -06:00
Mike Primm
39bfa0e9b1 Add support for 2nd layer on body mode player icons 2018-12-12 23:34:15 -06:00
Mike Primm
6b5c546ae9 Add forum and issue tracker URLs 2018-12-08 23:01:04 -06:00
Mike Primm
95decf005c Fix 1.13 world border support, handle world border changes 2018-12-08 00:15:06 -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
b24f92cdd0 Add blockname and statename support to CTM 2018-12-04 00:44:22 -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
Aaron Harabedian
36e5b7e391 Added MySQL connection flags option "flags" in configuration.txt 2018-11-28 02:33:21 -05:00
Mike Primm
b741bb522d Fix redstone in hideores=true 2018-09-12 19:58:32 -05: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
5d3bf73d9c Add state index range support to models (data=x-y) 2018-09-09 18:05:17 -05:00
Mike Primm
ff36c50e06 Scrub more 4096 block ID limits 2018-09-06 08:15:08 -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
776d351ab2 Extra null patch check 2018-09-04 07:01:11 -05:00
Mike Primm
5dd7abaddb Fix white stained glass in 1.13.x 2018-09-03 15:34:37 -05:00
Mike Primm
ae35d5b6aa More fluid model fixes 2018-09-02 22:17:53 -05:00
Mike Primm
ff54f1abe0 First pass of new flowing fluid models 2018-09-02 17:43:50 -05:00
Mike Primm
28bb9eea87 Enhance patch definition - allow for triangles, trapezoids 2018-09-02 11:38:17 -05:00
Mike Primm
d6f43206d1 Fix bubble columns 2018-09-02 10:09:15 -05:00
BuildTools
f2db1104a1 More fluid renderer work 2018-09-02 01:06:22 -05:00
BuildTools
eb5fe20502 Add more state data (isSolid()) 2018-09-01 23:26:36 -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
3ba5bd3166 Clean up warnings 2018-09-01 19:59:06 -05:00
Mike Primm
a18a1ddc06 Finish fixing new water 2018-09-01 19:16:55 -05:00
Mike Primm
ea139caeab More water model fixes 2018-09-01 18:07:58 -05:00
Mike Primm
1495d6c2df Tighten border tolerance 2018-09-01 17:01:28 -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
af84ced757 Fix fence gate coordinate 2018-08-25 19:29:22 -05:00
Mike Primm
69015851eb Fix prismarine slabs, stairs 2018-08-25 01:10:29 -05:00
Mike Primm
6998675b38 Finish fence gate renderer 2018-08-25 00:54:01 -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
34cc9532ac Add debug to flag missing texture mappings 2018-08-20 21:52:35 -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