Commit Graph
100 Commits
Author SHA1 Message Date
Andrew Chin dc345ba75d Renamed the current nether to netherold, and made the new nether2 the default 2012-11-28 22:03:17 -05:00
Andrew Chin a92f368a0d Merge commit 'refs/pull/815/head' of github.com:overviewer/Minecraft-Overviewer into merge_815 2012-11-28 21:17:06 -05:00
Andrew Chin c5b1a3e2d4 Merge commit 'refs/pull/817/head' of github.com:overviewer/Minecraft-Overviewer into merge_817 2012-11-28 20:26:27 -05:00
Andrew Chin 7ce2e6d280 Typo 2012-11-26 22:10:36 -05:00
Andrew Chin fbf5a25c53 OSX Build clarifications 2012-11-26 22:06:02 -05:00
Andrew Chin 126192514f Don't error out when encountering an unknown RegionSet 2012-11-26 00:51:14 -05:00
Andrew Chin 02425b884a Merge commit 'refs/pull/821/head' of github.com:overviewer/Minecraft-Overviewer into merge_821 2012-11-09 16:22:38 -05:00
Andrew Chin be06aea260 Added direct link to the Windows Tutorial
THis is displayed when the user double-clicks overviewer.exe on Windows
2012-10-18 19:48:34 -04:00
Andrew Chin 4d0aa7e49e Removed overviewerConfig.CONST.image.compass. It was unused
Closes #694
2012-09-22 18:09:23 -04:00
Andrew Chin dd345980a5 Clarified docs on overlay option
Closes #789
2012-09-22 17:50:23 -04:00
Andrew Chin 14a3727bed Scrub parens from poi group names
Fixes #814
2012-09-21 08:28:15 -04:00
Andrew Chin 258bce39c2 Merge pull request #805 from CounterPillow/docfix
Added note about building on CentOS 6
2012-09-03 08:21:33 -07:00
Andrew Chin db6b162c69 Merge branch 'webassets' of git://github.com/tswsl1989/Minecraft-Overviewer into webassets 2012-08-29 19:54:04 -04:00
Andrew Chin e9e9543ba6 Added an example for the MineralOverlay docs
lists of tuples of tuples can be confusing for a non pythoner
2012-08-15 21:05:00 -04:00
Andrew Chin 5ff9c507b7 Improved traceback printing when parsing settings file 2012-08-04 23:27:44 -04:00
Andrew Chin 43d299ed92 Allow marker groups to be checked(displayed) by default
Fixes #730
2012-08-04 11:05:00 -04:00
Andrew Chin 68c2f3ee8a Corrected name of blocks option in Hide() docs
Fixes #779
2012-08-03 08:26:04 -04:00
Andrew Chin f4290df3e4 Merge branch 'master' of https://github.com/darkargon/Minecraft-Overviewer 2012-08-01 22:00:14 -04:00
Andrew Chin 25ff602c28 Merge branch 'master' of https://github.com/Jellyfrog/Minecraft-Overviewer 2012-08-01 21:58:13 -04:00
Andrew Chin 840e7e2193 Added chest images to textures folder
This is required if a user is using minecraft < 1.3
2012-08-01 13:17:33 -04:00
Andrew Chin a7d4e57593 Bump overviewer version 2012-08-01 09:53:26 -04:00
Andrew Chin e86084e0ca Merge remote branch 'origin/snapshot' 2012-08-01 09:52:53 -04:00
Andrew Chin 39f96909e9 Fix long int too large issue on windows
Use a long long instead of a long, which is 8-bytes on all platforms

Fixes #757
2012-07-28 22:41:22 -04:00
Andrew Chin cf50d5da46 POI cleanups, js/docs 2012-07-28 20:58:21 -04:00
Andrew Chin 8c9de7a575 Allow the poiTitle setting to be tileset-specific. Added docs
Closes #761
2012-07-28 20:53:03 -04:00
Andrew Chin 944de7bf2d Fix rotated regionset POI issue
Correctly handle POIs on two regionsets that have different rotations,
but share the same filterFunction(s)
2012-07-28 20:08:56 -04:00
Andrew Chin 68ed4066c3 Add RamsesA as a contributor 2012-07-20 22:29:40 -04:00
Andrew Chin 7a1f3acefc Bump c_overviewer version 2012-07-20 22:29:28 -04:00
Andrew Chin 59c706cf14 Merge remote branch 'origin/resize' 2012-07-20 22:22:44 -04:00
Andrew Chin b571761648 Merge branch 'devel' 2012-07-20 22:10:27 -04:00
Andrew Chin e147944b71 typo 2012-06-20 08:56:43 -04:00
Andrew Chin ed180d1f26 Added note about ignoring the 'Download at zip' button 2012-06-18 22:40:46 -04:00
Andrew Chin 1980c3aee1 Fixed type in Multiplexing Observer 2012-06-10 20:39:42 -04:00
Andrew Chin 03b10797c9 Merge branch 'JSObserver' of github.com:tswsl1989/Minecraft-Overviewer into JSObserver 2012-06-10 15:00:31 -04:00
Andrew Chin 5d43227edf Merge remote branch 'origin/master' into JSObserver 2012-06-10 14:59:17 -04:00
Andrew Chin 7f1ccdc156 Fix up pull request #726 2012-06-03 22:55:20 -04:00
Andrew Chin 4ae77a9f47 Force rebuild due to new texture stuff 2012-06-03 21:19:39 -04:00
Andrew Chin c1af0173e5 Merge branch 'signLabelWrapFix' of github.com:Morgyn/Minecraft-Overviewer 2012-06-03 21:18:03 -04:00
Andrew Chin 6737620a52 Merge remote branch 'origin/smooth-fix' 2012-06-03 21:16:37 -04:00
Andrew Chin 97c3f8f913 Merge remote branch 'origin/devel'
Conflicts:
	docs/config.rst
2012-06-03 21:15:12 -04:00
Andrew Chin 792fcbbc0d Provide better validation error message for markers
Helps clarify #734
2012-05-14 10:03:05 -04:00
Andrew Chin 0245c91e6d Fix genpoi on windows 2012-05-09 21:26:05 -04:00
Andrew Chin a456c2ae8a Fixed bug in find_true_spawn when spawnY is at a chunk border
Thanks to subz for pushing me to fix this!
2012-05-09 20:47:49 -04:00
Andrew Chin 06b6af5dbc Fix texturepath docs (minor) 2012-05-06 19:56:11 -04:00
Andrew Chin f185fd9ec1 Fix overlay issue where the overlay drop-down list would be empty 2012-05-06 12:54:40 -04: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
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 Chin 95a3af3af6 Merge pull request #704 from JonnyJD/contributors
fix contributor list sorting
2012-04-21 18:44:59 -07:00
Andrew Chin 4f6f831456 Updated contributors list 2012-04-19 20:02:34 -04:00
Andrew Chin 4d95beefa0 Merge branch 'JSObserver' of https://github.com/tswsl1989/Minecraft-Overviewer into JSObserver 2012-04-18 19:20:24 -04: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
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 Chin 56b91e67dc Merge branch 'showspawn' of git://github.com/tswsl1989/Minecraft-Overviewer 2012-04-08 11:56:06 -04: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
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
Andrew Chin 373291932f Merge branch 'signs' 2012-03-26 09:41:37 -04:00
Andrew Chin ec6e625361 Merge pull request #658 from logikal/master
Add more documentation for signs/POI, including genPOI.py usage.
2012-03-21 05:58:58 -07:00
Andrew Chin fbf1323ad7 Added --genpoi to overviewer.py 2012-03-19 20:03:54 -04:00
Andrew Chin 9b7226e91e Nether-only worlds have no spawn 2012-03-17 14:54:16 -04:00
Andrew Chin 03d3e852fc Backed out my level.dat reread code 2012-03-15 21:52:22 -04:00
Andrew Chin 34ca588ec2 Added missing import 2012-03-15 18:55:57 -04:00
Andrew Chin 662809cc22 Merge branch 'signs' into devel 2012-03-11 19:10:28 -04: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 bfeae91e78 New docs on signs/markers 2012-03-11 13:10:50 -04:00
Andrew Chin 6b77d54555 Reimplement signs/POIs 2012-03-11 11:44:38 -04:00
Andrew Chin 841fd3a9db Added missing import
Should fix #643
2012-03-11 10:29:24 -04:00
Andrew Chin 1f19610707 Better missing config file error messages
Fixes #635
2012-03-06 09:11:29 -05:00
Andrew Chin 59f17ef9e3 Merge pull request #634 from kissifrot/patch-1
(very) little typo fix
2012-03-05 05:44:56 -08:00
Andrew Chin 35eddb1342 Make sure biomes are also rotated 2012-03-04 12:23:01 -05:00
Andrew Chin bab1ed3c14 Added doc note about the nether rendermode 2012-03-02 19:53:20 -05:00
Andrew Chin 935d221886 Revert "Clean up build warnings on Windows"
This was causing segfaults, reason unknown

This reverts commit 868256b538.
2012-03-02 17:45:24 -05:00
Andrew Chin 868256b538 Clean up build warnings on Windows 2012-03-02 13:40:58 -05:00
Andrew Chin 20f9f92abd Clean up some build warnings
Removed some unused code, and quelled some warnings via GCC
2012-03-02 13:40:58 -05:00
Andrew Chin c019d7e8d8 use -Wdeclaration-after-statement
This makes gcc's behavior match MSVC's behavior, reducing the chances of
code not building on Windows
2012-03-02 13:40:57 -05:00
Andrew Chin 6b5c421c9e detect worlds in cwd, and print detected world paths 2012-03-01 22:37:07 -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 Chin 997ec58161 Only copy real js files (not silly editor swap files) 2012-02-25 15:57:29 -05:00