TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 07:04:36 +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/shapeBase.h
View file

@ -587,6 +587,8 @@ public:
F32 density;
F32 maxEnergy;
F32 maxDamage;
F32 mCollisionMul;
F32 mImpactMul;
F32 repairRate; ///< Rate per tick.
F32 disabledLevel;