From dcd094bd1b6077dc2f065c390b33f7ac059cbd6b Mon Sep 17 00:00:00 2001 From: Jan Dahl Date: Sun, 25 Aug 2013 13:10:24 +0200 Subject: [PATCH 1/6] Added clarification on 'northdirection' that it has to do with viewpoint angle --- docs/config.rst | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/config.rst b/docs/config.rst index dcda9de..7a3e549 100644 --- a/docs/config.rst +++ b/docs/config.rst @@ -87,6 +87,14 @@ A more complicated example "dimension": "nether", } + renders["survivalnethersouth"] = { + "world": "survival", + "title": "Survival Nether", + "rendermode": nether_smooth_lighting, + "dimension": "nether", + "northdirection" : "lower-right", + } + renders["creative"] = { "world": "creative", "title": "Creative", @@ -460,7 +468,7 @@ values. The valid configuration keys are listed below. objects. See :ref:`customrendermodes` for more information. ``northdirection`` - This is direction that north will be rendered. This north direction will + This is direction or viewpoint angle with which north will be rendered. This north direction will match the established north direction in the game where the sun rises in the east and sets in the west. From ce419042e5bffc14145acd44b6d6c8f3ac580bc4 Mon Sep 17 00:00:00 2001 From: Andrew Chin Date: Thu, 29 Aug 2013 10:00:00 -0400 Subject: [PATCH 2/6] Use https to load external JS This fixes an annoying problem where browsers generally ignore http javascript on https html --- overviewer_core/data/web_assets/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/overviewer_core/data/web_assets/index.html b/overviewer_core/data/web_assets/index.html index e8010a0..8b25b03 100644 --- a/overviewer_core/data/web_assets/index.html +++ b/overviewer_core/data/web_assets/index.html @@ -10,8 +10,8 @@ - - + + From 7a7f92ba439704a339559396aea70cbfdc572b37 Mon Sep 17 00:00:00 2001 From: Andrew Chin Date: Thu, 29 Aug 2013 10:32:59 -0400 Subject: [PATCH 3/6] Use https instead of http for icons --- overviewer_core/assetmanager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/overviewer_core/assetmanager.py b/overviewer_core/assetmanager.py index a1aec75..96d8bb2 100644 --- a/overviewer_core/assetmanager.py +++ b/overviewer_core/assetmanager.py @@ -101,8 +101,8 @@ directory. 'defaultMarker': 'signpost.png', 'signMarker': 'signpost_icon.png', 'bedMarker': 'bed.png', - 'spawnMarker': 'http://google-maps-icons.googlecode.com/files/home.png', - 'queryMarker': 'http://google-maps-icons.googlecode.com/files/regroup.png' + 'spawnMarker': 'https://google-maps-icons.googlecode.com/files/home.png', + 'queryMarker': 'https://google-maps-icons.googlecode.com/files/regroup.png' } dump['CONST']['mapDivId'] = 'mcmap' dump['CONST']['regionStrokeWeight'] = 2 # Obselete From 15709e454dd692d52d7842bf321b11b432759239 Mon Sep 17 00:00:00 2001 From: PotcFdk Date: Thu, 29 Aug 2013 19:46:35 +0200 Subject: [PATCH 4/6] Fixed a typo ('leve' -> 'level'). --- contrib/png-it.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/png-it.py b/contrib/png-it.py index 3e62312..e23b734 100644 --- a/contrib/png-it.py +++ b/contrib/png-it.py @@ -18,7 +18,7 @@ def main(): parser.add_option('--memory-limit', '-m', help = 'Limit the amount of ram to use in MB. If it\'s expected to exceed the limit it won\'t do anything.',\ metavar = '', type = int, dest = 'memory_limit', default = None) - parser.add_option('--zoom-level', '-z', help = 'Which zoom leve to use from the overviewer map. NOTE: the RAM usage will increase exponentially with the zoom level.',\ + parser.add_option('--zoom-level', '-z', help = 'Which zoom level to use from the overviewer map. NOTE: the RAM usage will increase exponentially with the zoom level.',\ metavar = '', type = int, dest = 'zoom_level', default = None) parser.add_option('--crop', '-c', help = 'It will crop a frame around the image, give it in percentage. For example in a image of 1000x2000 pixels, a 10% crop will crop 100 pixels in the left, right sides and 200 pixels in the bottom and top sides. NOTE: this is no exact, it will be rounded to the nearest overviewer map tile.',\ @@ -68,7 +68,7 @@ def main(): all_images = glob(path) if not all_images: - "Error! No images found in this zoom leve. Is this really an overviewer tile set directory?" + "Error! No images found in this zoom level. Is this really an overviewer tile set directory?" sys.exit(1) # autocrop will calculate the center and crop values automagically From fbb1a7b379d175ea8457710cd673c1c1ae89e216 Mon Sep 17 00:00:00 2001 From: Thomas Lake Date: Thu, 29 Aug 2013 20:05:45 +0100 Subject: [PATCH 5/6] It helps if we print the error message --- contrib/png-it.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/png-it.py b/contrib/png-it.py index e23b734..eb1776f 100644 --- a/contrib/png-it.py +++ b/contrib/png-it.py @@ -68,7 +68,7 @@ def main(): all_images = glob(path) if not all_images: - "Error! No images found in this zoom level. Is this really an overviewer tile set directory?" + print "Error! No images found in this zoom level. Is this really an overviewer tile set directory?" sys.exit(1) # autocrop will calculate the center and crop values automagically From 2b493ce4f4b3b94590648c870c9cf2e4da39c532 Mon Sep 17 00:00:00 2001 From: Thomas Lake Date: Thu, 29 Aug 2013 20:21:52 +0100 Subject: [PATCH 6/6] Add explanation about HTTPS --- docs/running.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/running.rst b/docs/running.rst index 66041ac..6c1d4c5 100644 --- a/docs/running.rst +++ b/docs/running.rst @@ -295,3 +295,15 @@ modification times intact, use ``cp -p``. For people who render from backups, GNU ``tar`` automatically handles modification times correctly. ``rsync -a --delete`` will handle this correctly as well. If you use some other tool, you'll have to figure out how to do this yourself. + +HTTPS support +------------- + +In order to support displaying maps over HTTPS, Overviewer loads the Google +maps API and JQuery over HTTPS. This avoids security warnings for HTTPS +sites, and is not expected to cause problems for users. + +If this change causes problems, take a look at the +:ref:`custom web assets` option. This allows you to +provide a custom index.html which loads the required Javascript libraries +over HTTP.