Commit graph

694 commits

Author SHA1 Message Date
Mike Primm
a0f21d5d9b Handle bigmap versus bigworld, allows HDMap to be big-map-style independent of bigworld setting. Add bigmap setting on KzedMap and FlatMap too. 2011-07-09 15:51:32 -05:00
Mike Primm
09d61770cf Add HD cave shader 2011-07-09 02:19:56 -05:00
Mike Primm
778cd508d8 Split lighting and shading - add lightings.txt 2011-07-09 01:26:47 -05:00
Mike Primm
fd23b92fc3 Refactor HDMap configuration - add shaders, perspectives 2011-07-08 22:40:40 -05:00
Mike Primm
bffddf09ac Merge remote branch 'origin/hdrender' into HEAD 2011-07-08 01:36:19 -05:00
Mike Primm
3f5284679c Start structuring for shaders and perspectives 2011-07-08 01:34:22 -05:00
Mike Primm
22dc732032 Merge branch 'master' into HEAD 2011-07-08 00:41:39 -05:00
Mike Primm
f7b2d78e80 Fix tile render timmes, split out utility class 2011-07-08 00:40:52 -05:00
Mike Primm
a384a7a171 Split perspective state out, to let shaders better interact with it 2011-07-07 08:41:31 -05:00
Mike Primm
2bce503cad Clean up HDMap dither, fix tile update events 2011-07-07 00:35:59 -05:00
Mike Primm
5dbb5d5df2 Merge remote branch 'upstream/master' into HEAD 2011-07-06 09:44:13 -05:00
Mike Primm
62d232c0e5 Get day/night workding with HDMap 2011-07-05 23:24:25 -05:00
Mike Primm
92f1517ff7 Get full existing shader function working on HDMap 2011-07-05 22:17:22 -05:00
FrozenCow
5dd5834b13 Changed version to 0.20. 2011-07-05 09:59:17 +02:00
Mike Primm
766a7574aa Finish correction of zoom file coordinate correction for HDMap 2011-07-04 22:34:30 -05:00
Mike Primm
5fa6770a43 Fix zoom-out coordinate consistency on HDMaps 2011-07-04 10:18:05 -05:00
Mike Primm
4a6ab81507 Merge remote branch 'upstream/master' into HEAD 2011-07-04 09:30:04 -05:00
Mike Primm
0864e3fe77 Merge remote branch 'origin/master' into HEAD 2011-07-04 09:29:02 -05:00
Mike Primm
8a4da76b41 HD renderer prototype 2011-07-04 09:28:06 -05:00
mikeprimm
5c847847c2 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
b86652fa79 Set to 0.19.2 for bug-fix release for 1.7 items 2011-07-03 18:03:04 -05:00
mikeprimm
11062c181d Merge pull request #257 from mikeprimm/master
Workaround for CB953 furnace freak-out
2011-07-03 10:06:42 -07:00
Mike Primm
f22728304e Workaround for CB 953 furnace freakout (fixed in CB955) 2011-07-03 12:03:06 -05:00
mikeprimm
163a37fcb1 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
0bf4836024 Fix premature timeouts on tile read waits, causing missed tile loads 2011-07-03 11:30:48 -05:00
Mike Primm
6dd370c5c9 Add sticky piston block, too 2011-07-03 11:28:09 -05:00
mikeprimm
a307a7df48 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
65191b4cf4 Add piston and piston-head block color definitions 2011-06-30 15:29:47 -05:00
FrozenCow
58656a6b16 Changed version to 0.20. 2011-06-30 12:38:02 +02:00
mikeprimm
1449b5141a 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
4f1c61de10 Set to 0.19.1 - need bug fix release 2011-06-29 21:10:43 -05:00
Mike Primm
03fbb23bf1 Don't throw exception on bogus absolute path (http://xxx//blah) 2011-06-30 03:19:04 +08:00
Mike Primm
124efb80c5 Don't throw exception on bogus absolute path (http://xxx//blah) 2011-06-29 14:16:12 -05:00
mikeprimm
d611cf3c01 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
92e7139553 Add better URI path normalization, option to allow symlinks in web
path
2011-06-29 13:40:02 -05:00
mikeprimm
f15d5ca0f9 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
016f7541dc Add some cleanup to help avoid exceptions on /reload and shutdown/disable 2011-06-29 01:37:09 -05:00
mikeprimm
f9d586f8f6 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
eb125c7c52 Fix WorldGuard regions support to include WG5 polygon support 2011-06-29 00:43:39 -05:00
mikeprimm
03e85746b3 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
3aad863d27 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
1fd933e07f 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
c33ea3e78e 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
62532920ea Fix 'visibleregions' option on JSON (gotta kill those parallel code
paths at some point....)
2011-06-28 11:00:05 -05:00
mikeprimm
1b1103e3f6 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
2e73b4a4de Fix "center" processing - broke it with URL args change :< 2011-06-27 20:38:26 -05:00
FrozenCow
4a087d8a6a Changed version to 0.20. 2011-06-27 21:44:12 +02:00
Jason Booth
c2be2e3f38 Fix Security Exploit 2011-06-27 21:27:23 +02:00
FrozenCow
522eeb0cfe Revert "Disallow .. in file path. Also logging, imports"
This reverts commit ca705ca6d2.
2011-06-27 21:26:52 +02:00
zeeZ
ca705ca6d2 Disallow .. in file path. Also logging, imports 2011-06-27 22:48:39 +08:00