Omg dem filter merge skillz

Browse Source

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

Conflicts:
	src/GameWorld.cpp
	src/Systems/ParticleSystem.cpp
	src/Systems/ParticleSystem.h
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters

...

This commit is contained in:

Stiffly

2014-05-30 19:11:52 +02:00

parent d17450b554 cc84f04542

commit bf77fba963

84 changed files with 4232 additions and 1736 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

+837 -1110

File diff suppressed because it is too large Load Diff