TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 08:04:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into aiSubsystem

Browse source 
# Conflicts:
#	Engine/source/T3D/player.cpp
This commit is contained in:
AzaezelX 2025-04-28 14:28:54 -05:00
commit 618ddbc9ba
60 changed files with 1751 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/vehicles/flyingVehicle.cpp
View file

@ -407,7 +407,7 @@ bool FlyingVehicle::onNewDataBlock(GameBaseData* dptr, bool reload)
mJetThread[i] = 0;
}
scriptOnNewDataBlock();
scriptOnNewDataBlock(reload);
return true;
}

2
Engine/source/T3D/vehicles/hoverVehicle.cpp
View file

@ -549,7 +549,7 @@ bool HoverVehicle::onNewDataBlock(GameBaseData* dptr, bool reload)
}
// Todo: Uncomment if this is a "leaf" class
scriptOnNewDataBlock();
scriptOnNewDataBlock(reload);
return true;
}

6
Engine/source/T3D/vehicles/vehicle.cpp
View file

@ -141,6 +141,7 @@ VehicleData::VehicleData()
dMemset( damageEmitterOffset, 0, sizeof( damageEmitterOffset ) );
dMemset( damageEmitterIDList, 0, sizeof( damageEmitterIDList ) );
dMemset( damageLevelTolerance, 0, sizeof( damageLevelTolerance ) );
mControlMap = StringTable->EmptyString();
numDmgEmitterAreas = 0;
@ -327,6 +328,8 @@ void VehicleData::initPersistFields()
endGroup("Movement");
addGroup("Steering");
addField("controlMap", TypeString, Offset(mControlMap, VehicleData),
"@brief movemap used by these types of objects.\n\n");
addFieldV( "jetForce", TypeRangedF32, Offset(jetForce, VehicleData), &CommonValidators::PositiveFloat,
"@brief Additional force applied to the vehicle when it is jetting.\n\n"
"For WheeledVehicles, the force is applied in the forward direction. For "
@ -738,6 +741,9 @@ void Vehicle::updateMove(const Move* move)
if (mDamageState == Enabled) {
setImageTriggerState(0,move->trigger[0]);
setImageTriggerState(1,move->trigger[1]);
//legacy code has trigger 2 and 3 reserved
setImageTriggerState(2, move->trigger[4]);
setImageTriggerState(3, move->trigger[5]);
}
// Throttle

1
Engine/source/T3D/vehicles/vehicle.h
View file

@ -71,6 +71,7 @@ struct VehicleData : public RigidShapeData
F32 damageLevelTolerance[ VC_NUM_DAMAGE_LEVELS ];
F32 numDmgEmitterAreas;
StringTableEntry mControlMap;
bool enablePhysicsRep;
StringTableEntry mControlMap;

2
Engine/source/T3D/vehicles/wheeledVehicle.cpp
View file

@ -711,7 +711,7 @@ bool WheeledVehicle::onNewDataBlock(GameBaseData* dptr, bool reload)
mJetSound = SFX->createSource( mDataBlock->getWheeledVehicleSoundsProfile(WheeledVehicleData::JetSound), &getTransform() );
}
scriptOnNewDataBlock();
scriptOnNewDataBlock(reload);
return true;
}