@quenty/ragdoll 15.23.3 → 15.23.4-canary.559.339cfa7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +11 -0
- package/package.json +32 -32
- package/src/Client/Classes/RagdollCameraShakeClient.lua +72 -64
- package/src/Client/Classes/RagdollClient.lua +1 -2
- package/src/Client/Classes/RagdollHumanoidOnDeathClient.lua +2 -2
- package/src/Client/Classes/RagdollHumanoidOnFallClient.lua +1 -1
- package/src/Client/Classes/RagdollableClient.lua +5 -5
- package/src/Client/RagdollBindersClient.lua +5 -5
- package/src/Client/RagdollServiceClient.lua +3 -3
- package/src/Server/Classes/Ragdoll.lua +3 -3
- package/src/Server/Classes/RagdollCameraShake.lua +2 -3
- package/src/Server/Classes/RagdollHumanoidOnDeath.lua +2 -2
- package/src/Server/Classes/RagdollHumanoidOnFall.lua +1 -2
- package/src/Server/Classes/Ragdollable.lua +7 -7
- package/src/Server/Classes/UnragdollAutomatically.lua +37 -35
- package/src/Server/Classes/UnragdollAutomaticallyConstants.lua +3 -3
- package/src/Server/RagdollBindersServer.lua +6 -6
- package/src/Server/RagdollService.lua +3 -3
- package/src/Shared/Classes/BindableRagdollHumanoidOnFall.lua +3 -5
- package/src/Shared/Classes/RagdollHumanoidOnFallConstants.lua +2 -2
- package/src/Shared/Classes/RagdollableBase.lua +1 -1
- package/src/Shared/Interfaces/RagdollableInterface.lua +7 -8
- package/src/Shared/RagdollServiceConstants.lua +2 -2
- package/src/Shared/Rigging/RagdollAdditionalAttachmentUtils.lua +44 -22
- package/src/Shared/Rigging/RagdollBallSocketUtils.lua +163 -163
- package/src/Shared/Rigging/RagdollCollisionUtils.lua +60 -61
- package/src/Shared/Rigging/RagdollMotorData.lua +3 -3
- package/src/Shared/Rigging/RagdollMotorLimitData.lua +78 -78
- package/src/Shared/Rigging/RagdollMotorUtils.lua +2 -2
- package/src/Shared/Rigging/RxRagdollUtils.lua +3 -3
|
@@ -22,104 +22,104 @@ local Table = require("Table")
|
|
|
22
22
|
|
|
23
23
|
return Table.readonly({
|
|
24
24
|
NECK_LIMITS = AdorneeData.new({
|
|
25
|
-
UpperAngle = 45
|
|
26
|
-
TwistLowerAngle = -40
|
|
27
|
-
TwistUpperAngle = 40
|
|
28
|
-
FrictionTorque = 15
|
|
29
|
-
ReferenceGravity = 196.2
|
|
30
|
-
ReferenceMass = 1.0249234437943
|
|
31
|
-
})
|
|
25
|
+
UpperAngle = 45,
|
|
26
|
+
TwistLowerAngle = -40,
|
|
27
|
+
TwistUpperAngle = 40,
|
|
28
|
+
FrictionTorque = 15,
|
|
29
|
+
ReferenceGravity = 196.2,
|
|
30
|
+
ReferenceMass = 1.0249234437943,
|
|
31
|
+
}),
|
|
32
32
|
|
|
33
33
|
WAIST_LIMITS = AdorneeData.new({
|
|
34
|
-
UpperAngle = 20
|
|
35
|
-
TwistLowerAngle = -40
|
|
36
|
-
TwistUpperAngle = 20
|
|
37
|
-
FrictionTorque = 750
|
|
38
|
-
ReferenceGravity = 196.2
|
|
39
|
-
ReferenceMass = 2.861558675766
|
|
40
|
-
})
|
|
34
|
+
UpperAngle = 20,
|
|
35
|
+
TwistLowerAngle = -40,
|
|
36
|
+
TwistUpperAngle = 20,
|
|
37
|
+
FrictionTorque = 750,
|
|
38
|
+
ReferenceGravity = 196.2,
|
|
39
|
+
ReferenceMass = 2.861558675766,
|
|
40
|
+
}),
|
|
41
41
|
|
|
42
42
|
ANKLE_LIMITS = AdorneeData.new({
|
|
43
|
-
UpperAngle = 10
|
|
44
|
-
TwistLowerAngle = -10
|
|
45
|
-
TwistUpperAngle = 10
|
|
46
|
-
FrictionTorque = 0.5
|
|
47
|
-
ReferenceGravity = 196.2
|
|
48
|
-
ReferenceMass = 0.43671694397926
|
|
49
|
-
})
|
|
43
|
+
UpperAngle = 10,
|
|
44
|
+
TwistLowerAngle = -10,
|
|
45
|
+
TwistUpperAngle = 10,
|
|
46
|
+
FrictionTorque = 0.5,
|
|
47
|
+
ReferenceGravity = 196.2,
|
|
48
|
+
ReferenceMass = 0.43671694397926,
|
|
49
|
+
}),
|
|
50
50
|
|
|
51
51
|
ELBOW_LIMITS = AdorneeData.new({
|
|
52
52
|
-- Elbow is basically a hinge; but allow some twist for Supination and Pronation
|
|
53
|
-
UpperAngle = 20
|
|
54
|
-
TwistLowerAngle = 5
|
|
55
|
-
TwistUpperAngle = 120
|
|
56
|
-
FrictionTorque = 0.5
|
|
57
|
-
ReferenceGravity = 196.2
|
|
58
|
-
ReferenceMass = 0.70196455717087
|
|
59
|
-
})
|
|
53
|
+
UpperAngle = 20,
|
|
54
|
+
TwistLowerAngle = 5,
|
|
55
|
+
TwistUpperAngle = 120,
|
|
56
|
+
FrictionTorque = 0.5,
|
|
57
|
+
ReferenceGravity = 196.2,
|
|
58
|
+
ReferenceMass = 0.70196455717087,
|
|
59
|
+
}),
|
|
60
60
|
|
|
61
61
|
WRIST_LIMITS = AdorneeData.new({
|
|
62
|
-
UpperAngle = 30
|
|
63
|
-
TwistLowerAngle = -10
|
|
64
|
-
TwistUpperAngle = 10
|
|
65
|
-
FrictionTorque = 1
|
|
66
|
-
ReferenceGravity = 196.2
|
|
67
|
-
ReferenceMass = 0.69132566452026
|
|
68
|
-
})
|
|
62
|
+
UpperAngle = 30,
|
|
63
|
+
TwistLowerAngle = -10,
|
|
64
|
+
TwistUpperAngle = 10,
|
|
65
|
+
FrictionTorque = 1,
|
|
66
|
+
ReferenceGravity = 196.2,
|
|
67
|
+
ReferenceMass = 0.69132566452026,
|
|
68
|
+
}),
|
|
69
69
|
|
|
70
70
|
KNEE_LIMITS = AdorneeData.new({
|
|
71
|
-
UpperAngle = 5
|
|
72
|
-
TwistLowerAngle = -120
|
|
73
|
-
TwistUpperAngle = -5
|
|
74
|
-
FrictionTorque = 0.5
|
|
75
|
-
ReferenceGravity = 196.2
|
|
76
|
-
ReferenceMass = 0.65389388799667
|
|
77
|
-
})
|
|
71
|
+
UpperAngle = 5,
|
|
72
|
+
TwistLowerAngle = -120,
|
|
73
|
+
TwistUpperAngle = -5,
|
|
74
|
+
FrictionTorque = 0.5,
|
|
75
|
+
ReferenceGravity = 196.2,
|
|
76
|
+
ReferenceMass = 0.65389388799667,
|
|
77
|
+
}),
|
|
78
78
|
|
|
79
79
|
SHOULDER_LIMITS = AdorneeData.new({
|
|
80
|
-
UpperAngle = 110
|
|
81
|
-
TwistLowerAngle = -85
|
|
82
|
-
TwistUpperAngle = 85
|
|
83
|
-
FrictionTorque = 0.5
|
|
84
|
-
ReferenceGravity = 196.2
|
|
85
|
-
ReferenceMass = 0.90918225049973
|
|
86
|
-
})
|
|
80
|
+
UpperAngle = 110,
|
|
81
|
+
TwistLowerAngle = -85,
|
|
82
|
+
TwistUpperAngle = 85,
|
|
83
|
+
FrictionTorque = 0.5,
|
|
84
|
+
ReferenceGravity = 196.2,
|
|
85
|
+
ReferenceMass = 0.90918225049973,
|
|
86
|
+
}),
|
|
87
87
|
|
|
88
88
|
HIP_LIMITS = AdorneeData.new({
|
|
89
|
-
UpperAngle = 40
|
|
90
|
-
TwistLowerAngle = -5
|
|
91
|
-
TwistUpperAngle = 80
|
|
92
|
-
FrictionTorque = 0.5
|
|
93
|
-
ReferenceGravity = 196.2
|
|
94
|
-
ReferenceMass = 1.9175016880035
|
|
95
|
-
})
|
|
89
|
+
UpperAngle = 40,
|
|
90
|
+
TwistLowerAngle = -5,
|
|
91
|
+
TwistUpperAngle = 80,
|
|
92
|
+
FrictionTorque = 0.5,
|
|
93
|
+
ReferenceGravity = 196.2,
|
|
94
|
+
ReferenceMass = 1.9175016880035,
|
|
95
|
+
}),
|
|
96
96
|
|
|
97
97
|
-- R6
|
|
98
98
|
|
|
99
99
|
R6_NECK_LIMITS = AdorneeData.new({
|
|
100
|
-
UpperAngle = 30
|
|
101
|
-
TwistLowerAngle = -40
|
|
102
|
-
TwistUpperAngle = 40
|
|
103
|
-
FrictionTorque = 0.5
|
|
104
|
-
ReferenceGravity = 196.2
|
|
105
|
-
ReferenceMass = 1.4
|
|
106
|
-
})
|
|
100
|
+
UpperAngle = 30,
|
|
101
|
+
TwistLowerAngle = -40,
|
|
102
|
+
TwistUpperAngle = 40,
|
|
103
|
+
FrictionTorque = 0.5,
|
|
104
|
+
ReferenceGravity = 196.2,
|
|
105
|
+
ReferenceMass = 1.4,
|
|
106
|
+
}),
|
|
107
107
|
|
|
108
108
|
R6_SHOULDER_LIMITS = AdorneeData.new({
|
|
109
|
-
UpperAngle = 110
|
|
110
|
-
TwistLowerAngle = -85
|
|
111
|
-
TwistUpperAngle = 85
|
|
112
|
-
FrictionTorque = 0.5
|
|
113
|
-
ReferenceGravity = 196.2
|
|
114
|
-
ReferenceMass = 1.4
|
|
115
|
-
})
|
|
109
|
+
UpperAngle = 110,
|
|
110
|
+
TwistLowerAngle = -85,
|
|
111
|
+
TwistUpperAngle = 85,
|
|
112
|
+
FrictionTorque = 0.5,
|
|
113
|
+
ReferenceGravity = 196.2,
|
|
114
|
+
ReferenceMass = 1.4,
|
|
115
|
+
}),
|
|
116
116
|
|
|
117
117
|
R6_HIP_LIMITS = AdorneeData.new({
|
|
118
|
-
UpperAngle = 40
|
|
119
|
-
TwistLowerAngle = -5
|
|
120
|
-
TwistUpperAngle = 80
|
|
121
|
-
FrictionTorque = 0.5
|
|
122
|
-
ReferenceGravity = 196.2
|
|
123
|
-
ReferenceMass = 1.4
|
|
124
|
-
})
|
|
125
|
-
})
|
|
118
|
+
UpperAngle = 40,
|
|
119
|
+
TwistLowerAngle = -5,
|
|
120
|
+
TwistUpperAngle = 80,
|
|
121
|
+
FrictionTorque = 0.5,
|
|
122
|
+
ReferenceGravity = 196.2,
|
|
123
|
+
ReferenceMass = 1.4,
|
|
124
|
+
}),
|
|
125
|
+
})
|
|
@@ -4,8 +4,8 @@
|
|
|
4
4
|
|
|
5
5
|
local require = require(script.Parent.loader).load(script)
|
|
6
6
|
|
|
7
|
-
local RunService = game:GetService("RunService")
|
|
8
7
|
local Players = game:GetService("Players")
|
|
8
|
+
local RunService = game:GetService("RunService")
|
|
9
9
|
|
|
10
10
|
local CharacterUtils = require("CharacterUtils")
|
|
11
11
|
local EnumUtils = require("EnumUtils")
|
|
@@ -461,7 +461,7 @@ function RagdollMotorUtils.promiseVelocityRecordings(character: Model, rigType:
|
|
|
461
461
|
local x, y, z = change:ToEulerAnglesXYZ()
|
|
462
462
|
|
|
463
463
|
local vector = newRootPartCFrame:VectorToWorldSpace(Vector3.new(x, y, z))
|
|
464
|
-
result.rotation[data] = vector/dt
|
|
464
|
+
result.rotation[data] = vector / dt
|
|
465
465
|
end
|
|
466
466
|
end
|
|
467
467
|
|
|
@@ -9,12 +9,12 @@ local require = require(script.Parent.loader).load(script)
|
|
|
9
9
|
local Players = game:GetService("Players")
|
|
10
10
|
local RunService = game:GetService("RunService")
|
|
11
11
|
|
|
12
|
+
local CharacterUtils = require("CharacterUtils")
|
|
12
13
|
local Maid = require("Maid")
|
|
14
|
+
local RagdollMotorUtils = require("RagdollMotorUtils")
|
|
13
15
|
local RxBrioUtils = require("RxBrioUtils")
|
|
14
16
|
local RxInstanceUtils = require("RxInstanceUtils")
|
|
15
17
|
local RxR15Utils = require("RxR15Utils")
|
|
16
|
-
local RagdollMotorUtils = require("RagdollMotorUtils")
|
|
17
|
-
local CharacterUtils = require("CharacterUtils")
|
|
18
18
|
|
|
19
19
|
local RxRagdollUtils = {}
|
|
20
20
|
|
|
@@ -181,7 +181,7 @@ function RxRagdollUtils.runLocal(humanoid: Humanoid)
|
|
|
181
181
|
:Then(function(velocityReadings)
|
|
182
182
|
debug.profilebegin("initragdoll")
|
|
183
183
|
|
|
184
|
-
|
|
184
|
+
maid:GiveTask(RxRagdollUtils.suppressRootPartCollision(character))
|
|
185
185
|
maid:GiveTask(RxRagdollUtils.enforceHeadCollision(character))
|
|
186
186
|
maid:GiveTask(RxRagdollUtils.enforceHumanoidStateMachineOff(character, humanoid))
|
|
187
187
|
|