0
Commit Graph

1634 Commits

Author SHA1 Message Date
Thomas Lake
b0dbad4d70 Fix tab/spacing issues in previous commit 2012-04-15 19:19:30 +01:00
Thomas Lake
24f360882d Improve support for player POIs on single player worlds 2012-04-15 19:03:24 +01:00
Andrew Chin
27acb575f7 Allow filter functions to specify icons 2012-04-15 12:00:44 -04:00
Andrew Chin
07bdf2aa93 Handle spaces in filter names 2012-04-15 11:12:16 -04:00
Andrew Chin
5dbd83fc7e Merge pull request #698
Merge branch 'upstream' of https://github.com/tswsl1989/Minecraft-Overviewer into devel
2012-04-15 11:04:12 -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
Thomas Lake
44042c3d75 Update usage information for genPOI
Usage text update to include --quiet and reflect whether script is
called independently or via the --genpoi flag for overviewer.py
2012-04-15 14:23:48 +01:00
Andrew Chin
c583a94d7d Update JonnyJD's pullrequest to work with the new POI codes
Also:
only parse players in a regionset once
ignore corrupt player.dat files
2012-04-14 23:36:52 -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
Andrew Chin
9a8aa6865a Merge pull request #689
Merge branch 'patch-1' of git://github.com/stoneLeaf/Minecraft-Overviewer
2012-04-13 22:39:07 -04:00
Andrew Brown
477d24436f Merge pull request #695 from contre/master
Make built in rendermodes show up in Table of Contents
2012-04-13 10:03:08 -07:00
Andrew Brown
aa5c76a1f3 Merge pull request #690 from CounterPillow/optimizeimg-doc
Added documentation about optimizeimg
2012-04-13 10:02:36 -07:00
Richard Pastrick
b7f4cc3fc9 Make the built in rendermodes show up on the docs table of contents 2012-04-13 09:55:30 -07: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
805618dd2f remove todo since I did that part 2012-04-12 09:03:14 -07: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
stoneLeaf
b9217e28c8 Improved the 'A dynamic config file' doc section. 2012-04-11 00:42:43 +03:00
CounterPillow
4e7c837928 Added documentation about optimizeimg. 2012-04-10 21:30:26 +02:00
stoneLeaf
e2b24a7a0f Added a new section entitled 'A dynamic config file'.
It explains the use of environment variables in the config file to dynamically retrieve parameters.
2012-04-10 18:07:44 +03: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
77acd158c6 Add docs too! 2012-04-09 12:26:40 -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
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
7433f06edb Remove unneeded stuffs 2012-04-07 22:12:10 -04: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
59c68646a9 Merge pull request #670 from JonnyJD/playerInspect
more detailed player inspect + list multiple
2012-03-29 12:05:21 -07:00
Aaron Griffith
be1cee48cf Merge pull request #653 from kappa7194/master
Missing quotation mark in signs configuration file example.
2012-03-29 12:03:04 -07: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