Merge branch 'deffered_rendering'

Browse Source

Conflicts:
	assets
	src/Components/Physics.h
	src/GameWorld.cpp
	src/GameWorld.h
	src/Systems/PhysicsSystem.cpp
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters

...

This commit is contained in:

sippeangelo

2014-06-03 17:39:54 +02:00

parent 7f328332c4 f5f6a5cf3a

commit aeb29cde8b

17 changed files with 1017 additions and 238 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

+776 -200

File diff suppressed because it is too large Load Diff