Commit Graph

891 Commits

Author SHA1 Message Date
Mike Primm
73825b4558 Merge remote branch 'upstream/master' into HEAD 2011-07-19 00:53:02 -05:00
Mike Primm
2c16c800e9 Performance tuning, improve workaround for bukkit scheduler bugs 2011-07-19 00:52:05 -05:00
FrozenCow
929a34656b Added webchat-interval for JsonFileClientUpdateComponent (which should fix sendmessage.php) 2011-07-18 13:13:02 +02:00
mikeprimm
910b963fcd Merge pull request #286 from mikeprimm/hdrender
Add handling for custom_still_water, custom_still_lava, etc
2011-07-17 19:24:27 -07:00
Mike Primm
b51bb22b9e Add handling for custom_still_water, custom_still_lava, etc 2011-07-17 20:51:51 -05:00
mikeprimm
1adbe45c27 Merge pull request #285 from mikeprimm/hdrender
Fix texture pack scaling support, remove assumption that watercolor.png is present
2011-07-17 16:14:47 -07:00
Mike Primm
ff07b6f343 Fix texture pack scaling support 2011-07-17 18:13:03 -05:00
Mike Primm
c74dd49f67 Make workaround for adaptive - be faster when bukkit isn't tripping up 2011-07-17 16:32:34 -05:00
Mike Primm
1862dc918c Different Bukkit schedule spin workaround, that isn't so slow
Generalize texture image loading
2011-07-17 16:19:24 -05:00
mikeprimm
d4ecd05af9 Merge pull request #283 from mikeprimm/hdrender
Add texture pack shader support
2011-07-17 09:38:37 -07:00
Mike Primm
4e810fc9d8 Woraround bukkit schedule spin, add custom-models.txt, custom-texture.txt 2011-07-17 11:02:22 -05:00
Mike Primm
4bc3030637 Correct wood grain orientation from top 2011-07-17 02:42:35 -05:00
Mike Primm
9133d03489 Finish first pass of texture mapping 2011-07-17 02:20:13 -05:00
Mike Primm
d21d640eae First pass functional texture pack shader :) 2011-07-16 16:51:46 -05:00
Mike Primm
edac2e5cd9 Start on texture pack shader 2011-07-15 23:19:05 -05:00
Mike Primm
0323c98938 More texture pack work 2011-07-15 17:37:54 -05:00
Mike Primm
a91060dc95 Fix non-power-of-two scaling on models and textures 2011-07-15 09:29:27 -05:00
Mike Primm
c958da0ae0 Start on texture pack loader/scaler 2011-07-15 08:28:09 -05:00
mikeprimm
862c219d7d Merge pull request #281 from mikeprimm/hdrender
Add weakref based chunk snapshot cache
2011-07-13 23:10:20 -07:00
Mike Primm
66ca5199e3 Add weak reference based cache for chunk snapshots 2011-07-14 01:08:28 -05:00
Mike Primm
eb87231926 Fix scroll buttons in player list 2011-07-13 16:05:08 -05:00
mikeprimm
b4d7568e61 Merge pull request #278 from mikeprimm/hdrender
More models (doors, levers)
2011-07-12 23:06:14 -07:00
Mike Primm
e4edb91f3d More models (doors, levers) 2011-07-13 01:05:20 -05:00
mikeprimm
281005f1f8 Merge pull request #277 from mikeprimm/hdrender
More models (beds, etc), proper fence support, lighting fixes for steps and slabs
2011-07-12 21:44:42 -07:00
Mike Primm
c81c8cbaa6 More models (beds, etc), proper fence support, lighting fixes for steps and slabs 2011-07-12 23:32:18 -05:00
mikeprimm
d764598bde Merge pull request #276 from mikeprimm/hdrender
More models, fixes to make HD shader defaults more consistent with Kzed shader
2011-07-12 16:23:28 -07:00
Mike Primm
9c1479b922 Add models for flowers, mushrooms, fire 2011-07-12 18:22:12 -05:00
Mike Primm
bd69a69aff Make default shader more consistent with Kzed shader 2011-07-12 18:02:01 -05:00
mikeprimm
8df180313e Merge pull request #273 from mikeprimm/hdrender
Add models.txt, and code to load models from it, and lots of models
2011-07-12 00:21:32 -07:00
Mike Primm
de2cdf5411 Add models.txt, and code to load models from it, and lots of models 2011-07-12 02:08:48 -05:00
mikeprimm
2db0d76950 Merge pull request #270 from mikeprimm/hdrender
Fix biome rendering
2011-07-11 07:39:29 -07:00
Mike Primm
57ea6aefd6 Fix biome rendering 2011-07-11 09:37:03 -05:00
mikeprimm
2cb8d9e3a1 Merge pull request #269 from mikeprimm/hdrender
Add support for non-cube block models, subblock tracing for them
2011-07-11 00:19:13 -07:00
Mike Primm
b72cc2063a Add support for non-cube block models, subblock tracing for them 2011-07-11 02:14:55 -05:00
mikeprimm
d8052d4196 Merge pull request #268 from mikeprimm/hdrender
Fix worldtomap conversion (y coordinate off by 1 tile)
2011-07-10 21:14:20 -07:00
Mike Primm
c5c699ae61 Fix worldtomap conversion 2011-07-10 23:12:24 -05:00
mikeprimm
86e5b0c4f8 Merge pull request #267 from mikeprimm/hdrender
Fix orientation of sample flat maps to be north-top (view from south)
2011-07-10 19:13:57 -07:00
Mike Primm
9faad7397b Fix orientation of sample flat maps to be north-top (view from south) 2011-07-10 21:12:11 -05:00
mikeprimm
20028096c7 Merge pull request #266 from mikeprimm/hdrender
Add configuration.txt.sample-hd as sample of HD render with existing defa
2011-07-10 12:44:26 -07:00
Mike Primm
0f0fb22074 Add configuration.txt.sample-hd as sample of HD render with existing default map structure 2011-07-10 14:42:36 -05:00
mikeprimm
b85e8f9151 Merge pull request #265 from mikeprimm/hdrender
Add cancelable custom event for reporting of messages received from web
2011-07-09 19:42:39 -07:00
Mike Primm
f4e9b8ffce Add cancelable custom event for reporting of messages received from web 2011-07-09 21:39:49 -05:00
mikeprimm
88fde1fcd6 Merge pull request #264 from mikeprimm/hdrender
First drop of HD Renderer
2011-07-09 16:43:43 -07:00
Mike Primm
e9c72e1cd9 Merge remote branch 'upstream/master' into HEAD 2011-07-09 18:18:26 -05:00
mikeprimm
dcca317b2f Merge pull request #263 from mikeprimm/master
Cleanup event synchronize, so that web config request is more parallel
2011-07-09 16:17:08 -07:00
Mike Primm
874bf9da8d Fix marker/player world-to-map coordinate transform in hdmap.js 2011-07-09 18:04:42 -05:00
Mike Primm
02329673b2 Add adaptive zoomout levels for HDMaps, change zoomout processing to handle it properly 2011-07-09 17:01:40 -05:00
Mike Primm
898f4a6740 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
02fa9384ac Add HD cave shader 2011-07-09 02:19:56 -05:00
Mike Primm
a3c00a1026 Split lighting and shading - add lightings.txt 2011-07-09 01:26:47 -05:00