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

Browse Source

...

This commit is contained in:

FakeShemp

2016-03-07 13:52:29 +01:00

parent 0cf92e99ff 46d7c8bea4

commit 243276707a

254 changed files with 70555 additions and 3410 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

src/Engine/Rendering/DrawFinalPass.cpp

+656 -376

File diff suppressed because it is too large Load Diff