Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-28 21:25:46 +01:00
Code Issues Projects Releases Wiki Activity
938 Commits 7 Branches 130 Tags 27 MiB
f5f9c3bb31
Commit Graph

938 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Primm
ae190b3c57 Merge branch 'master' into HEAD 2011-07-08 00:41:39 -05:00
Mike Primm
137b6af6d5 Fix tile render timmes, split out utility class 2011-07-08 00:40:52 -05:00
Mike Primm
56e5f6fbb3 Split perspective state out, to let shaders better interact with it 2011-07-07 08:41:31 -05:00
Mike Primm
4f73d2cbd6 Clean up HDMap dither, fix tile update events 2011-07-07 00:35:59 -05:00
Mike Primm
ee8718d083 Merge remote branch 'upstream/master' into HEAD 2011-07-06 09:44:13 -05:00
Mike Primm
225b348154 Get day/night workding with HDMap 2011-07-05 23:24:25 -05:00
Mike Primm
1f2722b249 Get full existing shader function working on HDMap 2011-07-05 22:17:22 -05:00
FrozenCow
9afe25b449 Changed version to 0.20. 2011-07-05 09:59:17 +02:00
Mike Primm
f3f871df3c Finish correction of zoom file coordinate correction for HDMap 2011-07-04 22:34:30 -05:00
Mike Primm
961eb17536 Fix zoom-out coordinate consistency on HDMaps 2011-07-04 10:18:05 -05:00
Mike Primm
e2244ddda5 Merge remote branch 'upstream/master' into HEAD 2011-07-04 09:30:04 -05:00
Mike Primm
4086291ce2 Merge remote branch 'origin/master' into HEAD 2011-07-04 09:29:02 -05:00
Mike Primm
630759c87b HD renderer prototype 2011-07-04 09:28:06 -05:00
mikeprimm
bf1f8a8f65 Merge pull request #258 from mikeprimm/master 
Setting to 0.19.2 for support release for 1.7 related issues
 2011-07-03 16:07:24 -07:00
Mike Primm
4152337568 Set to 0.19.2 for bug-fix release for 1.7 items 2011-07-03 18:03:04 -05:00
mikeprimm
9942327531 Merge pull request #257 from mikeprimm/master 
Workaround for CB953 furnace freak-out
 2011-07-03 10:06:42 -07:00
Mike Primm
c393eec159 Workaround for CB 953 furnace freakout (fixed in CB955) 2011-07-03 12:03:06 -05:00
mikeprimm
9b9320f9c0 Merge pull request #256 from mikeprimm/master 
More 1.7 stuff: add sticky piston to colorschemes, fix spurrious read lock timeouts on web
 2011-07-03 09:36:53 -07:00
Mike Primm
e724a7bccb Fix premature timeouts on tile read waits, causing missed tile loads 2011-07-03 11:30:48 -05:00
Mike Primm
97ff6a2c2d Add sticky piston block, too 2011-07-03 11:28:09 -05:00
mikeprimm
e8aab6e257 Merge pull request #255 from mikeprimm/master 
Add color definitions to schemas for pistons and piston-heads
 2011-06-30 13:30:33 -07:00
Mike Primm
33206e089f Add piston and piston-head block color definitions 2011-06-30 15:29:47 -05:00
FrozenCow
cb4f6aaf82 Changed version to 0.20. 2011-06-30 12:38:02 +02:00
mikeprimm
c978d87fef Merge pull request #254 from mikeprimm/master 
Set head branch back to 0.19.1 - need bug fix build
 2011-06-29 19:11:58 -07:00
Mike Primm
1c32aebff9 Set to 0.19.1 - need bug fix release 2011-06-29 21:10:43 -05:00
Mike Primm
00a660d019 Don't throw exception on bogus absolute path (http://xxx//blah) 2011-06-30 03:19:04 +08:00
Mike Primm
1102c08b3e Don't throw exception on bogus absolute path (http://xxx//blah) 2011-06-29 14:16:12 -05:00
mikeprimm
3875486fbf Merge pull request #253 from mikeprimm/master 
Add better URI path normalization, option to allow symlinks in web path
 2011-06-29 11:44:58 -07:00
Mike Primm
e6a8e54172 Add better URI path normalization, option to allow symlinks in web 
path
 2011-06-29 13:40:02 -05:00
mikeprimm
e0f9a2f1e2 Merge pull request #251 from mikeprimm/master 
Add some cleanup to help avoid exceptions on /reload and shutdown/disable
 2011-06-28 23:38:04 -07:00
Mike Primm
e2b55c3b54 Add some cleanup to help avoid exceptions on /reload and shutdown/disable 2011-06-29 01:37:09 -05:00
mikeprimm
be983825ab Merge pull request #250 from mikeprimm/master 
Fix WorldGuard regions code to handle polygon regions (WG5)
 2011-06-28 22:45:15 -07:00
Mike Primm
faceab68f1 Fix WorldGuard regions support to include WG5 polygon support 2011-06-29 00:43:39 -05:00
mikeprimm
aa796deeff Merge pull request #249 from mikeprimm/master 
Tighten up logic for assuring unlock of locked files during exceptions, fix version number display
 2011-06-28 20:39:00 -07:00
Mike Primm
2863dd0acc Put timeout on read lock used by web server - make sure it can't be indefinite 2011-06-28 22:33:11 -05:00
Mike Primm
48fea32500 Tighten up lock release logic on I/O and other exceptions 
Make version in plugin.yml string so that 0.20 isn't 0.2
 2011-06-28 22:13:42 -05:00
mikeprimm
b4b11329c2 Merge pull request #248 from mikeprimm/master 
Fix 'visibleregions' option on JSON implementation of WorldGuard regions
 2011-06-28 09:07:28 -07:00
Mike Primm
f118ada39e Fix 'visibleregions' option on JSON (gotta kill those parallel code 
paths at some point....)
 2011-06-28 11:00:05 -05:00
mikeprimm
1a23f24b81 Merge pull request #247 from mikeprimm/master 
Fix break in processing center: coordinates due to mistake in url-parameter code
 2011-06-27 18:49:40 -07:00
Mike Primm
edf898ae1a Fix "center" processing - broke it with URL args change :< 2011-06-27 20:38:26 -05:00
FrozenCow
bf29c09522 Changed version to 0.20. 2011-06-27 21:44:12 +02:00
Jason Booth
d3b621f90b Fix Security Exploit 2011-06-27 21:27:23 +02:00
FrozenCow
47620fe79e Revert "Disallow .. in file path. Also logging, imports" 
This reverts commit 1bc275ea46.
 2011-06-27 21:26:52 +02:00
zeeZ
1bc275ea46 Disallow .. in file path. Also logging, imports 2011-06-27 22:48:39 +08:00
mikeprimm
d4f0161e14 Merge pull request #245 from mikeprimm/master 
Add icon for Biome maps, and color mapping for SKY biome
 2011-06-26 22:08:35 -07:00
Mike Primm
d59c8f1506 Add SKY biome mappings 2011-06-27 00:07:00 -05:00
Mike Primm
752a076236 Add default icon for Biome maps 2011-06-26 22:36:17 -05:00
mikeprimm
8089e75ab2 Merge pull request #244 from mikeprimm/master 
Add support for URL-based parameter overrides for selecting world, map, zoom, and center coordinates
 2011-06-26 20:12:49 -07:00
Mike Primm
3720c2adf7 Add support for URL-based parameter to override initial world, map, zoom, and center coordinate settings 2011-06-26 22:05:43 -05:00
mikeprimm
dbbff3d04f Merge pull request #243 from mikeprimm/master 
Add verbose: false option to make dynmap much less chatty during startup
 2011-06-26 12:33:55 -07:00