LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity
1,898 Commits 3 Branches 0 Tags
7ae83d014a939e1fc6e6f257fa3124397c57ac1c
Commit Graph

1898 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andrew Chin
4d95beefa0 Merge branch 'JSObserver' of https://github.com/tswsl1989/Minecraft-Overviewer into JSObserver 2012-04-18 19:20:24 -04:00
Thomas Lake
62322b452a Keep file open and flush changes 
Suggested by aheadley in IRC
 2012-04-18 22:04:19 +01:00
Thomas Lake
806e517e98 Fix tab/spaces in observer.py 2012-04-18 21:39:21 +01:00
Thomas Lake
c7fd50bd2d Add documentation for JSObserver 
Adds documentation for JSObserver and updates documentation for the
observer option in general
 2012-04-18 20:48:49 +01: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
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
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
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