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 2946846a67 c3cd3b9a69

commit 3a1221068f

118 changed files with 775 additions and 123 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

BIN

assets/voxygen/voxel/armor/chest/chest_blue.vox (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/voxel/armor/chest/chest_green.vox (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/voxel/armor/chest/chest_orange.vox (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/voxel/armor/pants/pants_blue.vox (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/voxel/armor/pants/pants_green.vox (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/voxel/armor/pants/pants_orange.vox (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/world/structures/human/blacksmith.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/structures/human/house_1.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/structures/human/house_2.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/structures/human/stables_1.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/birch/1.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/birch/10.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/birch/11.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/birch/12.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/birch/2.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/birch/3.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/birch/4.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/birch/5.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/birch/6.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/birch/7.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/birch/8.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/birch/9.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/desert_palm/1.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/desert_palm/10.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/desert_palm/2.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/desert_palm/3.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/desert_palm/4.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/desert_palm/5.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/desert_palm/6.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/desert_palm/7.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/desert_palm/8.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/desert_palm/9.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/mangroves/1.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/mangroves/2.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/mangroves/3.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

BIN

assets/world/tree/oak_green/4.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/oak_green/5.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/oak_green/6.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/oak_green/7.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/oak_green/8.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/oak_green/9.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/pine/3.vox (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/world/tree/pine/4.vox (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/world/tree/pine/5.vox (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/world/tree/pine_blue/1.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/pine_blue/2.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/pine_blue/3.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/pine_blue/4.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/pine_blue/5.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/pine_blue/6.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/pine_blue/7.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/pine_blue/8.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/pine_green/1.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/pine_green/2.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/pine_green/3.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/pine_green/4.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/pine_green/5.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/pine_green/6.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/pine_green/7.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/pine_green/8.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/pine_green_2/1.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/pine_green_2/2.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/pine_green_2/3.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/pine_green_2/4.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/pine_green_2/5.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/pine_green_2/6.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/pine_green_2/7.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/pine_green_2/8.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/poplar/1.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/poplar/10.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/poplar/2.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/poplar/3.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/poplar/4.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/poplar/5.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/poplar/6.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/poplar/7.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/poplar/8.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/poplar/9.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/snow_birch/1.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/snow_birch/10.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/snow_birch/11.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/snow_birch/12.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/snow_birch/2.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/snow_birch/3.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/snow_birch/4.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/snow_birch/5.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/snow_birch/6.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/snow_birch/7.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/snow_birch/8.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/snow_birch/9.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/snow_pine/1.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/snow_pine/2.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/snow_pine/3.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/snow_pine/4.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/snow_pine/5.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/snow_pine/6.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/world/tree/snow_pine/7.vox (Stored with Git LFS) Normal file

View File

Binary file not shown.

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