TorqueEngine/Torque3D

Merge branch 'Misc-HDR-And-Levels' of https://github.com/vvv-yeaf/Torque3D into Misc-HDR-And-Levels

# Conflicts:
#	Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.glsl
#	Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.hlsl

vvv-yeaf %!s(int64=3) %!d(string=hai) anos

pai

1212e72d11 309138699b

achega

d4976fecc7

Merge branch 'Misc-HDR-And-Levels' of https://github.com/vvv-yeaf/Torque3D into Misc-HDR-And-Levels

Os datos das diferenzas Diff non están dispoñibles.