Tobias Zwick 4981182cf8 Merge remote-tracking branch '_origin/master' into lights ... Conflicts: src/c4group/C4Components.h		2014-12-15 21:16:40 +01:00
..
DefCore.txt	increase game content version entries to 6.0	2014-12-12 22:58:16 +01:00
Graphics.8.png	Change .c4d extension to .ocd	2011-03-13 16:55:00 +01:00
Graphics1.8.png	Change .c4d extension to .ocd	2011-03-13 16:55:00 +01:00
Graphics2.8.png	Change .c4d extension to .ocd	2011-03-13 16:55:00 +01:00
Graphics3.8.png	Change .c4d extension to .ocd	2011-03-13 16:55:00 +01:00
Graphics4.8.png	Change .c4d extension to .ocd	2011-03-13 16:55:00 +01:00
Normal.8.png	Add (auto-generated) normal maps for most resources	2014-11-26 17:58:52 -05:00
Normal1.8.png	Add (auto-generated) normal maps for most resources	2014-11-26 17:58:52 -05:00
Normal2.8.png	Add (auto-generated) normal maps for most resources	2014-11-26 17:58:52 -05:00
Normal3.8.png	Add (auto-generated) normal maps for most resources	2014-11-26 17:58:52 -05:00
Normal4.8.png	Add (auto-generated) normal maps for most resources	2014-11-26 17:58:52 -05:00
Script.c	Added IceHit sounds, which is slightly less plingy than the gem hit sound.	2014-05-10 18:41:09 +02:00
StringTblDE.txt	Change .c4d extension to .ocd	2011-03-13 16:55:00 +01:00
StringTblUS.txt	Change .c4d extension to .ocd	2011-03-13 16:55:00 +01:00