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

Merge remote-tracking branch 'upstream/development' into imageAsset_refactor_rev3

Browse source
This commit is contained in:
marauder2k7 2025-05-12 14:45:41 +01:00
commit e1c01cd49a
152 changed files with 7312 additions and 4132 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Engine/source/afx/afxMagicMissile.h
View file

@ -66,7 +66,10 @@ protected:
public:
enum { MaxLifetimeTicks = 4095 };
void onShapeChanged() {}
void onShapeChanged()
{
reloadOnLocalClient();
}
public:
// variables set in datablock definition:

2
Engine/source/afx/afxSpellBook.cpp
View file

@ -206,7 +206,7 @@ bool afxSpellBook::onNewDataBlock(GameBaseData* dptr, bool reload)
if (!mDataBlock || !Parent::onNewDataBlock(dptr, reload))
return false;
scriptOnNewDataBlock();
scriptOnNewDataBlock(reload);
return true;
}

5
Engine/source/afx/ce/afxModel.h
View file

@ -94,7 +94,10 @@ public:
static void initPersistFields();
void onShapeChanged() {}
void onShapeChanged()
{
reloadOnLocalClient();
}
void onSequenceChanged() {}
DECLARE_CONOBJECT(afxModelData);

8
Engine/source/afx/ce/afxParticleEmitter.cpp
View file

@ -1064,7 +1064,7 @@ bool afxParticleEmitter::onNewDataBlock(GameBaseData* dptr, bool reload)
if (mDataBlock->isTempClone())
return true;
scriptOnNewDataBlock();
scriptOnNewDataBlock(reload);
return true;
}
@ -1108,7 +1108,7 @@ bool afxParticleEmitterVector::onNewDataBlock(GameBaseData* dptr, bool reload)
if (mDataBlock->isTempClone())
return true;
scriptOnNewDataBlock();
scriptOnNewDataBlock(reload);
return true;
}
@ -1177,7 +1177,7 @@ bool afxParticleEmitterCone::onNewDataBlock(GameBaseData* dptr, bool reload)
if (mDataBlock->isTempClone())
return true;
scriptOnNewDataBlock();
scriptOnNewDataBlock(reload);
return true;
}
@ -1294,7 +1294,7 @@ bool afxParticleEmitterPath::onNewDataBlock(GameBaseData* dptr, bool reload)
if (mDataBlock->isTempClone())
return true;
scriptOnNewDataBlock();
scriptOnNewDataBlock(reload);
return true;
}