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

Browse Source

Conflicts:
	src/GameWorld.cpp
	src/Systems/ParticleSystem.cpp

...

This commit is contained in:

Stiffly

2014-05-27 06:55:44 +02:00

parent 65acae410d 1bf5a8464e

commit 4b2f324d60

84 changed files with 3719 additions and 1153 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/GameWorld.cpp

+844 -238

File diff suppressed because it is too large Load Diff