0
Commit Graph

750 Commits

Author SHA1 Message Date
Thomas Lake
806e517e98 Fix tab/spaces in observer.py 2012-04-18 21:39:21 +01:00
Andrew Chin
27acb575f7 Allow filter functions to specify icons 2012-04-15 12:00:44 -04:00
Andrew Chin
d97c3547f9 Merge branch master into devel
Conflicts:
	docs/config.rst
	overviewer.py
	overviewer_core/settingsDefinition.py
	overviewer_core/tileset.py
2012-04-15 11:03:16 -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
Andrew Chin
d206a3aca4 Merge pull request #688
Merge branch 'devel' of git://github.com/contre/Minecraft-Overviewer into devel
2012-04-13 23:15:47 -04:00
Aaron Griffith
838bd2e5ab fixed Hide() primitive and made EdgeLines() play nice 2012-04-12 15:33:24 -04:00
Aaron Griffith
f5797dd8a0 added a Hide() render primitive 2012-04-12 15:16:19 -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
Richard Pastrick
4cbddf2f5a Merge remote branch 'upstream/devel' into devel 2012-04-11 14:53:09 -07:00
Aaron Griffith
db0a1d3415 updated isOverlay to correctly recognize modes with no Base() primitive 2012-04-09 17:10:05 -04:00
Aaron Griffith
88d0d838b9 Merge pull request #684 from overviewer/deref_fix
Deref fix
2012-04-09 14:01:13 -07:00
Richard Pastrick
ebd8b287ed Further glue for overlays. Make the validator actually validate. Also rough outlines for checking if
the render you've specified in the overlay actually exists and isn't itself.
2012-04-09 12:20:58 -07:00
Richard Pastrick
3ded0cfa9e Add validator and definition for beginnings of overlay python glue so that only the right overlays
show up for a specific render
2012-04-09 11:49:03 -07:00
Thomas Lake
ed01a3cf07 Minor tweaks for JSObserver 2012-04-09 00:23:15 +01:00
Thomas Lake
8ec3518eb2 Fix missing bracket in observer.py 2012-04-08 23:09:45 +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
56b91e67dc Merge branch 'showspawn' of git://github.com/tswsl1989/Minecraft-Overviewer 2012-04-08 11:56:06 -04:00
Thomas Lake
36aa6ed011 Add 'showspawn' render option
Allow users to hide the spawn marker that is normally generated for
overworld levels
2012-04-08 13:04:13 +01:00
Andrew Chin
cb448cc58f Added a --simple-output option
This option turns off fancy output options like colors or progress bars.

Address #649
2012-04-07 21:16:58 -04:00
Andrew Chin
d6602caa04 Output to stdout instead of stderr
Fixes #645
2012-04-07 20:19:24 -04:00
Andrew Chin
5aefebecbe Fix dereferencing bug, hopefully should address mineral-overlay crash
Should fix #633
2012-04-07 17:59:46 -04: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
Alejandro Aguilera
e96d168542 Fix leaves, mask out the decay bits. 2012-03-29 23:01:37 +02:00
Alejandro Aguilera
1a3f947858 Oops.. now there is jungle wood. 2012-03-29 22:51:36 +02:00
Aaron Griffith
82e77b7a6e Merge pull request #665 from peikk0/textures-fix
Find images in anim/ directory too.
2012-03-29 12:00:27 -07:00
Alejandro Aguilera
319544c52b Fix ladders. They were forgotten at some point. 2012-03-29 17:19:59 +02:00
aheadley
361d45b5e6 refactor eta widget 2012-03-28 16:55:28 -04:00
Andrew Brown
b2ce4fa7e5 Merge branch 'devel' 2012-03-27 14:58:50 -04:00
Andrew Brown
7a4a257b51 Added better error related log lines for corrupt chunks 2012-03-27 14:57:42 -04:00
aheadley
abfb1d6053 fix crash on terminal resize 2012-03-27 10:31:00 -04:00
aheadley
02b208973d Merge branch 'progress-observer' 2012-03-26 23:14:09 -04:00
aheadley
e34d35e4fd fix progress bar prompt clobbering 2012-03-26 23:13:33 -04:00
Andrew Chin
f39c9e2f80 Merge branch 'progress-observer' of git://github.com/aheadley/Minecraft-Overviewer into progress-observer 2012-03-26 22:28:28 -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
Pierre Guinoiseau
b0ee71a815 Find images in anim/ directory too, useful for MCPatcher images like custom_water_still.png 2012-03-26 19:12:45 +02:00
Alejandro Aguilera
9767bc6d5a Fix sandstone function name in textures.py. 2012-03-26 08:39:48 +02:00
Andrew Brown
d7608b0e65 Merge branch 'devel' 2012-03-23 23:19:40 -04:00
Andrew Brown
af805d4a4b Added soft-fail on region corruption to iterate_chunks() and get_chunk_mtime() 2012-03-23 23:19:03 -04:00
Aaron Griffith
dc1e3b662b fixed biome rotation for upper-right and lower-left 2012-03-23 14:08:03 -04:00
Aaron Griffith
5d94c85010 fixed rotations for upside-down stairs 2012-03-23 13:59:33 -04:00
aheadley
99f2cae7a8 fix configurable observer 2012-03-22 21:19:56 -04:00
Alejandro Aguilera
3a179f5df2 Add 1.2.4 new blocks: sandstone and wooden planks 2012-03-22 22:52:13 +01:00
aheadley
863c6b1154 make observer a setting, need to update docs 2012-03-22 17:32:28 -04:00
Aaron Griffith
682cefb902 changed _load_image to self.load_image in textures.py (thanks Nightgunner5) 2012-03-20 00:24:53 -03:00
aheadley
a7d6ee81bb make progress bar more like wgets 2012-03-18 19:46:54 -04:00