0
Commit Graph

124 Commits

Author SHA1 Message Date
Andrew Chin
27acb575f7 Allow filter functions to specify icons 2012-04-15 12:00:44 -04:00
Andrew Chin
5f1bf1851d Merge pull request #669
Merge branch 'player_marker' of https://github.com/JonnyJD/Minecraft-Overviewer into devel

Conflicts:
	genPOI.py
	overviewer_core/data/js_src/views.js
2012-04-14 22:46:25 -04:00
Andrew Chin
2a6769c5ac Revised syntax/method for specifying POIs 2012-04-14 22:09:12 -04:00
Andrew Chin
85e2ac202f Fix overlay code
so that overlays with no 'overlay' config are always displayed
2012-04-13 23:48:07 -04:00
Richard Pastrick
b13bbd0204 Add the JS stuff and a little bit more python glue to make overlays only display for a specified render 2012-04-12 08:59:13 -07:00
Thomas Lake
ed01a3cf07 Minor tweaks for JSObserver 2012-04-09 00:23:15 +01:00
Thomas Lake
55df1bcf78 Add new Javascript observer
Output render progress onto the rendered map using Javascript
A minimum period between updates can be specified
2012-04-08 23:03:26 +01:00
Andrew Chin
f4d43d544a Styling for the worldselector control 2012-04-07 17:56:30 -04:00
Andrew Chin
94b5f21d10 Have the world selector control have a correct default 2012-04-07 16:15:01 -04:00
Andrew Chin
6528aa91e7 Added overlay control to HTML 2012-04-07 15:03:06 -04:00
Johannes Dewender
122eaee37d add bed marker icon from faithful pack
Taken from the Faithful 32 texture pack:
http://www.minecraftforum.net/viewtopic.php?f=25&t=77442
2012-03-27 03:04:09 +02:00
Johannes Dewender
779b38f2a3 use avatars for player markers
Avatars are taken from scripts at overviewer.org

Do we need caching here?
2012-03-27 03:02:52 +02:00
Andrew Chin
729fcda964 Display a spawn marker 2012-03-11 17:59:29 -04:00
Andrew Chin
9d97ff4e37 Ensure sign checkboxes remain checked across tileset changes 2012-03-11 14:17:04 -04:00
Andrew Chin
a757be510a Work around IE issue.
This work around has the problem where the first tileset you view won't
have the 'signs' control
2012-03-11 13:48:54 -04:00
Andrew Chin
5b168ebdbd Removed console debugging output 2012-03-11 13:33:02 -04:00
Andrew Chin
aba0449477 Hide the 'Signs' control if the tileset has no signs 2012-03-11 13:30:49 -04:00
Andrew Chin
6b77d54555 Reimplement signs/POIs 2012-03-11 11:44:38 -04:00
Aaron Griffith
bcc1e61b0d data/textures is now checked *last*, updated biome colors 2012-03-01 16:46:23 -05:00
Aaron Griffith
8b28e42c8d Merge branch 'rewrite' into anvil
Conflicts:
	overviewer_core/src/overviewer.h
	overviewer_core/tileset.py
	overviewer_core/util.py
	overviewer_core/world.py
2012-02-26 19:39:58 -05:00
Andrew Brown
d1f13cadc5 Revert "Picks the right protocal based on what is being used. This fixes ssl errors on sites that use https."
Reason: breaks local viewing. Tries to access file://maps.google.com
etc.

This reverts commit da663dadb3.
2012-02-25 19:23:47 -05:00
Andrew Chin
abc1b4f8cb Merge branch 'oneworld' of git://github.com/duckman/Minecraft-Overviewer into rewrite 2012-02-25 18:22:59 -05:00
Andrew Brown
0b34c7f1c3 changed JS to properly compute coords for anvil format 2012-02-25 16:17:49 -05:00
Lucas Hereld
da663dadb3 Picks the right protocal based on what is being used. This fixes ssl errors on sites that use https. 2012-02-23 11:46:26 -08:00
Lucas Hereld
4654595238 if there is only one world, shouldnt show the world selector 2012-02-23 09:10:17 -08:00
Andrew Chin
c5c45363e3 Remove debug console logging from js
This caused problems on browsers that didn't know what to do with
the 'console' object (like IE, and older versions of Firefox)
2012-02-19 18:11:44 -05:00
redorkulated
6f0c2c467a Reading tile file ext from settings per tileset 2012-02-12 22:18:16 +00:00
Andrew Chin
90dfc2b4af More javascript improvments related to northdirection 2012-02-11 15:39:32 -05:00
Andrew Chin
eb9649e310 Readded url hash updating
as a "side-effect", the current coords remain centered when switching
tilesets.  at least in theory.  needs more work
2012-02-11 00:29:28 -05:00
Andrew Chin
2e3bf7330d The coords box now displays the correct coords for every rotation 2012-02-10 21:55:28 -05:00
Andrew Chin
b7d2733f0c The compass now changes direction to make the tileset 2012-02-10 20:44:11 -05:00
Andrew Chin
19fcee24f7 Split up overviewer.js into several files 2012-02-08 21:07:53 -05:00
Aaron Griffith
ce214c19bc added color tables from biome extractor
Now, the textures loader doesn't have to know about the world path;
this works better in a multi-world environment.
2012-02-08 13:59:43 -05:00
Aaron Griffith
302e1d592a Merge branch 'master' into rewrite 2012-02-06 21:41:11 -05:00
Andrew Chin
728351f9a3 Display the coord box on index.html 2012-01-16 19:50:50 -05:00
Alejandro Aguilera
2339cc54b8 Revert textures optimization. At least, in the case of water it messed up water transparency.
It would be a good idea to check transparency for all the other optimized pngs.
2012-01-16 13:34:39 +01:00
Andrew Chin
514e99dcd2 overviewer.js now uses backbone.js for much of it's multiworld handling 2012-01-14 23:33:34 -05:00
Carter Charbonneau
2003267f35 optimize the images used in the UI an otherwise bundled 2012-01-11 22:35:01 -07:00
Andrew Chin
9f6a4ee698 More updates to overviewer.js 2012-01-08 15:12:40 -05:00
Andrew Chin
4255b26fc7 Fixed some crashes in assetManager
Copy in the rest of the web assets
2012-01-07 23:56:08 -05:00
Andrew Chin
25db39463f The AssetManager will now create a kinda working html output 2012-01-07 23:04:42 -05:00
Aaron Griffith
d0032ac9ff Merge remote-tracking branch 'ion1/master' 2011-12-30 13:22:54 -05:00
Andrew Brown
e5fed90d04 fixed up comments in googlemap.py, moved region.js to web_assets 2011-12-17 21:49:08 -05:00
Aaron Griffith
6fb96ca8ab fixed crash when strftime returns non-ascii characters
also generally better unicode handling on web_assets (all files are UTF-8)
2011-12-16 19:48:46 -05:00
Johan Kiviniemi
abf643e3ae Switch to autoupdated cacheTag from constant cacheMinutes 2011-12-13 19:24:41 +02:00
Alex Headley
350cc70749 add proper title to generated html 2011-12-07 11:17:39 -05:00
Aaron Griffith
92b8cd33ed Merge branch 'master' into smooth-lighting 2011-10-28 13:07:01 -04:00
Andrew Chin
02c30c6f8e Update URL hash on double-click 2011-10-26 23:06:52 -04:00
Aaron Griffith
4fb0dac3fd the position anchor tag now uses rendermode name, not label 2011-10-26 17:08:35 -04:00
Zach McCullough
d77673f406 Fixed the tabbing in overviewerConfig.js 2011-10-24 19:16:03 -05:00