Merge branch 'master' of github.com:Faerbit/swp

Browse Source

...

This commit is contained in:

Steffen Fündgens 2015-03-02 17:20:16 +01:00

parent 9ba15227c2 0dd10f423a

commit 0bc98c7026

5 changed files with 717 additions and 354 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

Blenderfiles/torch.blend

View File

Binary file not shown.

1071

data/geometry/torch.obj

View File

File diff suppressed because it is too large Load Diff

BIN

data/textures/brazierTexture.jpg

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 909 KiB

BIN

data/textures/brazierTexture.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.0 MiB

BIN

data/textures/torchTexture2.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.2 MiB