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

Browse Source

...

This commit is contained in:

viktorljung

2015-10-08 23:19:23 +02:00

parent 95c1f57dd7 90636a7169

commit 9997f3d964

20 changed files with 322 additions and 53 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/Textures/Particles/Cloud_Particle.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 120 KiB

assets/Textures/Particles/FadeBall.png

BIN

Binary file not shown.

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

assets/Textures/Particles/Ice_Particle.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 600 KiB

assets/Textures/Particles/Normal_Dust_Particle.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 44 KiB