Fixed blendmaps

Browse Source

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

Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters

...

This commit is contained in:

Tleety

2014-05-28 22:08:50 +02:00

parent 761b8e21e1 cc42b94000

commit eb37cc2296

21 changed files with 932 additions and 1201 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

+727 -1092

File diff suppressed because it is too large Load Diff