Daniel Buckmaster 014b566014 Merge remote-tracking branch 'gg/development-3.6' into development ... Conflicts: Engine/source/T3D/gameFunctions.cpp		2015-01-29 21:17:38 +11:00
..
datablocks	Fix weapon image camera shake.	2014-12-07 20:59:17 +11:00
decals	Full Template for ticket #1	2012-09-19 11:54:25 -04:00
environment	Adds material definitions for groundcover referencing.	2014-09-01 19:39:29 -05:00
forest	Full Template for ticket #1	2012-09-19 11:54:25 -04:00
gui	Correct customProfiles.cs execution.	2013-04-09 06:01:53 -04:00
lights	Moving the light related assets and data out of the core.	2013-04-02 19:44:31 -04:00
particles	Moved teleporter related particle data out of the managed data file and into art/datablock/teleporter.cs. I also corrected a bad filepath that would prevent mission loading.	2013-04-02 14:54:01 -04:00
ribbons	ribbon_opengl	2014-12-03 22:19:02 +01:00
roads	Relocate default road & path assets.	2013-04-04 15:29:38 -04:00
shapes	Merge pull request #807 from eightyeight/az_outpost	2014-10-03 09:34:30 +10:00
skies	Relocating sky related assets.	2013-04-04 10:46:28 -04:00
sound	Remove unused and duplicate sounds.	2013-04-11 15:37:40 -04:00
terrains	Revert - Merge pull request #962 Fix OpenGL new terrain blend	2014-12-03 21:54:57 +01:00
water	Relocate water related assets.	2013-04-04 14:13:46 -04:00
main.cs	Full Template for ticket #1	2012-09-19 11:54:25 -04:00