Commit Graph

1019 Commits

Author SHA1 Message Date
mikeprimm
9005b68fdb Merge pull request #331 from mikeprimm/master
Tighten up cleanup during /reload or shutdown
2011-07-27 06:07:40 -07:00
Mike Primm
df9d3494c3 Tighten up shutdown of zoom file processing during reload 2011-07-27 08:04:53 -05:00
mikeprimm
8bac8b0d23 Merge pull request #329 from mikeprimm/master
Add updated regions support for current Residence (2.3.x)
2011-07-26 21:08:52 -07:00
Mike Primm
c135a669a8 Add updated Residence support (2.3.z) 2011-07-26 23:07:20 -05:00
mikeprimm
1465795f97 Merge pull request #327 from mikeprimm/master
Make "server update failed" red banner happen after 3rd consecutive read fail,not first
2011-07-26 14:27:47 -07:00
Mike Primm
e1160f623f Add retry count to updates request - don't show red until 3rd miss 2011-07-26 16:24:04 -05:00
mikeprimm
7e0124e849 Merge pull request #325 from mikeprimm/master
Add cancelrender command
2011-07-26 13:16:59 -07:00
Mike Primm
096d2fe72e Add cancelrender command 2011-07-26 10:29:50 -05:00
mikeprimm
ef59612dad Merge pull request #324 from mikeprimm/master
Flesh out comments on selecting template sets, and which files are used for each
2011-07-25 20:05:52 -07:00
Mike Primm
f9393d70ea Flesh out comments on selecting template sets, and which files are used for each 2011-07-25 22:04:53 -05:00
mikeprimm
5762340238 Merge pull request #323 from mikeprimm/master
Add support for 'defaultmap' setting in configuration.txt
2011-07-25 19:29:12 -07:00
Mike Primm
beb3165bbe Make default consistent with existing behaviors 2011-07-25 21:26:01 -05:00
mikeprimm
1e9cfe3bc7 Merge pull request #322 from mikeprimm/master
Add max-sessions setting to configuration.txt - limits concurrent threads and sessions on internal web server
2011-07-25 19:22:34 -07:00
Mike Primm
5a9c28ae27 Add support for 'defaultmap' setting in configuration.txt 2011-07-25 21:16:42 -05:00
Mike Primm
aa29ddf141 Add max-sessions setting to configuration.txt - limits concurrent threads and sessions on internal web server 2011-07-25 20:34:37 -05:00
mikeprimm
641ce05767 Merge pull request #320 from mikeprimm/master
Render and shader performance tuning
2011-07-25 00:41:53 -07:00
Mike Primm
42132328cd Shader fine tuning 2011-07-25 02:38:30 -05:00
Mike Primm
9e7e333cc5 Tune render performance 2011-07-25 02:16:00 -05:00
mikeprimm
23db0c62fc Merge pull request #319 from mikeprimm/master
Use memory buffer for ImageIO encoding - avoid re-encoding when lock retry needed
2011-07-24 22:14:27 -07:00
Mike Primm
cf08f243d0 Modify ImageIO use to avoid re-encoding on retry, do better buffering 2011-07-25 00:12:07 -05:00
mikeprimm
31623a0676 Merge pull request #318 from mikeprimm/master
Tighten up cleanup during /reload or shutdown
2011-07-24 21:27:09 -07:00
Mike Primm
737bcb98d9 Improve handling of /reload, clean up dead code 2011-07-24 23:23:24 -05:00
mikeprimm
e0ddbcd27d Merge pull request #317 from mikeprimm/master
Make HDMap fall back to default perspective, shader or lighting as needed if unable to find configured preset
2011-07-24 18:37:58 -07:00
Mike Primm
3ddce85f89 Make HDMap fall back to default perspective, shader or lighting as needed if unable to find configured preset. 2011-07-24 20:34:39 -05:00
mikeprimm
4cacc3f92c Merge pull request #316 from mikeprimm/master
Add escape sequence '&color;' support for webprefix/websuffix - avoid frequent editor code page problems
2011-07-24 18:32:45 -07:00
Mike Primm
abd7c25d80 Add escape sequence '&color;' support for webprefix/websuffix - avoid frequent editor code page problems. 2011-07-24 20:31:12 -05:00
mikeprimm
39a6bee3ca Merge pull request #315 from mikeprimm/master
Add shader option to disable biome shading, disable biome shading on non-normal worlds
2011-07-24 15:17:03 -07:00
Mike Primm
78f571a68b Add shader option to disable biome shading, disable biome shading on non-normal worlds 2011-07-24 17:14:45 -05:00
mikeprimm
a65fd601ac Merge pull request #313 from mikeprimm/master
Add 'dynmap radiusrender <radius>' command to allow player-initiated render in radius from position
2011-07-23 22:04:26 -07:00
Mike Primm
62b42aa302 Add 'radiusrender' command to allow limited render by player in radius 2011-07-24 00:00:32 -05:00
mikeprimm
c7e176b56d Merge pull request #312 from mikeprimm/master
Fix for bedrock texture (thanks to Graloth)
2011-07-23 20:54:37 -07:00
Mike Primm
a07c03081d Fix bedrock texture (thanks, Graloth!) 2011-07-23 22:53:12 -05:00
mikeprimm
60f7773e76 Merge pull request #310 from mikeprimm/master
Sweep default files into JAR, extract as defaults when needed - prevent unneeded stomping of user customized configuration
2011-07-23 13:37:53 -07:00
Mike Primm
ddeded3e9c Package more of default data/config in JAR, lay down when needed, to avoid stomping customized configuration when unneeded 2011-07-23 15:29:47 -05:00
mikeprimm
e601a2c661 Merge pull request #309 from mikeprimm/master
Put model and texture data into own subdirectory (renderdata)
2011-07-23 07:34:26 -07:00
Mike Primm
357e46280c Merge remote branch 'origin/master' 2011-07-23 09:30:57 -05:00
Mike Primm
9992aa7628 Shift models and texture data into 'renderdata' directory 2011-07-23 09:30:22 -05:00
mikeprimm
869d6a701f Merge pull request #308 from mikeprimm/master
Add single/double chest type support, single chest orientation detection
2011-07-22 22:51:02 -07:00
Mike Primm
4be9ccb1b2 Add single chest orientation calculation 2011-07-23 00:49:09 -05:00
Mike Primm
1c6ececd62 Detect chest type (double, single) and base orientation 2011-07-22 23:20:58 -05:00
mikeprimm
d746102963 Merge pull request #307 from mikeprimm/hdrender
Split templates.txt into multiple files in templates directory, support loading templates from directory
2011-07-22 19:52:59 -07:00
Mike Primm
6e1768f544 Drop mapzoomin on flat maps 2011-07-22 21:36:17 -05:00
Mike Primm
9bb9012f9c Make the hires surface maps from 30 degrees - might as well go pretty! 2011-07-22 21:31:14 -05:00
Mike Primm
0fba601063 Switch flat maps in hires template set to lowres - seems excessive 2011-07-22 21:28:39 -05:00
Mike Primm
ec13742c85 Restructure templates into template directory, multiple files 2011-07-22 21:18:02 -05:00
mikeprimm
2c1d078272 Merge pull request #306 from mikeprimm/hdrender
Add support for enforcing banned-ips.txt on internal web server
2011-07-22 15:01:27 -07:00
Mike Primm
e613fb14d7 Add support for enforcing banned-ips.txt on internal web server 2011-07-22 16:56:08 -05:00
mikeprimm
0e6dfc1adf Merge pull request #305 from mikeprimm/hdrender
Make subblock rendering of scaled down models more accurate (esp for torches, small stuff)
2011-07-22 12:49:39 -07:00
Mike Primm
436fac707f Improve handling of scaled down models in subblock renderer 2011-07-22 13:11:03 -05:00
Mike Primm
0ee5c3db04 Avoid overflows during model scale down 2011-07-22 08:49:50 -05:00