TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-09 05:34:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'GarageGames/master' into ueberengine-dev

Browse source 
Conflicts:
	Engine/source/windowManager/sdl/sdlWindowMgr.cpp
	Tools/CMake/torque3d.cmake

3.10 final update
This commit is contained in:
Duion 2017-03-23 20:36:21 +01:00
commit aff033dd0d
1003 changed files with 53039 additions and 82707 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/sfx/sfxController.cpp
View file

@ -324,8 +324,8 @@ void SFXController::_printInsn( Insn& insn)
Con::printf( "[SFXController] ip=%d: slot=%d: state=%s: Delay %f:%f:%f",
mIp, insn.mSlotIndex, insn.mState ? insn.mState->getName() : "",
insn.mArg.mDelayTime.mValue[ 0 ],
insn.mArg.mDelayTime.mVariance[ 0 ],
insn.mArg.mDelayTime.mVariance[ 1 ]
insn.mArg.mDelayTime.mVariance[ 0 ][ 0 ],
insn.mArg.mDelayTime.mVariance[ 0 ][ 1 ]
);
break;