Merge branch 'voxel-shadows' into 'master'

Browse Source

Shadows, deserts, snow, caves

See merge request veloren/veloren!198

...

This commit is contained in:

Joshua Barretto 2019-06-03 22:13:10 +00:00

parent 6df4ef7a8e e0cf6b5e37

commit f473c13d03

115 changed files with 492 additions and 104 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

assets

voxygen/voxel/armor

chest

chest_blue.voxchest_green.voxchest_orange.vox

pants

pants_blue.voxpants_green.voxpants_orange.vox

world

structures/human

blacksmith.voxhouse_1.voxhouse_2.voxstables_1.vox

tree

birch

1.vox10.vox11.vox12.vox2.vox3.vox4.vox5.vox6.vox7.vox8.vox9.vox

desert_palm

1.vox10.vox2.vox3.vox4.vox5.vox6.vox7.vox8.vox9.vox

mangroves

1.vox2.vox3.vox

oak_green

1.vox2.vox3.vox4.vox5.vox6.vox7.vox8.vox9.vox

pine_blue

1.vox2.vox3.vox4.vox5.vox6.vox7.vox8.vox

pine_green

1.vox2.vox3.vox4.vox5.vox6.vox7.vox8.vox

pine_green_2

1.vox2.vox3.vox4.vox5.vox6.vox7.vox8.vox

poplar

1.vox10.vox2.vox3.vox4.vox5.vox6.vox7.vox8.vox9.vox

snow_birch

1.vox10.vox11.vox12.vox2.vox3.vox4.vox5.vox6.vox7.vox8.vox9.vox

snow_pine

1.vox2.vox3.vox4.vox5.vox6.vox7.vox8.vox

temperate_small

1.vox2.vox

Show More

BIN

assets/voxygen/voxel/armor/chest/chest_blue.vox

Binary file not shown.

BIN

assets/voxygen/voxel/armor/chest/chest_green.vox

Binary file not shown.

BIN

assets/voxygen/voxel/armor/chest/chest_orange.vox

Binary file not shown.

BIN

assets/voxygen/voxel/armor/pants/pants_blue.vox

Binary file not shown.

BIN

assets/voxygen/voxel/armor/pants/pants_green.vox

Binary file not shown.

BIN

assets/voxygen/voxel/armor/pants/pants_orange.vox

Binary file not shown.

BIN

assets/world/structures/human/blacksmith.vox Normal file

Binary file not shown.

BIN

assets/world/structures/human/house_1.vox Normal file

Binary file not shown.

BIN

assets/world/structures/human/house_2.vox Normal file

Binary file not shown.

BIN

assets/world/structures/human/stables_1.vox Normal file

Binary file not shown.

BIN

assets/world/tree/birch/1.vox Normal file

Binary file not shown.

BIN

assets/world/tree/birch/10.vox Normal file

Binary file not shown.

BIN

assets/world/tree/birch/11.vox Normal file

Binary file not shown.

BIN

assets/world/tree/birch/12.vox Normal file

Binary file not shown.

BIN

assets/world/tree/birch/2.vox Normal file

Binary file not shown.

BIN

assets/world/tree/birch/3.vox Normal file

Binary file not shown.

BIN

assets/world/tree/birch/4.vox Normal file

Binary file not shown.

BIN

assets/world/tree/birch/5.vox Normal file

Binary file not shown.

BIN

assets/world/tree/birch/6.vox Normal file

Binary file not shown.

BIN

assets/world/tree/birch/7.vox Normal file

Binary file not shown.

BIN

assets/world/tree/birch/8.vox Normal file

Binary file not shown.

BIN

assets/world/tree/birch/9.vox Normal file

Binary file not shown.

BIN

assets/world/tree/desert_palm/1.vox Normal file

Binary file not shown.

BIN

assets/world/tree/desert_palm/10.vox Normal file

Binary file not shown.

BIN

assets/world/tree/desert_palm/2.vox Normal file

Binary file not shown.

BIN

assets/world/tree/desert_palm/3.vox Normal file

Binary file not shown.

BIN

assets/world/tree/desert_palm/4.vox Normal file

Binary file not shown.

BIN

assets/world/tree/desert_palm/5.vox Normal file

Binary file not shown.

BIN

assets/world/tree/desert_palm/6.vox Normal file

Binary file not shown.

BIN

assets/world/tree/desert_palm/7.vox Normal file

Binary file not shown.

BIN

assets/world/tree/desert_palm/8.vox Normal file

Binary file not shown.

BIN

assets/world/tree/desert_palm/9.vox Normal file

Binary file not shown.

BIN

assets/world/tree/mangroves/1.vox Normal file

Binary file not shown.

BIN

assets/world/tree/mangroves/2.vox Normal file

Binary file not shown.

BIN

assets/world/tree/mangroves/3.vox Normal file

Binary file not shown.

0

assets/world/tree/oak/1.vox → assets/world/tree/oak_green/1.vox

0

assets/world/tree/oak/2.vox → assets/world/tree/oak_green/2.vox

0

assets/world/tree/oak/3.vox → assets/world/tree/oak_green/3.vox

BIN

assets/world/tree/oak_green/4.vox Normal file

Binary file not shown.

BIN

assets/world/tree/oak_green/5.vox Normal file

Binary file not shown.

BIN

assets/world/tree/oak_green/6.vox Normal file

Binary file not shown.

BIN

assets/world/tree/oak_green/7.vox Normal file

Binary file not shown.

BIN

assets/world/tree/oak_green/8.vox Normal file

Binary file not shown.

BIN

assets/world/tree/oak_green/9.vox Normal file

Binary file not shown.

BIN

assets/world/tree/pine_blue/1.vox Normal file

Binary file not shown.

BIN

assets/world/tree/pine/4.vox → assets/world/tree/pine_blue/2.vox

Binary file not shown.

BIN

assets/world/tree/pine_blue/3.vox Normal file

Binary file not shown.

BIN

assets/world/tree/pine_blue/4.vox Normal file

Binary file not shown.

BIN

assets/world/tree/pine_blue/5.vox Normal file

Binary file not shown.

BIN

assets/world/tree/pine_blue/6.vox Normal file

Binary file not shown.

BIN

assets/world/tree/pine_blue/7.vox Normal file

Binary file not shown.

BIN

assets/world/tree/pine_blue/8.vox Normal file

Binary file not shown.

BIN

assets/world/tree/pine_green/1.vox Normal file

Binary file not shown.

BIN

assets/world/tree/pine_green/2.vox Normal file

Binary file not shown.

BIN

assets/world/tree/pine/5.vox → assets/world/tree/pine_green/3.vox

Binary file not shown.

BIN

assets/world/tree/pine_green/4.vox Normal file

Binary file not shown.

BIN

assets/world/tree/pine_green/5.vox Normal file

Binary file not shown.

BIN

assets/world/tree/pine_green/6.vox Normal file

Binary file not shown.

BIN

assets/world/tree/pine_green/7.vox Normal file

Binary file not shown.

BIN

assets/world/tree/pine_green/8.vox Normal file

Binary file not shown.

BIN

assets/world/tree/pine/3.vox → assets/world/tree/pine_green_2/1.vox

Binary file not shown.

BIN

assets/world/tree/pine_green_2/2.vox Normal file

Binary file not shown.

BIN

assets/world/tree/pine_green_2/3.vox Normal file

Binary file not shown.

BIN

assets/world/tree/pine_green_2/4.vox Normal file

Binary file not shown.

BIN

assets/world/tree/pine_green_2/5.vox Normal file

Binary file not shown.

BIN

assets/world/tree/pine_green_2/6.vox Normal file

Binary file not shown.

BIN

assets/world/tree/pine_green_2/7.vox Normal file

Binary file not shown.

BIN

assets/world/tree/pine_green_2/8.vox Normal file

Binary file not shown.

BIN

assets/world/tree/poplar/1.vox Normal file

Binary file not shown.

BIN

assets/world/tree/poplar/10.vox Normal file

Binary file not shown.

BIN

assets/world/tree/poplar/2.vox Normal file

Binary file not shown.

BIN

assets/world/tree/poplar/3.vox Normal file

Binary file not shown.

BIN

assets/world/tree/poplar/4.vox Normal file

Binary file not shown.

BIN

assets/world/tree/poplar/5.vox Normal file

Binary file not shown.

BIN

assets/world/tree/poplar/6.vox Normal file

Binary file not shown.

BIN

assets/world/tree/poplar/7.vox Normal file

Binary file not shown.

BIN

assets/world/tree/poplar/8.vox Normal file

Binary file not shown.

BIN

assets/world/tree/poplar/9.vox Normal file

Binary file not shown.

BIN

assets/world/tree/snow_birch/1.vox Normal file

Binary file not shown.

BIN

assets/world/tree/snow_birch/10.vox Normal file

Binary file not shown.

BIN

assets/world/tree/snow_birch/11.vox Normal file

Binary file not shown.

BIN

assets/world/tree/snow_birch/12.vox Normal file

Binary file not shown.

BIN

assets/world/tree/snow_birch/2.vox Normal file

Binary file not shown.

BIN

assets/world/tree/snow_birch/3.vox Normal file

Binary file not shown.

BIN

assets/world/tree/snow_birch/4.vox Normal file

Binary file not shown.

BIN

assets/world/tree/snow_birch/5.vox Normal file

Binary file not shown.

BIN

assets/world/tree/snow_birch/6.vox Normal file

Binary file not shown.

BIN

assets/world/tree/snow_birch/7.vox Normal file

Binary file not shown.

BIN

assets/world/tree/snow_birch/8.vox Normal file

Binary file not shown.

BIN

assets/world/tree/snow_birch/9.vox Normal file

Binary file not shown.

BIN

assets/world/tree/snow_pine/1.vox Normal file

Binary file not shown.

BIN

assets/world/tree/snow_pine/2.vox Normal file

Binary file not shown.

BIN

assets/world/tree/snow_pine/3.vox Normal file

Binary file not shown.

BIN

assets/world/tree/snow_pine/4.vox Normal file

Binary file not shown.

BIN

assets/world/tree/snow_pine/5.vox Normal file

Binary file not shown.

BIN

assets/world/tree/snow_pine/6.vox Normal file

Binary file not shown.

BIN

assets/world/tree/snow_pine/7.vox Normal file

Binary file not shown.

BIN

assets/world/tree/snow_pine/8.vox Normal file

Binary file not shown.

0

assets/world/tree/temperate/1.vox → assets/world/tree/temperate_small/1.vox

0

assets/world/tree/temperate/2.vox → assets/world/tree/temperate_small/2.vox

Some files were not shown because too many files have changed in this diff Show More