Merge remote-tracking branch 'origin/master' into water

Browse Source

...

This commit is contained in:

Stiffly

2015-10-23 15:49:41 +02:00

parent 90f4d771ac 037adf3299

commit 206b6ee36c

27 changed files with 3860 additions and 145 deletions

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

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

assets/Models/Sid/Sid_Flying.dae

+1171

File diff suppressed because one or more lines are too long

assets/Models/Sid/Sid_Jump.dae

+1171

File diff suppressed because one or more lines are too long

assets/Models/Sid/Sid_Shoot.dae

+1171

File diff suppressed because one or more lines are too long

assets/Models/Sid/SquidTexture.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 30 KiB After Width:  |  Height:  |  Size: 31 KiB