LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity
2,268 Commits 3 Branches 0 Tags
a8c71d089d2faffdbc8d615f0908ee26b5cc00cf
Commit Graph

2268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas F
a8c71d089d Fix mingw-w64 build 
On Windows with mingw-w64, Pillow includes windows.h, and thus
including Imaging.h would result in a name conflict of "TRANSPARENT",
which windows.h #defines but overviewer.h wants to use as enum.

For the record, this used to not be broken back when I initially
fixed Pillow for mingw-w64, so the change got somewhere introduced
between then and now.
 2015-08-15 23:50:40 +02:00
Andrew Chin
afc1c4f924 Don't call save_cache if running with --skip-players 2015-08-14 08:47:52 -04:00
Nicolas F.
ebc54a59ef Merge pull request #1240 from enaut/docfixesStructureOverlay 
Small documentation bug for StructureOverlay.
 2015-07-04 01:04:20 +02:00
Franz Dietrich
788d90bbf2 Small documentation bug for StructureOverlay. 
When adding documentation for the StructureOverlay I missed some
copy and paste error.

fixes #1229
 2015-07-03 15:10:54 +02:00
Andrew Chin
dec9aada01 Hopefully a better fix for the sdist problem. 
Removing trailing slashes from MANIFEST.in file.  Why is this needed?
No idea, i hate distutils
 2015-06-24 11:42:41 -04:00
Andrew Chin
253f78c8d1 Revert "Add c_overveiwer_includes to the list of source files" 
This reverts commit d6d488c3ea.

Because achin is a doofus
 2015-06-24 11:41:26 -04:00
Andrew Chin
d6d488c3ea Add c_overveiwer_includes to the list of source files 
This seems to be needed to make "sdist" include these headerfiles. i
have no idea how/if this worked in the past
 2015-06-24 11:30:31 -04:00
Andrew Chin
ddfd88aad7 Update signs.rst 
Added small note about how to look for the Markers button on a successful genpoi
 2015-06-05 22:07:02 -04:00
Nicolas F
0aef9b436c [webassets] Updated jQuery version 2015-05-04 14:59:18 +02:00
Aaron Griffith
77cdc6db48 Merge pull request #1221 from markfickett/master 
Fix for repeated iteration of filter-function generator in handleEntities, for #1220 .
 2015-03-18 23:53:18 -04:00
Mark Fickett
f839068f27 Convert filter generator to list before passing to handleEntities to fix repeated iteration. Fixes #1220 . 2015-03-18 23:33:54 -04:00
Aaron Griffith
4a9d808bb2 Merge pull request #1219 from MasterofJOKers/player_poi_fix 
[genPOI] Fix generation of multiple players
 2015-03-12 13:00:24 -04:00
Aaron Griffith
0c7441f93d equality != assignment... 2015-03-12 12:25:41 -04:00
Aaron Griffith
88de7b1567 get genpoi multiprocessing working on windows 2015-03-12 12:21:39 -04:00
MasterofJOKers
803d8d7933 [genPOI] sort list of imports 
Easier to see if an import is already there.
 2015-03-12 15:56:48 +01:00
MasterofJOKers
adcf105778 [genPOI] fix generation of multiple players 
The same problem as in bd8f3577 is also present for players. The filters
were given as iterator, but iterated through once per player.
 2015-03-12 15:54:48 +01:00
Aaron Griffith
cc3bee821c Merge pull request #1217 from MasterofJOKers/manual_poi_fix 
[genPOI] Fix generation manual POIs
 2015-03-10 12:33:10 -04:00
MasterofJOKers
5764183e00 [genPOI] remove unnecessary second import of json 2015-03-09 09:37:10 +01:00
MasterofJOKers
bd8f357787 [genPOI] pass filters as list to handleManualPOI 
It was accidently passed as an iterator, so it was only iterable once,
which lead to only the first manual poi being displayed.
 2015-03-09 09:34:44 +01:00
Aaron Griffith
4cd47da768 Merge pull request #1215 from CounterPillow/signtriage 
[genPOI] Work around JSON signs
 2015-03-08 12:57:48 -04:00
Nicolas F
b35f848855 [genPOI] Work around utter plebbery 2015-03-08 17:03:43 +01:00
Nicolas F
b5ecf8a7f4 [genPOI] Work around JSON signs 
lol Mojang
 2015-03-07 18:16:32 +01:00
Andrew Chin
e6f44aed26 Merge pull request #1135 from MasterofJOKers/my_genpoi 
addressing genPOI RAM usage
 2015-03-06 17:09:40 -05:00
Jamie Bliss
3cd2afb0c4 genPOI: don't ignore invalid polyline point 
There is no point in ignoring an invalid point, because without an error
message the user might wonder, why it's poyline doesn't look the way it
should.
 2015-02-23 21:39:03 +01:00
Jamie Bliss
7229fcc3df genPOI: use more pythonic ways ... 
One should use isinstance instead of `type(A) ==` because of
inheritance.
There should be an exception if a list of `elif`s don't match.
Make Polyline not only accept tuples, but any iterable.
 2015-02-23 21:39:03 +01:00
Jamie Bliss
b08e34b064 genPOI: add icon and createInfoWindow support for filters 
The defaults for "icon" and "createInfoWindow" are read from the POI,
but can be overridden by a filter function returning an appripriate
dict.
 2015-02-23 21:19:17 +01:00
Aaron Griffith
aad05b5ecf Merge pull request #1207 from tdierks/docs-import-change 
Docs import change
 2015-02-23 10:44:54 -05:00
Aaron Griffith
0422b0e711 Merge pull request #1211 from overviewer/ice-lighting 
fix lighting for flowing water and ice (issue #1205)
 2015-02-23 10:40:26 -05:00
Aaron Griffith
9ec0a75eaa fix lighting for flowing water and ice 
fix for issue #1205
 2015-02-23 10:27:08 -05:00
tdierks
ba89a6885a Merge pull request #1 from tdierks/tdierks-docs-import-change 
Explain importing for filter functions
 2015-02-11 00:42:25 -05:00
tdierks
fc150a7739 Explain importing for filter functions 
This code is correct, but doesn't work correctly with signs since they got JSON text formats in 14w25a. I will try to create another PR with an improved sign function tomorrow, but it's turning out to be complex, so for the moment, I'll stick with this tip on making imports work.
 2015-02-11 00:41:51 -05:00
Aaron Griffith
9a3d4aa2c2 Merge pull request #1206 from tdierks/patch-1 
Explain ordered nature of renders dict
 2015-02-10 20:48:13 -05:00
tdierks
0fdd6b70dd Explain ordered nature of renders dict 2015-02-10 20:45:43 -05:00
MasterofJOKers
4b9d0a5c87 Merge branch 'master' into my_genpoi 
Conflicts:
	overviewer_core/aux_files/genPOI.py
 2015-02-08 14:19:21 +01:00
Andrew Chin
d696df2a1f Don't crash if no renders/regionsets are found 2015-02-07 21:32:24 -05:00
Gizmokid2005
77c4d24660 Skip missing dimensions in genPOI 
This fixes overviewer/Minecraft-Overviewer #1202 for genPOI renders.
 2015-02-05 13:54:01 -05:00
Gizmokid2005
d3185734c4 Skip missing dimensions 
This fixes overviewer/Minecraft-Overviewer #1202 for renders
 2015-02-05 13:52:31 -05:00
Aaron Griffith
32fbc1dea2 nbt array lengths are unsigned (see issue #1190) 2015-02-02 04:59:43 -05:00
Aaron Griffith
9a119a2dce Merge remote-tracking branch 'kiskoza/master' 2015-02-01 12:46:22 -05:00
Aaron Griffith
7e771abfee Merge remote-tracking branch 'CounterPillow/expand-dong' 2015-02-01 12:39:42 -05:00
Aaron Griffith
4eacfa467f Merge remote-tracking branch 'CounterPillow/rcon-observer' 2015-02-01 12:22:34 -05:00
Aaron Griffith
bad4261cb5 Merge remote-tracking branch 'enaut/structure_overlay' 2015-02-01 12:15:56 -05:00
Andrew Chin
9336ff7954 Merge pull request #1199 from calebsander/master 
Added information about --skip-scan to the docs
 2015-01-29 10:51:39 -05:00
Caleb Sander
a998911d02 Added information about --skip-scan to the docs 2015-01-28 22:44:14 -05:00
Andrew Chin
97e5985933 Allow worlds with a version of zero (temp fix for #1194) 2015-01-03 11:56:51 -05:00
Koza
f1af25799e Fixed rendering regions. genPOI.py: add new line to baseMakers.js; views.js: add polygons, with all the features that Google provides, polylines work fine; regions.js: example of usage 2014-12-13 17:17:11 +01:00
Andrew Chin
f3af9555f0 Merge pull request #1163 from CounterPillow/optimizeimg-fixes 
Add jpegoptim interface to optimizeimages
 2014-11-25 02:17:14 -05:00
Andrew Chin
b1d0ab8179 Merge pull request #1171 from CounterPillow/warn-root 
Add warning if Overviewer is run as root
 2014-11-25 02:14:37 -05:00
Andrew Chin
d34378bc29 Merge pull request #1172 from tswsl1989/upstream 
Fix east side large mushroom rendering
 2014-11-25 02:14:13 -05:00
MasterofJOKers
9cbeffc721 Merge branch 'master' into my_genpoi 2014-10-30 12:47:55 +01:00