LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge branch 'master' of git://github.com/overviewer/Minecraft-Overviewer

Browse Source
This commit is contained in:
joe-mojo
2013-09-08 21:29:34 +02:00
parent 603e60bd0d ac4f8103ab
commit 76f4e2e2ba
5 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
overviewer_core/assetmanager.py
View File

@@ -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

4
overviewer_core/data/web_assets/index.html
View File

@@ -10,8 +10,8 @@
<link rel="stylesheet" href="overviewer.css" type="text/css" />
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script type="text/javascript" src="https://maps.google.com/maps/api/js?sensor=false"></script>
<script type="text/javascript" src="underscore.js"></script>
<script type="text/javascript" src="backbone.js"></script>