AzaezelX afa52850c3 Merge branch 'CustomShaderFeaturesPR' of https://github.com/Areloch/Torque3D into alpha40Macwork ... # Conflicts: # Engine/source/materials/materialDefinition.cpp # Engine/source/materials/processedFFMaterial.h # Engine/source/materials/processedShaderMaterial.cpp # Engine/source/renderInstance/renderBinManager.cpp # Engine/source/renderInstance/renderGlowMgr.cpp # Engine/source/renderInstance/renderMeshMgr.cpp # Engine/source/renderInstance/renderPassManager.h # Engine/source/renderInstance/renderTranslucentMgr.cpp # Engine/source/shaderGen/customShaderFeature.cpp # Engine/source/shaderGen/customShaderFeature.h		2019-05-22 23:36:15 -05:00
..
CMake	Merge branch 'CustomShaderFeaturesPR' of https://github.com/Areloch/Torque3D into alpha40Macwork	2019-05-22 23:36:15 -05:00
dae2dts	Fix torqueConfig.h TORQUE_FRAME_SIZE.	2015-01-31 19:34:14 +01:00
map2dif	Tools directory for ticket #1	2012-09-19 11:22:58 -04:00
projectGenerator	Preliminary IPV6 Support	2016-10-25 19:09:02 +01:00
Vagrant/Ubuntu 14	Move the Vagrant config into a distro-specific folder.	2015-04-19 16:18:03 +10:00