0
Commit Graph

2444 Commits

Author SHA1 Message Date
Andrew Chin
753191f68e Merge #1311 into master 2018-05-06 13:47:17 -04:00
Nicolas F
12c12d128f Set the attribution prefix 2018-05-06 17:44:07 +02:00
Nicolas F
05cc9e60e7 Don't collapse marker group control 2018-05-06 17:12:03 +02:00
Nicolas F
23ea1918ea Update leaflet to 1.3.1 2018-05-06 17:11:46 +02:00
Nicolas F
ea33ebe2fb Assume 32x32 marker size so they get centred
Maybe expose this as an option to the markers dict later, with
the anchor as an option too.
2018-05-06 16:59:27 +02:00
Nicolas F
614663f601 Show marker group display names 2018-05-06 16:53:32 +02:00
Aaron Griffith
db8de320f4 Merge pull request #1438 from rymate1234/master
Throw an error if the overviewer is running on a world saved on verisons of Minecraft newer than snapshot 17w47a
2018-05-01 10:45:55 -04:00
Andrew Chin
139e22f2f8 I don't make typos, no sir I don't 2018-04-21 15:36:48 -04:00
Andrew Chin
c621795fa9 Rename package to pkg in gitlab ci steps
This just reduces size of the step names, making it easier to see on the
gitlab web page
2018-04-21 15:31:46 -04:00
Andrew Chin
78390c6936 Updated to new gitlab registry URL 2018-04-21 15:31:33 -04:00
Andrew Chin
f28c4ce680 Add testrepo step for ubuntu:artful 2018-04-21 15:31:22 -04:00
Andrew Chin
44b525e709 During windows CI builds, use a specific Pillow
This is because we build against a fixed PIL_INCLUDE_DIR whos version
needs to match the python version we install

Note: CI builds for windows use a hard-coded path for PIL.  I manually
updated this to version 5.1.0

TODO@achin: automatically download the right version of pillow src
2018-04-21 15:27:05 -04:00
rymate1234
c6922386a5 Use sys.exit(1) to exit rather than throwing a ValueError 2018-03-12 23:47:50 +00:00
rymate1234
80cc71325e Throw an error if the overviewer is running on a world saved on versions of Minecraft newer than snapshot 17w47a 2018-03-12 23:43:07 +00:00
Andrew Chin
cd11ea31a9 Fix gitlab CI 2018-02-28 14:02:44 -05:00
Nicolas F
cff0dcc187 Merge pull request #1431 from kevinwchang/travis-fix
Update Travis config
2018-02-23 04:47:26 +01:00
Kevin Chang
25ab4c13ba travis: additionally fetch ImagingUtils.h 2018-02-22 17:04:52 -08:00
Kevin Chang
86f845ca9d update Pillow header URLs in .travis.yml 2018-02-22 17:01:59 -08:00
Nicolas F
e847adaa20 Merge pull request #1430 from kevinwchang/no-rgba-jpeg
Convert RGBA to RGB before saving as JPEG
2018-02-23 01:49:49 +01:00
Kevin Chang
e996bd1e47 fix pillow no longer allowing RGBA JPEG 2018-02-22 15:38:29 -08:00
Aaron Griffith
22b9ab3f63 Merge many branches into master.
Branches:
 * mioux/sensor-false #1359
 * bobfrankly/Terracotta_Texture_Fix #1408
 * bobfrankly/Documentation #1407
 * lyknode/fix-slime-algo #1400
 * 3decibels/uuidcache_expire #1359
2017-08-24 18:22:35 -04:00
Sylvain Rumeu
9cf068973d Removing deprecated option in index.html : ?sensor=false 2017-08-24 18:19:58 -04:00
BobFrankly
16d8845eb6 Terracotta texture rotation fix
Terracotta blocks have differing rotations on each side, necessitating different handling for each directional map render. This fix was aligned against "Light Grey Glazed Terracotta", I'm presuming the rest of the colors follow.
2017-08-24 06:51:46 -07:00
BobFrankly
2c2d1034ed Modernize Windows build instructions
Updates to the Windows build instructions, terminology pulled from the current "Visual Studio Community 2017" version, which is the free version of VS at this time. I wrote these as a first timer building Overviewer. I also moved all of the pre-requisites to a bulleted list under a single header.
2017-08-23 19:26:28 -07:00
lyknode
d36414b1bf Fix slime algo by using integer for chunk coordinates. 2017-07-16 11:48:52 +02:00
Nicolas F
39d588ae45 docs: various small updates to build instructions
* python26 to python27
* PIL to Pillow
* Requirement on having python2, numpy and pillow for the MSVC build
* Mention -dev package for Pillow/PIL
2017-06-19 22:55:55 +02:00
Nicolas F
21b9e0aa13 docs: Clarify Ubuntu/Debian install instructions
We use HTTPS these days and mentioning python2.6 in 2017 is very
triggering to me.
2017-06-13 16:11:10 +02:00
Nicolas F
6043ae958e Merge pull request #1386 from Monkey0x9/patch-1
Change forgotten 1.11 to 1.12
2017-06-11 16:56:53 +02:00
Monkey0x9
964eec8ff5 Update minecraft version in gitlay-ci.yml to 1.12 2017-06-11 14:34:22 +02:00
Monkey0x9
e8bb3967f7 Change forgotten 1.11 to 1.12 in documentation 2017-06-11 13:59:14 +02:00
Nicolas F
f7973410ea travis: Update MC version 2017-06-09 18:12:05 +02:00
Nicolas F
4b75f7fa63 Merge branch 'snapshot' 2017-06-09 18:08:38 +02:00
Nicolas F
711488e07d textures.py: Fix beds for 1.12
Bed textures are now one unified texture, so some cropping and
fiddling needs to be done.

Bed colours not yet implemented.
2017-06-09 18:06:29 +02:00
Nicolas F
461f8647e0 Update strings to 1.12 2017-06-09 16:28:49 +02:00
3decibels
e5b90fd512 Added expiration of uuidcache entries
Entries in the uuidcache will now be considered expired if they were
retrieved before the mtime of the player dat file. This follows the
recommendation made in issue #1279.
2017-06-05 18:29:43 +00:00
Nicolas F
412c8231b7 docs: add a section about how to contribute
This adds a work-in-progress section with a few tips and tricks
about how one should go about contributing to the project. It mostly
focuses on making people familiar with some of the code, and giving
them a few tips along the way on how to work with Git.

A few more contribution examples should be added, and what most
notably is lacking right now is a section about the web output
part. This is due to us currently rewriting it in Leaflet, so any
examples added now would quickly become outdated.
2017-04-18 15:30:51 +02:00
Nicolas F
a183553ba5 setup.py: remove workaround for CentOS 5
More like ScentOS because it stinks LOLOLOLOLO
2017-04-10 12:22:05 +02:00
Nicolas F
e07e588e59 readme: add API key note, small fixes
We previously stated that a Google Maps API key is not required.
However, this is not true (anymore). I'm still wary of adding
it to the documentation since my hopes is that in the time it would
take me to add this to the docs I could just finish leaflet, but this
is the least we can do to clear up any confusion.

Also switched some URLs to use HTTPS, which closes #1314.

Lastly, fixed a warning about a not long enough title line.
2017-04-10 12:18:14 +02:00
Nicolas F
dd96d95b66 settingsValidators: clean up checkBadEscapes
A side-effect of these changes is that \a no longer gets shown as
'\a', but '\0x07'. Some characters, i.e. \n and \t, are still shown
as '\n' and '\t' respectively, so this comes simply down to repr()
behaviour.

However, I do believe it's worth it to get rid of that ugly code
duplication.
2017-03-24 18:29:15 +01:00
Nicolas F
8cf47935e4 Remove unused imports 2017-03-24 17:57:37 +01:00
Nicolas F
b7837a9656 docs: update copyright year to 2017 2017-03-24 15:29:22 +01:00
Nicolas F
52afa7f8d2 docs: optimise PNGs
I used zopflipng with 100 iterations on most of them, and advpng
with 300 iterations in zopfli mode on front_page_screenshot.png
2017-03-24 15:26:32 +01:00
Nicolas F
57a1000f4c docs: fix two warnings during docs building
sphinx does not enjoy duplicate link names, and unless your label
is pointing to a header, it needs an explicit name when referenced
too.
2017-03-24 14:53:07 +01:00
Nicolas F
032b8831f9 docs: fix code block in signs.rst 2017-03-24 14:42:16 +01:00
Nicolas F
ba5a4bbaed docs: add link to Twitter account to index.rst 2017-03-24 14:40:54 +01:00
Nicolas F
f9148b7e2e docs: Change some http:// URLs to https:// 2017-03-24 14:35:05 +01:00
Nicolas F
d11c9b5aa2 docs: remove remaining references to CentOS 5 2017-03-24 14:30:22 +01:00
Andrew Chin
63df797681 Copy el6 rpms into a better home 2017-03-22 19:09:21 -04:00
Nicolas F
b393489ea9 docs: remove CentOS 5 build instructions
It's EOL in a few days and the instructions only add confusion.
Anyone still using CentOS 5 has bigger issues than not having
documentation on how to build Minecraft-Overviewer.
2017-03-17 17:09:35 +01:00
Andrew Chin
275f619b72 Re-enable render CI job in master branch 2017-03-17 11:58:39 -04:00