From 4c29cf453d3e48f20d525ee5ce22cf7028ad3236 Mon Sep 17 00:00:00 2001 From: Socolin Date: Sat, 1 Sep 2012 15:44:09 +0300 Subject: [PATCH 1/9] Support blockid > 255 --- overviewer_core/src/overviewer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overviewer_core/src/overviewer.h b/overviewer_core/src/overviewer.h index 860dfa3..7440274 100644 --- a/overviewer_core/src/overviewer.h +++ b/overviewer_core/src/overviewer.h @@ -136,7 +136,7 @@ extern unsigned int max_blockid; extern unsigned int max_data; extern unsigned char *block_properties; static inline int -block_has_property(unsigned char b, BlockProperty prop) { +block_has_property(unsigned short b, BlockProperty prop) { if (b >= max_blockid || !(block_properties[b] & (1 << KNOWN))) { /* block is unknown, return defaults */ if (prop == TRANSPARENT) From 37fcf5a478cbac5acb212c8c2109b0275dcc4899 Mon Sep 17 00:00:00 2001 From: CounterPillow Date: Mon, 3 Sep 2012 17:05:55 +0200 Subject: [PATCH 2/9] Added note about building on CentOS 6 --- docs/building.rst | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/docs/building.rst b/docs/building.rst index 7509f8f..dc9c9c0 100644 --- a/docs/building.rst +++ b/docs/building.rst @@ -143,8 +143,15 @@ to the file /etc/make.conf, but read the ports documentation to be sure of what .. _centos: -CentOS ------- +CentOS 5 +-------- + +.. note:: + + If you are using CentOS 6, you do not need to install the epel repo. + CentOS 6 should come with the right python version, you can check + your version running *python --version*. + Since CentOS has an older version of Python (2.4), there are some difficulties in getting the Overviewer to work. Follow these steps which have been reported to work. From a53843caa6f38747c7e63aab15cb07c0694887ad Mon Sep 17 00:00:00 2001 From: Thomas Lake Date: Wed, 5 Sep 2012 10:17:15 +0100 Subject: [PATCH 3/9] Filter out player files not ending in ".dat" --- overviewer_core/aux_files/genPOI.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/overviewer_core/aux_files/genPOI.py b/overviewer_core/aux_files/genPOI.py index 5d0c0b6..9b3d683 100755 --- a/overviewer_core/aux_files/genPOI.py +++ b/overviewer_core/aux_files/genPOI.py @@ -56,8 +56,13 @@ def handlePlayers(rset, render, worldpath): 'default': 0}[render['dimension']] playerdir = os.path.join(worldpath, "players") if os.path.isdir(playerdir): + def ignoreTmp(filename): + return filename.endswith(".dat") + playerfiles = os.listdir(playerdir) + playerfiles = filter(ignoreTmp, playerfiles) isSinglePlayer = False + else: playerfiles = [os.path.join(worldpath, "level.dat")] isSinglePlayer = True From ca0ec868ac723f16d770aea42ae81bda90454afc Mon Sep 17 00:00:00 2001 From: Thomas Lake Date: Fri, 7 Sep 2012 10:32:11 +0100 Subject: [PATCH 4/9] Update to use list comprehensions --- overviewer_core/aux_files/genPOI.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/overviewer_core/aux_files/genPOI.py b/overviewer_core/aux_files/genPOI.py index 9b3d683..6a846ed 100755 --- a/overviewer_core/aux_files/genPOI.py +++ b/overviewer_core/aux_files/genPOI.py @@ -56,11 +56,8 @@ def handlePlayers(rset, render, worldpath): 'default': 0}[render['dimension']] playerdir = os.path.join(worldpath, "players") if os.path.isdir(playerdir): - def ignoreTmp(filename): - return filename.endswith(".dat") - playerfiles = os.listdir(playerdir) - playerfiles = filter(ignoreTmp, playerfiles) + playerfiles = [x for x in playerfiles if x.endswith(".dat")] isSinglePlayer = False else: From ccf99fb61dc35e0f4ce133cf1d84a7b81c5ac961 Mon Sep 17 00:00:00 2001 From: CounterPillow Date: Sun, 9 Sep 2012 17:09:41 +0200 Subject: [PATCH 5/9] Fixed POI infowindow image scaling for FireFox --- overviewer_core/data/web_assets/overviewer.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overviewer_core/data/web_assets/overviewer.css b/overviewer_core/data/web_assets/overviewer.css index fff3458..700a9ef 100644 --- a/overviewer_core/data/web_assets/overviewer.css +++ b/overviewer_core/data/web_assets/overviewer.css @@ -25,7 +25,7 @@ body { .infoWindow>img { width:80px; float: left; - + image-rendering: -moz-crisp-edges; } .infoWindow>p { From 55f2273f81ea483acc6e214d01c0d487ecb4e330 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Mon, 10 Sep 2012 20:38:50 -0400 Subject: [PATCH 6/9] Added a debug output to accompany a warning. If there is an error reading or parsing overviewerConfig.js, it prints a warning and continues, but gives no indication of what went wrong. Added a debug line that prints the full traceback. --- overviewer_core/assetmanager.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/overviewer_core/assetmanager.py b/overviewer_core/assetmanager.py index 4825a65..d9102c2 100644 --- a/overviewer_core/assetmanager.py +++ b/overviewer_core/assetmanager.py @@ -19,6 +19,7 @@ import codecs import locale import time import logging +import traceback from PIL import Image @@ -51,6 +52,7 @@ directory. except Exception, e: if os.path.exists(os.path.join(self.outputdir, "overviewerConfig.js")): logging.warning("A previous overviewerConfig.js was found, but I couldn't read it for some reason. Continuing with a blank config") + logging.debug(traceback.format_exc()) self.overviewerConfig = dict(tilesets=dict()) def get_tileset_config(self, name): From 143b9fa366ba213a8a1e294874274d2d5b57bdd6 Mon Sep 17 00:00:00 2001 From: Aaron Griffith Date: Tue, 11 Sep 2012 14:28:35 -0400 Subject: [PATCH 7/9] overlay-ness now considers whether the "overlay" option is set --- overviewer_core/tileset.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overviewer_core/tileset.py b/overviewer_core/tileset.py index 1a91f51..bae0a52 100644 --- a/overviewer_core/tileset.py +++ b/overviewer_core/tileset.py @@ -513,7 +513,7 @@ class TileSet(object): """ def bgcolorformat(color): return "#%02x%02x%02x" % color[0:3] - isOverlay = not any(isinstance(x, rendermodes.Base) for x in self.options.get("rendermode")) + isOverlay = ("overlay" in self.options) or (not any(isinstance(x, rendermodes.Base) for x in self.options.get("rendermode"))) d = dict(name = self.options.get('title'), zoomLevels = self.treedepth, From 49b05dece53b0d08d2ba622d01968934ba540e5d Mon Sep 17 00:00:00 2001 From: Aaron Griffith Date: Tue, 11 Sep 2012 15:47:52 -0400 Subject: [PATCH 8/9] huh, I guess the overlay attribute is always there. length > 0 then. --- overviewer_core/tileset.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overviewer_core/tileset.py b/overviewer_core/tileset.py index bae0a52..683cb2e 100644 --- a/overviewer_core/tileset.py +++ b/overviewer_core/tileset.py @@ -513,7 +513,7 @@ class TileSet(object): """ def bgcolorformat(color): return "#%02x%02x%02x" % color[0:3] - isOverlay = ("overlay" in self.options) or (not any(isinstance(x, rendermodes.Base) for x in self.options.get("rendermode"))) + isOverlay = self.options.get("overlay") or (not any(isinstance(x, rendermodes.Base) for x in self.options.get("rendermode"))) d = dict(name = self.options.get('title'), zoomLevels = self.treedepth, From 32b50c05506ac67f8fe5ab7e7d5dc887fb8ac337 Mon Sep 17 00:00:00 2001 From: Matti Ruohonen Date: Wed, 12 Sep 2012 15:10:26 +0300 Subject: [PATCH 9/9] Fix wood log rotation in lower-left and lower-right orientations. --- overviewer_core/textures.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index 8de4805..bc8dab7 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -860,7 +860,7 @@ def wood(self, blockid, data): if self.rotation == 1: if wood_orientation == 4: wood_orientation = 8 elif wood_orientation == 8: wood_orientation = 4 - elif self.rotation == 2: + elif self.rotation == 3: if wood_orientation == 4: wood_orientation = 8 elif wood_orientation == 8: wood_orientation = 4