Commit Graph
100 Commits
Author SHA1 Message Date
Aaron Griffith 28f924621b do block state unpacking with numpy slices, not loops
For posterity, my testbench used to make sure this implementation
yields identical results:

https://gist.github.com/agrif/a34efb8e0b534f0309415c9af4872a69
2019-02-22 12:11:37 -05:00
Aaron Griffith 53fa463838 block states with 9, 10, 11, and 12 bits per value now unpack correctly
old code mistakenly re-used byte 0 for every aligned stretch of blocks,
causing the wrong block id to be read
2019-02-21 19:28:32 -05:00
Aaron Griffith fc4a8ec38d Revert "Fix C extension build warnings"
This reverts commit 03a8697866.

Turns out there was a good reason for this: it makes Overviewer work on
Debian. Why? Who knows. It's a mystery.
2019-02-21 17:08:39 -05:00
Aaron Griffith 509bce77d6 Merge 'jvaskonen/minecraft113' and 'jvaskonen/pillar' into master 2019-02-21 16:30:34 -05:00
Aaron Griffith 1e4cabe5d0 Merge branch 'master' into minecraft113 2019-02-19 14:28:34 -05:00
Aaron Griffith e867221d8e Merge #1488: Make JSObserver work with Leaflet.
Fixes #1451.
2018-10-09 11:03:15 -04:00
Aaron Griffith dc70d6dc62 Merge #1487: Use cached center for initial view.
Fixes #1453.
2018-10-09 11:01:27 -04:00
Aaron Griffith a182335ad5 Merge #1478: Fixed behaviour of 'defaultZoom' property. 2018-10-09 10:53:41 -04:00
Aaron Griffith 724796959d Merge remote-tracking branch 'softer/minecraft113' into minecraft113 2018-08-18 23:01:42 -04:00
Aaron Griffith 203715d05e do not render internal faces for water
This is closer to the old water rendering method, and better allows
users to see underwater structures.
2018-08-15 17:11:09 -04:00
Aaron GriffithandGitHub e6ea08021e Always interpret long_array as 64-bit
previously, some arrays could (by chance) be interpreted as smaller integers
2018-08-07 20:09:30 -04:00
Aaron GriffithandGitHub bf2f9d2cc3 Merge pull request #1469 from cl0ne/patch-1
Fix missing titles for markers
2018-07-30 17:46:22 -04:00
Aaron GriffithandGitHub befb25a8f8 Merge pull request #1441 from kkuhn3/inverted_daylight_sensor
issues-1411: Block Addition: Add inverted daylight sensor.
2018-06-06 12:46:22 -04:00
Aaron Griffith 6312837a3d Commit to trigger new debian builds. 2018-05-16 13:06:44 -04:00
Aaron GriffithandGitHub db8de320f4 Merge pull request #1438 from rymate1234/master
Throw an error if the overviewer is running on a world saved on verisons of Minecraft newer than snapshot 17w47a
2018-05-01 10:45:55 -04:00
Aaron Griffith 22b9ab3f63 Merge many branches into master.
Branches:
 * mioux/sensor-false #1359
 * bobfrankly/Terracotta_Texture_Fix #1408
 * bobfrankly/Documentation #1407
 * lyknode/fix-slime-algo #1400
 * 3decibels/uuidcache_expire #1359
2017-08-24 18:22:35 -04:00
Aaron Griffith 1a41d8d195 bump overviewer.h version, textures.py version 2016-06-11 16:38:19 -04:00
Aaron Griffith 24e9f9e6e8 Merge remote-tracking branch 'dbergl/1.10-blocks' 2016-06-10 20:44:37 -04:00
Aaron Griffith 7bbc3bd4d4 Merge branch 'patch-3' of git://github.com/tazorax/Minecraft-Overviewer 2016-06-10 20:43:14 -04:00
Aaron Griffith 125c87b195 Merge remote-tracking branch 'Socolin/patch-3' 2016-06-10 20:37:30 -04:00
Aaron Griffith c76d813c13 Merge remote-tracking branch 'Socolin/patch-1' 2016-06-10 20:33:30 -04:00
Aaron Griffith 11c10972e2 Merge remote-tracking branch 'kevinwchang/filter-id' 2016-06-10 20:31:28 -04:00
Aaron Griffith 5571f4eb54 Merge remote-tracking branch 'CounterPillow/corrupt-region-warning' 2016-06-10 20:22:40 -04:00
Aaron Griffith 5665beb43f Merge remote-tracking branch 'mc680x0/master' 2016-06-10 20:21:03 -04:00
Aaron Griffith 1c25b16ec6 fixed typo in biomes.h 2016-06-10 20:15:18 -04:00
Aaron Griffith 77cdc6db48 Merge pull request #1221 from markfickett/master
Fix for repeated iteration of filter-function generator in handleEntities, for #1220 .
2015-03-18 23:53:18 -04:00
Aaron Griffith 4a9d808bb2 Merge pull request #1219 from MasterofJOKers/player_poi_fix
[genPOI] Fix generation of multiple players
2015-03-12 13:00:24 -04:00
Aaron Griffith 0c7441f93d equality != assignment... 2015-03-12 12:25:41 -04:00
Aaron Griffith 88de7b1567 get genpoi multiprocessing working on windows 2015-03-12 12:21:39 -04:00
Aaron Griffith cc3bee821c Merge pull request #1217 from MasterofJOKers/manual_poi_fix
[genPOI] Fix generation manual POIs
2015-03-10 12:33:10 -04:00
Aaron Griffith 4cd47da768 Merge pull request #1215 from CounterPillow/signtriage
[genPOI] Work around JSON signs
2015-03-08 12:57:48 -04:00
Aaron Griffith aad05b5ecf Merge pull request #1207 from tdierks/docs-import-change
Docs import change
2015-02-23 10:44:54 -05:00
Aaron Griffith 0422b0e711 Merge pull request #1211 from overviewer/ice-lighting
fix lighting for flowing water and ice (issue #1205)
2015-02-23 10:40:26 -05:00
Aaron Griffith 9ec0a75eaa fix lighting for flowing water and ice
fix for issue #1205
2015-02-23 10:27:08 -05:00
Aaron Griffith 9a3d4aa2c2 Merge pull request #1206 from tdierks/patch-1
Explain ordered nature of renders dict
2015-02-10 20:48:13 -05:00
Aaron Griffith 32fbc1dea2 nbt array lengths are unsigned (see issue #1190) 2015-02-02 04:59:43 -05:00
Aaron Griffith 9a119a2dce Merge remote-tracking branch 'kiskoza/master' 2015-02-01 12:46:22 -05:00
Aaron Griffith 7e771abfee Merge remote-tracking branch 'CounterPillow/expand-dong' 2015-02-01 12:39:42 -05:00
Aaron Griffith 4eacfa467f Merge remote-tracking branch 'CounterPillow/rcon-observer' 2015-02-01 12:22:34 -05:00
Aaron Griffith bad4261cb5 Merge remote-tracking branch 'enaut/structure_overlay' 2015-02-01 12:15:56 -05:00
Aaron Griffith 35863578d7 Merge remote-tracking branch 'matrixhacker/master'
Conflicts:
	docs/config.rst
2014-06-26 05:14:49 -04:00
Aaron Griffith 360e579752 Merge pull request #1119 from dbergl/prismarine
add new 14w25a prismarine and sea lantern blocks
2014-06-26 04:59:50 -04:00
Aaron Griffith 97778e4a67 Merge pull request #1113 from CounterPillow/docs-cleanup
Docs cleanup
2014-06-26 04:58:51 -04:00
Aaron Griffith c920c0ab7a Merge pull request #1118 from CounterPillow/patch-1
genPOI: Fix warning for unresolvable UUID
2014-06-23 05:08:59 -04:00
Aaron Griffith 95de300276 fix jar caching forcing default textures (caused by 183da128) 2014-05-10 18:45:58 -04:00
Aaron Griffith 8881ba608d Merge pull request #1098 from CounterPillow/optimizehints
Clarify optimizeimg docs; Warn if the order of optimizers does not make sense.
2014-05-09 14:58:09 -04:00
Aaron Griffith a39c45d473 Merge pull request #1087 from rymate1234/master
Add a small message stating where the render is and how to open it
2014-05-06 18:25:31 -04:00
Aaron Griffith 4b2cbfb5ee Merge pull request #1074 from CounterPillow/optimizerewrite
Rewrote image optimisation stuff.
2014-05-06 18:25:09 -04:00
Aaron Griffith 7c23d6e86a added rendercheck mode 3, the identity function of rendercheck modes! 2014-05-01 16:48:28 -04:00
Aaron Griffith a8fc3300b4 general fixes for min/maxzoom, documentation cleared up
hopeful fix for #1086
2014-04-05 20:29:58 -04:00
Aaron Griffith 1ae21a70a5 Merge pull request #1078 from jasendorf/patch-1
--check-tiles note about overestimating
2014-03-07 00:16:52 -05:00
Aaron Griffith bfe06c1464 Merge pull request #1066 from wilg/master
display region file name in map coordinates view
2014-02-16 21:39:39 -05:00
Aaron Griffith 519e13a34f added note about signed APT repo to install docs 2013-12-31 16:47:43 -05:00
Aaron Griffith 4576fc96dc Merge remote-tracking branch 'ion1/master' 2013-12-28 18:58:39 -05:00
Aaron Griffith 2584328ba3 quick and dirty fix for progressbar assertion error 2013-12-28 16:27:26 -05:00
Aaron Griffith da6d3614bc Merge remote-tracking branch 'ion1/master' 2013-12-28 01:12:46 -05:00
Aaron Griffith 28a08631ee updated testrender script to re-use current python for children 2013-12-27 14:11:39 -05:00
Aaron Griffith 1a1022fa2f multiprocessing-based POI generator no longer crashes on python 2.6
fixes Issue #1041
2013-12-24 12:10:05 -05:00
Aaron Griffith df732bfa25 Revert "Merge remote-tracking branch 'exhuma/master', PR #963"
This reverts commit e26727943f, reversing
changes made to 7bbb077704.
2013-12-02 07:40:00 -05:00
Aaron Griffith a8a2a191b8 Revert "used LOG instead of logging on a few stragglers"
This reverts commit 144cff18e3.
2013-12-02 07:35:10 -05:00
Aaron Griffith 2967032ecc added smooth-lighting exception for ice (see issue #1032) 2013-12-01 16:54:01 -05:00
Aaron Griffith 144cff18e3 used LOG instead of logging on a few stragglers 2013-12-01 16:39:45 -05:00
Aaron Griffith e26727943f Merge remote-tracking branch 'exhuma/master', PR #963
Conflicts:
	overviewer.py
	overviewer_core/aux_files/genPOI.py
	overviewer_core/textures.py
2013-12-01 16:35:28 -05:00
Aaron Griffith 7bbb077704 added light color texture, since it's apparently not part of minecraft anymore 2013-12-01 16:30:49 -05:00
Aaron Griffith 606d794948 Merge remote-tracking branch 'joe-mojo/master', PR #974, Issue #973 2013-12-01 16:29:07 -05:00
Aaron Griffith 77e8c49b9f Merge remote-tracking branch 'imermcmaps/maxzoom', PR #1030 2013-12-01 16:28:41 -05:00
Aaron Griffith 0af9fa8760 Merge remote-tracking branch 'imermcmaps/master', PR #1029 2013-12-01 16:28:21 -05:00
Aaron Griffith f7e982dd83 Merge remote-tracking branch 'aib/master', PR #1028 2013-12-01 16:27:59 -05:00
Aaron Griffith 8d55743aeb Merge remote-tracking branch 'counterpillow/home-fix', PR #1027 2013-12-01 16:27:35 -05:00
Aaron Griffith af3554b18a Merge remote-tracking branch 'pibm/poi_changes', PR #999
Conflicts:
	overviewer_core/aux_files/genPOI.py
2013-12-01 16:26:51 -05:00
Aaron Griffith aecbf28faf Merge remote-tracking branch 'yoplitein/master' into mystcraft
Conflicts:
	overviewer_core/aux_files/genPOI.py
2013-12-01 15:56:56 -05:00
Aaron Griffith 41d63c3781 Merge remote-tracking branch 'counterpillow/genpoi-mystcraft' into mystcraft 2013-12-01 15:54:23 -05:00
Aaron Griffith ae393ccc2c Merge pull request #988 from CounterPillow/ftb-cave-fix
Fixed cave render for solid unknown blocks.
2013-09-13 15:19:15 -07:00
Aaron Griffith 6b76e9c2fa fixed hiding JSObserver info box when unused 2013-08-21 10:59:53 -04:00
Aaron Griffith 3ef5382be8 fixed new version incantation to work on windows 2013-08-18 17:36:10 -04:00
Aaron Griffith 6ba77a029c findGitVersion() ignores non-versiony tags 2013-08-18 16:38:28 -04:00
Aaron Griffith 809ce79a20 fixed --check-terrain with --config 2013-08-15 22:10:44 -04:00
Aaron Griffith 97ffd322fe Merge pull request #970 from CounterPillow/patch-1
Add note about distutils bug.
2013-08-12 10:02:17 -07:00
Aaron Griffith f87dcee6f1 emit a warning (but don't crash!) on unexpected empty tiles 2013-07-25 14:15:19 -04:00
Aaron Griffith fd057b819d Merge pull request #956 from duckman/patch-1
Fix more cobblestone textures
2013-07-09 10:16:49 -07:00
Aaron Griffith df2c4b5f03 fixed bug that occurs when %HOME% is set on windows 2013-07-05 18:24:18 -04:00
Aaron Griffith 1fa6353ee7 un-revert merge of PR#928, now in a branch
This reverts commit 124def3602.
2013-06-07 08:49:25 -04:00
Aaron Griffith 124def3602 revert merge of PR#928 to master, which broke on non-snapshot
This reverts commit bc5afbed5c, reversing
changes made to 7457758fbb.
2013-06-07 08:48:08 -04:00
Aaron Griffith c696bdfe0d updated contributors list 2013-05-20 21:01:53 -04:00
Aaron Griffith fecbfd0706 Merge branches 'config-include', 'hashchange', 'poi-polylines', 'showlocationmarker' and 'signed-timestamps' 2013-05-20 20:56:40 -04:00
Aaron Griffith c52dc45bed removed bit about __init__.py 2013-05-20 20:48:04 -04:00
Aaron Griffith 6e3556ab12 nbt timestamps are probably signed (like time_t)
Besides, we get overflow errors with utime on windows for large
unsigned 32-bit integers.
2013-05-06 18:11:45 -03:00
Aaron Griffith 84f919ac6a overviewer now pulls fire/lava/water textures from the right place
fixes issue #910
2013-03-21 14:30:44 -04:00
Aaron Griffith b8e2003c65 travis ci button now uses master branch only
it used to show the status for all branches, which means (right now at least)
it's always failing.
2013-02-16 13:59:59 -05:00
Aaron Griffith d09b74e6f0 use git to find current hash, should work with overviewer-as-submodule 2013-01-21 16:50:38 -05:00
Aaron Griffith 03fa62f3d6 updaded doc download links 2013-01-15 12:21:54 -05:00
Aaron Griffith 443aa84b07 updated tileset.py and genPOI.py and a few other stragglers 2013-01-06 01:00:06 -05:00
Aaron Griffith 77fff9fa25 specifying a directory name for a dimension should work now 2013-01-06 00:43:52 -05:00
Aaron Griffith a3221c6643 removed note about install, caused more grief than good 2012-10-23 17:41:29 -03:00
Aaron Griffith 58b5c12172 c_overviewer is now slightly more binary-compatible across numpy versions 2012-09-19 12:25:36 -04:00
Aaron Griffith 6768ba328b updated CONTRIBUTORS.rst
added new contributors, and bumped some long-time contributors to the
"long-term" list.
2012-09-14 22:46:38 -04:00
Aaron Griffith 2b5de2f2de Merge remote-tracking branches 'tswsl1989/biomesoverlay', 'socolin/patch-2', 'tswsl1989/upstream', 'counterpillow/ffscalefix' and 'maruohon/log-rotation-fix' 2012-09-14 22:36:34 -04:00
Aaron Griffith 6f0cdc35a1 Merge branch 'overlay-fix' 2012-09-11 16:41:56 -04:00
Aaron Griffith 49b05dece5 huh, I guess the overlay attribute is always there. length > 0 then. 2012-09-11 15:47:52 -04:00
Aaron Griffith 143b9fa366 overlay-ness now considers whether the "overlay" option is set 2012-09-11 14:28:35 -04:00