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

362 Commits

Author SHA1 Message Date
Andrew Chin
6eacb3ecc7 Merge branch 'master' into snapshot 2014-05-10 19:44:33 -04:00
Aaron Griffith
95de300276 fix jar caching forcing default textures (caused by 183da128) 2014-05-10 18:45:58 -04:00
Andrew Chin
a6922e4ab7 New snapshot block: slime blocks 
See #1062
 2014-03-08 13:09:15 -05:00
Andrew Chin
5be1d62e15 New blocks for snapshot 
Granite, Diorite, Andesite (new data values for blockid:1)
Iron trapdoor

See #1062
 2014-03-08 13:02:01 -05:00
Andrew Chin
7723e3df06 Added debug printout in the texture finding code 2013-12-27 00:19:26 -05:00
Aaron Griffith
df732bfa25 Revert "Merge remote-tracking branch 'exhuma/master', PR #963" 
This reverts commit e26727943f, reversing
changes made to 7bbb077704.
 2013-12-02 07:40:00 -05:00
Aaron Griffith
a8a2a191b8 Revert "used LOG instead of logging on a few stragglers" 
This reverts commit 144cff18e3.
 2013-12-02 07:35:10 -05:00
Aaron Griffith
144cff18e3 used LOG instead of logging on a few stragglers 2013-12-01 16:39:45 -05:00
Aaron Griffith
e26727943f Merge remote-tracking branch 'exhuma/master', PR #963 
Conflicts:
	overviewer.py
	overviewer_core/aux_files/genPOI.py
	overviewer_core/textures.py
 2013-12-01 16:35:28 -05:00
Aaron Griffith
606d794948 Merge remote-tracking branch 'joe-mojo/master', PR #974, Issue #973 2013-12-01 16:29:07 -05:00
CounterPillow
76bab40aa2 Possibly fixed crash when HOME is undefined 
When HOME was undefined on Linux, the code would try calling
os.listdir(None) which will obviously fail.

This is a workaround. A proper fix would be to rewrite the
code to check for each operating system, not a combination
of operating systems, environment variables and the current
air humidity in London.
 2013-11-16 15:07:51 +01:00
Andrew Chin
cbd76d87a0 Fix leave data masking 2013-11-03 14:30:21 -05:00
Andrew Chin
5a320fb89a fix data range on wooden planks 2013-11-03 14:24:30 -05:00
Nicolas Frattaroli
2346c26f37 Added dark wood and acacia wood blocks 
Includes stairs, slabs, planks and saplings.
 2013-11-02 15:12:44 +01:00
Andrew Chin
85f1112813 Overviewer now require 1.7 textures or newer 2013-10-30 20:57:37 -04:00
Andrew Chin
5f633b8138 Fix rendering of large portals 
Fixes issue #1009
 2013-10-27 21:29:26 -04:00
Andrew Chin
63311fbd92 Fix missing dark-oak leaves 2013-10-26 14:18:17 -04:00
Andrew Chin
0306a7040d Fix a oops with water 2013-10-26 02:02:18 -04:00
Andrew Chin
46bda131f9 Add stained glass and stained glass panels 
Note that this commit changes the pseudo-ancil-data type from unsigned
int to an unsigned short.  Our pseudoancil code creates 5 bits of data
to store adjacency information for glass.  Glass also has 4 bits for
color info.  This means we need a total of 9 bits to render these (thus
int --> short)
 2013-10-26 01:47:07 -04:00
Andrew Chin
3eaa507d95 Add Acacia/DarkOak wood 2013-10-26 00:08:29 -04:00
Andrew Chin
63e9226415 Merge branch 'snapshot' 
Conflicts:
	overviewer_core/src/iterate.c
 2013-10-25 23:35:22 -04:00
joe-mojo
b2e0d6da28 trying to fix Travis build about chest texture not found. When normal.png from texture pack not found, fall back to chest.png 2013-10-14 00:49:24 +02:00
joe-mojo
026a2722da Removed dev logs 2013-10-14 00:22:58 +02:00
joe-mojo
f28d639298 removed logs 2013-10-14 00:15:55 +02:00
joe-mojo
37a45499a5 Tried a fix for normal.png being not found on Travis + added logs 2013-10-13 21:10:21 +02:00
Andrew Chin
57a7be9e2a Merge PR #996 
Conflicts:
	overviewer_core/textures.py
 2013-10-03 18:43:31 -04:00
Dan Berglund
08b6d40d63 fix double_plant image names 2013-09-30 14:00:41 -07:00
Dan Berglund
942b0098e2 add red sand. move packed ice so blockIds are in order 2013-09-26 16:16:34 -07:00
Andrew Chin
189c686692 Merge Pull Request #986 2013-09-17 19:53:24 -04:00
Andrew Chin
1a587e783b Merge Pull Request #987 2013-09-17 19:28:37 -04:00
Jer Wilson
c86698650d Refactored stairs rendering to support corners 2013-09-16 00:31:39 -07:00
Dan Berglund
4e70751e61 add packed ice block for 13w36 2013-09-13 17:00:57 -07:00
Dan Berglund
95336ce205 Add new grassless dirt and podzol block types for 13w36 2013-09-13 14:27:33 -07:00
Jer Wilson
3050f4099e Adding blocks for new flowers and doublePlants 2013-09-13 14:25:24 -07:00
joe-mojo
603e60bd0d Fixed the way texture.py searched for foliage, grass and chests textures. 
This is a "quick-and-dirty fix", you may improve it as I'm novice in Python.
Default files in data/textures have been renamed to reflect changes in new 1.6 texture packs (aka resource packs)
 2013-08-27 23:20:12 +02:00
Andrew Chin
77ccf46be8 more better fix for HOME being set on windows 2013-08-11 20:03:01 -04:00
Andrew Chin
183da128b8 More agressive texture cache 
Especially with regard to jarfile loading
 2013-08-03 12:59:13 -04:00
Michel Albert
4112b5a72e Using a dedicated logger inside overviewer_core. 2013-07-28 15:04:51 +02:00
Lucas Hereld
a851fb429a Fix more cobblestone textures 
Also a comment typo and the base of a lever texture
 2013-07-09 08:30:58 -07:00
Andrew Chin
9a837640f9 Correct cobblestone texture 
Fixes #953
 2013-07-07 00:33:02 -04:00
Aaron Griffith
df2c4b5f03 fixed bug that occurs when %HOME% is set on windows 2013-07-05 18:24:18 -04:00
Andrew Brown
4f41d16e8e updated "installing the textures" section of the docs 
Also fixed docstring in textures.py for the find_file method.
 2013-07-05 16:01:40 -04:00
Andrew Chin
b19ca0dd5f Fix typo in textures.py 2013-07-04 20:01:27 -04:00
Andrew Brown
80bf4ec806 Edited the texture-finding code for 1.6 
Now correctly avoids globbing problems. Removed a bit of irrelevant code
for old style minecraft.jar. Tweaked error messages for resource packs
instead of texture files.
 2013-07-04 17:58:00 -04:00
Andrew Chin
57ab387b29 Fixed default texture loading 
Now accounts for the versions directory, which is maintained by the new
launcher
 2013-07-02 19:05:17 -04:00
Andrew Chin
0cd349ff12 Updated texture loading 
handled the move into the assets/ directory
also updated texture names
 2013-07-01 22:21:18 -04:00
Aaron Griffith
1fa6353ee7 un-revert merge of PR#928, now in a branch 
This reverts commit 124def3602.
 2013-06-07 08:49:25 -04:00
Aaron Griffith
124def3602 revert merge of PR#928 to master, which broke on non-snapshot 
This reverts commit bc5afbed5c, reversing
changes made to 7457758fbb.
 2013-06-07 08:48:08 -04:00
Andrew Chin
bc5afbed5c Merge PR #928 2013-06-06 20:45:21 -04:00
skeight
b8d0405525 Fixed Hay blocks and Stained clay 2013-05-28 09:33:12 -07:00