0
Commit Graph

2246 Commits

Author SHA1 Message Date
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
MasterofJOKers
9d1eb35643 Merge branch 'master' into my_genpoi
This just updates the code to the current master, so it can be merged
easily.

Conflicts:
	overviewer_core/aux_files/genPOI.py
2014-10-28 22:15:58 +01:00
Andrew Chin
dcbf5ac63f Merge pull request #1174 from CounterPillow/playerspawn-uuid
genPOI: Resolve UUIDs for player spawns too
2014-10-24 11:55:29 -04:00
Nicolas F
dfe6f08ee9 genPOI: Resolve UUIDs for player spawns too 2014-10-24 13:57:06 +02:00
Thomas Lake
904e5abd8e Fix east side large mushroom rendering 2014-10-20 11:19:31 +01:00
Nicolas F
3c3db5d909 Add warning if Overviewer is run as root 2014-10-18 17:44:59 +02:00
Nicolas F
c0d4fc9bc2 Add rollbacks to tile re-arrangements
Previously, any kind of interruption during tile re-arrangements
would leave the tileset in a half re-arranged state.

This commit makes _increase_depth roll back possible changes it did
during the re-arrangement prior to it being interrupted.

Fixes issue #1166.
2014-10-14 14:21:26 +02:00
Nicolas F
79e60972e9 optimizeimages: Add documentation for jpegoptim 2014-10-10 21:10:07 +02:00
Nicolas F
3a0f334970 optimizeimages: Add jpegoptim interface
Only options that appear to be interesting for us have been exposed,
namely -m and -S.
2014-10-10 20:54:47 +02:00
Nicolas F
16edd622a2 Add documentation for RConObserver 2014-10-06 21:52:21 +02:00
Nicolas F
c6830a35db Added RCon Observer
It does the rcons! And the observings!
2014-10-06 21:40:09 +02:00
Andrew Chin
00c2782bf5 Merge pull request #1151 from computertechie/fence_gates
Add support for the new fence gates
2014-09-03 20:26:03 -04:00
Franz Dietrich
086820ac72 Adding StructureOverlay an overlay to color the map according to structures.
A usecase to demonstrate a possible application of the extended functionality:

**"Rails Overlay that draws only the rails that are on Cobblestone for a subway map."**

With this patch it is very easy to achive that:

```python
MineralOverlay(minerals=[(((0, 0, 0, 66), (0, -1, 0, 4)), (255, 0, 0, 255)),
                         (((0, 0, 0, 27), (0, -1, 0, 4)), (0, 255, 0, 255))])
```

In this case the overlay will be red for rails on cobblestone and green for powerrails on cobblestone.
The syntax is `(<tuple of conditions>, <target color>)`
 * where `<target color>` is a 4 tuple with a `(r, g, b, a)` color
 * and `<tuple of conditions>` is a tuple with an arbitrary number of conditions with the following syntax:
`((relx, rely, relz, blkid), ...)` where the `rel<>` parameters specify the relative coordinates to the block that is checked if it matches bklid.

In the example the fist tuple `(0,0,0,66)` checks if at the current position is a
rail while `(0,-1,0,4)` checks if at one below the current position is a cobblestone.
If both are true then the color `(255, 0, 0, 255)` is used.

A Sample Config file exploiting the capabilities:

``` python
worlds['My World'] = "~/.minecraft/saves/test/"
outputdir = "/tmp/test_render"
rendermode = "lighting"

renders["render1"] = {
    'world': 'My World',
    'title': 'A regular render',
}
renders["render_overlay_dafault_rails"] = {
    'world': 'My World',
    'title': 'Default Rails',
    'rendermode': [ClearBase(), StructureOverlay()],
    'overlay': ['render1'],
}
renders["render_overlay_cust_rails"] = {
    'world': 'My World',
    'title': 'Custom Rails',
    #relative coordinates [[(relx, rely, relz, mineral)], (red, green, blue, alpha)]
    'rendermode': [ClearBase(), StructureOverlay(structures=[(((0, 0, 0, 66), (0, -1, 0, 4)), (255, 0, 0, 255)),
                                                            (((0, 0, 0, 27), (0, -1, 0, 4)), (0, 255, 0, 255))])],
    'overlay': ['render1'],
}
```

The "Default Rails" overlay uses default coloring of the structures overlay. "Custom Rails" uses some custom coloring.

fixes overviewer/Minecraft-Overviewer#556 and fixes overviewer/Minecraft-Overviewer#787
2014-09-03 12:05:11 +02:00
Ean McLaughlin
97350e81e3 Missing colon from else statement. 2014-09-03 02:10:50 -06:00
Ean McLaughlin
8f909f99de Added missing comma in function call for fence gate material definition. 2014-09-03 02:06:51 -06:00
Ean McLaughlin
f5b610e81c Update C extension version number. 2014-09-03 01:50:49 -06:00
Ean McLaughlin
893ca07419 Might as well slip a tiny bit of clean up in. 2014-09-03 01:45:29 -06:00
Ean McLaughlin
a3b7ac12b8 Added definitions for the new fence gates. Hopefully I got the C side right. Close #1148 2014-09-03 01:36:44 -06:00
Andrew Chin
af47000079 Lighting fixes for red sandstone stairs and slabs
Closes #1150
Closes #1149
2014-09-02 22:23:33 -04:00
Ean McLaughlin
5f8d5ca7bc Forgot texture file extensions in a couple places. 2014-09-02 20:56:07 -04:00
Ean McLaughlin
ed09c5c965 Added definitions and support for all the various red sandstone blocks. 2014-09-02 20:55:57 -04:00
Andrew Chin
fd468f4cf3 Forgot to bump version for travis 2014-09-02 10:56:09 -04:00
Andrew Chin
5d13030834 Bump versions and docs for 1.8 support! 2014-09-02 10:54:13 -04:00