Commit Graph
100 Commits
Author SHA1 Message Date
Andrew Chin 6682b9130a Merge PR #1285 2016-03-06 00:20:11 -05:00
Andrew Chin db3c79a46e Tweak crop rendering
Remote beetroot in preperation of bringing in patch
2016-03-06 00:03:44 -05:00
Andrew Chin 5f9276a24a Implement path blocks
Farmland now shares a bit of code with pathblocks and are rendered at a
15/16th sized block
2016-03-03 21:22:09 -05:00
Andrew Chin 81be4bc6e8 Bump mc version in travis and textures.py error msg. also force rebuild 2016-03-01 21:29:51 -05:00
Andrew Chin bc9a097957 Add some new blocks for Minecraft 1.9
* Purpur blocks, pillars, stairs, and slabs
* End brick
2016-03-01 21:25:15 -05:00
Andrew Chin 8d3d8dc0ee Fix command block for Minecraft 1.9
See #1280
2016-03-01 20:47:22 -05:00
Andrew Chin 68955c7b93 Fix redstone dust for Minecraft 1.9
This breaks compatibily with Minecraft 1.8

See #1280
2016-03-01 20:46:02 -05:00
Andrew Chin a0766974b5 Merge pull request #1270 from tcyrus/patch-1
Update README.rst
2016-01-15 16:42:50 -05:00
Andrew Chin d849f25930 Merge pull request #1267 from overviewer/uuidcache
genpoi UUID improvements
2016-01-14 16:12:51 -05:00
Andrew Chin 2e34507568 Use FileReplacer to manage the uuid cache file 2016-02-01 09:32:35 -05:00
Andrew Chin 68430335c8 JSObserver: Add missing string formatting param 2015-12-27 15:04:32 -05:00
Andrew Chin 270741eb8f genpoi UUID improvements
* When reading the cache, catch some errors on load, instead of crashing
* When writing to cache, write to tmp file, then move it into place.
  This should be more robust if a ctrl+c is recieved while writing the
  cache

Addresses #1266
2015-12-27 14:59:03 -05:00
Andrew Chin 0ba0c60ed2 Catch TypeErrors as well when loading player dat files 2015-10-06 17:38:49 -04:00
Andrew Chin afc1c4f924 Don't call save_cache if running with --skip-players 2015-08-14 08:47:52 -04:00
Andrew Chin dec9aada01 Hopefully a better fix for the sdist problem.
Removing trailing slashes from MANIFEST.in file.  Why is this needed?
No idea, i hate distutils
2015-06-24 11:42:41 -04:00
Andrew Chin 253f78c8d1 Revert "Add c_overveiwer_includes to the list of source files"
This reverts commit d6d488c3ea.

Because achin is a doofus
2015-06-24 11:41:26 -04:00
Andrew Chin d6d488c3ea Add c_overveiwer_includes to the list of source files
This seems to be needed to make "sdist" include these headerfiles. i
have no idea how/if this worked in the past
2015-06-24 11:30:31 -04:00
Andrew Chin ddfd88aad7 Update signs.rst
Added small note about how to look for the Markers button on a successful genpoi
2015-06-05 22:07:02 -04:00
Andrew Chin e6f44aed26 Merge pull request #1135 from MasterofJOKers/my_genpoi
addressing genPOI RAM usage
2015-03-06 17:09:40 -05:00
Andrew Chin d696df2a1f Don't crash if no renders/regionsets are found 2015-02-07 21:32:24 -05:00
Andrew Chin 9336ff7954 Merge pull request #1199 from calebsander/master
Added information about --skip-scan to the docs
2015-01-29 10:51:39 -05:00
Andrew Chin 97e5985933 Allow worlds with a version of zero (temp fix for #1194) 2015-01-03 11:56:51 -05:00
Andrew Chin f3af9555f0 Merge pull request #1163 from CounterPillow/optimizeimg-fixes
Add jpegoptim interface to optimizeimages
2014-11-25 02:17:14 -05:00
Andrew Chin b1d0ab8179 Merge pull request #1171 from CounterPillow/warn-root
Add warning if Overviewer is run as root
2014-11-25 02:14:37 -05:00
Andrew Chin d34378bc29 Merge pull request #1172 from tswsl1989/upstream
Fix east side large mushroom rendering
2014-11-25 02:14:13 -05:00
Andrew Chin dcbf5ac63f Merge pull request #1174 from CounterPillow/playerspawn-uuid
genPOI: Resolve UUIDs for player spawns too
2014-10-24 11:55:29 -04:00
Andrew Chin 00c2782bf5 Merge pull request #1151 from computertechie/fence_gates
Add support for the new fence gates
2014-09-03 20:26:03 -04:00
Andrew Chin af47000079 Lighting fixes for red sandstone stairs and slabs
Closes #1150
Closes #1149
2014-09-02 22:23:33 -04:00
Andrew Chin fd468f4cf3 Forgot to bump version for travis 2014-09-02 10:56:09 -04:00
Andrew Chin 5d13030834 Bump versions and docs for 1.8 support! 2014-09-02 10:54:13 -04:00
Andrew Chin 879699d3e6 Merge branch 'snapshot' 2014-09-02 10:44:53 -04:00
Andrew Chin 50b8da5820 Merge pull request #1146 from computertechie/patch-1
Fix a typo and silly crash case
2014-08-31 16:31:29 -04:00
Andrew Chin e82e7bf0b2 added support for different door types 2014-08-26 15:48:05 -04:00
Andrew Chin df920e60de Added support for the difference fence colors 2014-08-26 14:17:40 -04:00
Andrew Chin 0974b37fa7 Merge remote-tracking branch 'origin/snapshot' into snapshot 2014-08-26 14:17:03 -04:00
Andrew Chin da295d928a Merge branch 'master' into snapshot 2014-08-26 11:55:00 -04:00
Andrew Chin 924d396758 Show an ETA when using the plain text logger
Closes #1088
2014-08-19 22:49:33 -04:00
Andrew Chin 322922b8e6 Implement a UUID lookup cache, to avoid hitting the mojang server so much
The cache is a gzip'd JSON file.  Soon we will have a small script to
help manage the cache

See #1090 and #1117
2014-08-19 22:08:15 -04:00
Andrew Chin 59d277a131 Change ctime to localtime.
See discussion in #1082
2014-08-19 21:28:25 -04:00
Andrew Chin 8257220657 Merge PR# 1082 2014-08-19 21:17:57 -04:00
Andrew Chin 8cc2346f6d Merge pull request #1141 from enaut/docfix
Fix error in the config.rst file
2014-08-19 21:15:06 -04:00
Andrew Chin da3e6fdd41 Merge pull request #1133 from bmbeverst/patch-1
Latest version of minecraft jar
2014-08-05 21:58:47 -04:00
Andrew Chin 0b3f91e752 Merge pull request #1131 from CounterPillow/genpoi-dimfix
Fix genPOI dimension parsing
2014-07-28 12:19:12 -04:00
Andrew Chin 6e29245a36 Merge pull request #1129 from Aaron1011/patch-2
Fix typo
2014-07-09 16:50:54 -04:00
Andrew Chin 9d7e1d2e02 Merge pull request #1110 from CounterPillow/genpoi-triage
genPOI triage
2014-06-18 22:51:25 -04:00
Andrew Chin fdb3e4d599 Merge pull request #1112 from CounterPillow/worldnamefix
Remove broken special case for ancient worlds
2014-06-04 09:57:07 -04:00
Andrew Chin 381d66f36d Try to prevent findGitHash from ever returning None
See #1093
2014-06-01 21:13:55 -04:00
Andrew Chin a7aab9d1b2 Try to prevent findGitHash from ever returning None 2014-06-01 21:13:14 -04:00
Andrew Chin 5427b28ca2 Use is not None instead of != None 2014-05-26 14:02:40 -04:00
Andrew Chin f6825dd8da Merge pull request #1102 from Shadark/rename_fix
Fixed pngnq rename error in Windows
2014-05-17 10:55:25 -04:00
Andrew Chin 6eacb3ecc7 Merge branch 'master' into snapshot 2014-05-10 19:44:33 -04:00
Andrew Chin ab29a9155f Merge branch 'master' into snapshot 2014-05-07 18:34:45 -04:00
Andrew Chin 9487d6f5bd Added a --check-version option 2014-05-03 00:23:10 -04:00
Andrew Chin 7d87d25658 Fix ServerAnnounceObserver typo 2014-04-15 11:22:41 -04:00
Andrew Chin 8e5944d5c3 Catch some additional UUID lookup errors from urllib2 2014-04-10 19:52:50 -04:00
Andrew Chin ae586a7d27 Merge PR #1079 -- Handle UUID player files semi-nicely in POIgen 2014-04-10 19:44:24 -04:00
Andrew Chin 49cf0b4187 Merge PR #1055 2014-03-30 20:09:30 -04:00
Andrew Chin 3f222796c5 Print a limit=1 traceback if failed to build 2014-03-30 18:50:46 -04:00
Andrew Chin 90071e999f Merge #1055 -- Prevent opening and parsing files which haven't been modified since the last time that the render was done. 2014-03-30 18:21:08 -04:00
Andrew Chin a6922e4ab7 New snapshot block: slime blocks
See #1062
2014-03-08 13:09:15 -05:00
Andrew Chin 5be1d62e15 New blocks for snapshot
Granite, Diorite, Andesite (new data values for blockid:1)
Iron trapdoor

See #1062
2014-03-08 13:02:01 -05:00
Andrew Chin 796481f838 Merge pull request #1071 from urda/fix-terms
The previous Google Maps URL was 404'ing. New URL added.
2014-02-27 17:11:04 -05:00
Andrew Chin 65d6e3bcd1 Remove SizeOnDisk from table of detected worlds
This fields hasn't been properly filled in for many many releases.
We could detect this value some other way, but i'm not sure the value in
doing this
2014-02-21 22:23:25 -05:00
Andrew Chin d9e907913e Added some more printouts when Overviewer is first starting
Often, when people ask questions about Overviewer, "all it says is
'Welcome to Overivwer'" is a common question.  Enable a little more
logging info at the start of Overviewer to hopefully make it more clear
that something is happening
2014-02-21 22:11:29 -05:00
Andrew Chin eda7671450 Merge pull request #1068 from overviewer/locale_fix
Fixes for locale issues
2014-02-19 21:16:24 -05:00
Andrew Chin 2c35ab8cc7 Merge pull request #1064 from overviewer/fscaps
Try to track the capabilities of our outputdir filesystem.
2014-02-16 22:38:41 -05:00
Andrew Chin c7ee8560d3 Fixes for locale issues
There were some problems when a level.dat contained a non-ascii name, or
when a level.dat lived in a directory with a non-ascii name.

Paths returned by os.listdir are encoded, so we need to decode them
before printing them.  When calculating the max length of the enumerated
world names, were we for some reason calling str() before taking the
len().  The had the effect of converting unicode strings into
non-unicode strings, which is not the correct thing to do.
2014-02-16 13:35:16 -05:00
Andrew Chin d11960ecfb Try to track the capabilities of our outputdir filesystem.
For example, don't chmod if the filesystem dosen't support chmod, and
don't rename over files if that's not supported (this functionality was
already in place).

Should fix #1061
Related to #1055 (we could add a mtime capability flag)
2014-02-11 10:38:38 -05:00
Andrew Chin b88ce263bc Merge PR #1058 2014-02-08 14:50:40 -05:00
Andrew Chin 7b81dc1df2 Merge pull request #1059 from jeremymurray/patch-1
Correct case on observer import example.
2014-02-07 14:07:19 -05:00
Andrew Chin a2780197cb Fix up python3 detection 2014-01-06 08:47:03 -05:00
Andrew Chin ded35116aa Some initial docs on how to use gist 2014-01-01 22:32:35 -05:00
Andrew Chin d68c792c41 Allow --genpoi to use -c to specify a config file
Closes #1033
2013-12-26 23:45:07 -05:00
Andrew Chin 329b299664 Merge PR #1037 -- ServerAnnounceObserver.update() updates last_update 2013-12-26 23:36:24 -05:00
Andrew Chin 7089eef005 Add a minzoom option
This only affects what's written to overviewerConfig.js.  That is, it
does not change the amount of tiles rendered (it's exactly analogous to
maxzom)

Closes #994
2013-12-26 23:04:20 -05:00
Andrew Chin 94b8a81a90 Added small link to the build docs when encountering a build problem
Related to #1024
2013-12-26 22:30:10 -05:00
Andrew Chin 2deaff6dac Have overviewer --version --verbose print some helpful information 2013-12-14 18:40:05 -05:00
Andrew Chin cc4261aea5 Ignore corrupt chunks from .get_chunks() in genpoi
See #1038
2013-12-13 20:34:54 -05:00
Andrew Chin f35859e026 If numpy has a problem reshaping data, issue a warning instead of crashing
Addresses #1038
2013-12-13 18:56:26 -05:00
Andrew Chin 5d61b57cb6 Merge pull request #1023 from CounterPillow/fix-for-pleb-browser
Fixed IE11 JS errors
2013-11-26 10:48:30 -08:00
Andrew Chin 87356ba594 Updated "Installing Textures" section
Use 1.7.2 in the examples instead of 1.6.2, since a 1.7 version is required
2013-11-20 18:09:52 -05:00
Andrew Chin cbd76d87a0 Fix leave data masking 2013-11-03 14:30:21 -05:00
Andrew Chin 5a320fb89a fix data range on wooden planks 2013-11-03 14:24:30 -05:00
Andrew Chin 9d76e48481 Fix link errors on OSX 10.9? I think?
Fix for #1008
2013-10-31 23:02:18 -04:00
Andrew Chin a20290ea83 Minor doc cleanups 2013-10-30 21:37:32 -04:00
Andrew Chin 85f1112813 Overviewer now require 1.7 textures or newer 2013-10-30 20:57:37 -04:00
Andrew Chin 5287a25f18 Update MC version in travis config to 1.7.2 2013-10-29 16:12:07 -04:00
Andrew Chin 97ace8fa67 Bump header version to force rebuild (on account of biome code change) 2013-10-28 22:25:28 -04:00
Andrew Chin b997c3b1d7 Merge PR #1005 : Add new Biomes, guessing on correct color schemes 2013-10-28 21:21:20 -04:00
Andrew Chin 5f633b8138 Fix rendering of large portals
Fixes issue #1009
2013-10-27 21:29:26 -04:00
Andrew Chin 63311fbd92 Fix missing dark-oak leaves 2013-10-26 14:18:17 -04:00
Andrew Chin 0306a7040d Fix a oops with water 2013-10-26 02:02:18 -04:00
Andrew Chin 46bda131f9 Add stained glass and stained glass panels
Note that this commit changes the pseudo-ancil-data type from unsigned
int to an unsigned short.  Our pseudoancil code creates 5 bits of data
to store adjacency information for glass.  Glass also has 4 bits for
color info.  This means we need a total of 9 bits to render these (thus
int --> short)
2013-10-26 01:47:07 -04:00
Andrew Chin 3eaa507d95 Add Acacia/DarkOak wood 2013-10-26 00:08:29 -04:00
Andrew Chin c9571553e6 Bump extension version 2013-10-25 23:42:11 -04:00
Andrew Chin 63e9226415 Merge branch 'snapshot'
Conflicts:
	overviewer_core/src/iterate.c
2013-10-25 23:35:22 -04:00
Andrew Chin 0ab5fe0d90 Merge PR #989 -- Refactored stairs rendering to support corners 2013-10-19 12:08:57 -04:00
Andrew Chin defa37252b Add warning to index.html that should hopefully be visible when there is
an error loading the JS components
2013-10-07 19:48:37 -04:00
Andrew Chin 3b373f5479 Merge PR #991 2013-10-03 18:48:44 -04:00
Andrew Chin 57a7be9e2a Merge PR #996
Conflicts:
	overviewer_core/textures.py
2013-10-03 18:43:31 -04:00