0
Commit Graph

1670 Commits

Author SHA1 Message Date
Aaron Griffith
7ef5f8c5e3 Merge remote-tracking branch 'fabiann/remote-tiles' into devel 2012-05-06 12:52:42 -04:00
Aaron Griffith
08b0ed17e6 Merge remote-tracking branch 'interfect/master' into devel 2012-05-06 12:52:24 -04:00
Andrew Brown
eeb09f3d45 Fixed preform->perform typo THANKS m_pan! 2012-05-03 18:41:09 -03:00
Andrew Chin
d7b3054c42 Allow zero as a valid rerenderprob 2012-05-03 00:03:08 -04:00
Andrew Chin
da30592a45 Include the genpoi script in the .deb packages
You should now be able to run overviewer.py --genpoi without error
2012-05-02 21:09:45 -04:00
Andrew Chin
af8aa13615 Fix typo in previous commit 2012-05-02 20:19:02 -04:00
Richard Pastrick
5974919973 Make the rerenderprob value print a decent error since it does have to be between 0.0 and 1.0 instead of just
that it is a float.

Remove 0.0 and 1.0 as valid values
2012-05-02 16:31:30 -07:00
Fabian Norman
9caa94eacf Merge branch 'remote-tiles' of git:Minecraft-Overviewer into remote-tiles 2012-05-02 01:12:46 -07:00
Fabian Norman
8ffcec347a Merge remote branch 'source/master' into remote-tiles
Conflicts:
	overviewer.py
2012-05-02 01:04:13 -07:00
Fabian Norman
e69717f476 Prevent null being set in overviewerConfig.js 2012-05-02 00:43:53 -07:00
Andrew Chin
6331200763 More POI docs 2012-05-01 21:40:53 -04:00
Andrew Chin
216b26cbf2 hide traceback on config validation failure
a fully traceback is needlessly scary.  use --verbose to see the
traceback.
2012-05-01 20:38:14 -04:00
Andrew Chin
9508573783 Added hint about checking the docs on a bad markers validation 2012-05-01 20:31:50 -04:00
Andrew Chin
ad1dacbdc9 Merge branch 'devel' 2012-05-01 20:28:25 -04:00
Andrew Brown
21ef0f4ad7 Merge pull request #712 from CounterPillow/swampfix
Added a special case for the swamp biome.
2012-04-28 17:49:38 -07:00
CounterPillow
c5af1c81fc Added a special case for the swamp biome.
Addresses issue #708.
2012-04-29 02:26:14 +02:00
Michael Writhe
fc565aa829 Merge pull request #710 from contre/devel
Fix centering of maps on first load
2012-04-27 13:43:52 -07:00
Richard Pastrick
2ecb5dc914 Forgot quotes 2012-04-27 09:22:41 -07:00
Richard Pastrick
27c644d4ea Fix centering of the maps to the spawn point on first load 2012-04-27 09:19:31 -07:00
Fabian Norman
4fe87de247 Updated docs. 2012-04-25 23:42:19 -07:00
Fabian Norman
d25f582404 Base setting, one more change (last?) 2012-04-25 19:56:48 -07:00
Fabian Norman
85567cae42 Initial changes to add the base option to the config file. 2012-04-25 19:42:18 -07:00
Adam Novak
1f29ff5fa1 Fixed contributors ordering. 2012-04-25 13:04:46 -07:00
Adam Novak
164fd02b3b Merge github.com:interfect/Minecraft-Overviewer 2012-04-25 00:03:24 -07:00
Adam Novak
e0c4137eb4 Checking for missing data on all sides. 2012-04-25 00:02:20 -07:00
Adam Novak
915aa1a653 Inverting sense of no-fluids to be correct. 2012-04-24 20:40:39 -07:00
Adam Novak
b1e4b09ab6 Removing unused struct. 2012-04-24 20:35:00 -07:00
Adam Novak
9df1446276 Added a NoFluids render mode primitive, and documented it. 2012-04-24 20:29:27 -07:00
Adam Novak
5184c8d321 Added and documented the "exposed" render mode primitive. 2012-04-24 17:04:51 -07:00
Andrew Chin
95a3af3af6 Merge pull request #704 from JonnyJD/contributors
fix contributor list sorting
2012-04-21 18:44:59 -07:00
Johannes Dewender
f6dcfea6fe fix contributor list sorting
Two things were off:

 1. sorting should be case-insensitive, in both places
 2. multiple entries can be added just before the same line
2012-04-20 11:53:59 +02:00
Andrew Chin
4f6f831456 Updated contributors list 2012-04-19 20:02:34 -04:00
Johannes Dewender
3f93dc4b6d handle all types of aliases for the contributor list
If a contributor email is already in the list we won't create a new
entry. However, if the name is different than in the list, we print a
message if an alias is missing in .mailmap

If an email is not in the list, but the name is in the list this could
mean two things:

 1. Two different persons have the same name.
    This is possible, but less likely than 2.
 2. A contributor used another mail.
    This is likely the case and we don't make a new entry,
    but print a message.
2012-04-19 17:33:48 +02:00
Johannes Dewender
1a26af6ebb script to update contributor list automatically
The script merges new contributors in the short-term
contributor list in CONTRIBUTORS.rst
2012-04-19 03:04:29 +02:00
Johannes Dewender
d573631e11 add script to check for new contributors to list
Use git shortlog to create a list of contributors
that are not yet included in CONTRIBUTORS.rst

The email address is taken as definitive.
People with the same name, but different email addresses
are supported.
Aliases, different email addresses for the same person,
are handled by git with .mailmap
2012-04-19 01:44:15 +02:00
Richard Pastrick
419daa3881 Update Contributors list 2012-04-17 16:15:55 -07:00
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