Merge remote-tracking branch 'origin/Physics' into Tobias

Browse Source

...

This commit is contained in:

tleety

2015-10-20 11:03:45 +02:00

parent f688981b06 a85a703991

commit ce61de1d5c

6 changed files with 1801 additions and 487 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/Kraken/Arm.dae

+576

File diff suppressed because one or more lines are too long

assets/Models/Sid/Sid.dae

+561 -487

File diff suppressed because one or more lines are too long