Skip to content

Commit f9382b6

Browse files
KABoissonneaultKABoissonneault
authored
Merge pull request #2781 from RedRoryOTheGlen/RaycastProjectiles
Raycast look-ahead for projectiles and Bounding Box-based weapon collision + fixes and optimizations.
2 parents 3ef9d8d + bc15e39 commit f9382b6

16 files changed

Lines changed: 429 additions & 318 deletions

‎Assets/Localization/StringTables/Internal_Settings Shared Data.asset‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,18 @@ MonoBehaviour:
143143
m_Key: textureArrayInfo
144144
m_Metadata:
145145
m_Items: []
146+
- m_Id: 392878225761951744
147+
m_Key: meleeAttackDetectionModes
148+
m_Metadata:
149+
m_Items: []
150+
- m_Id: 392920400377864192
151+
m_Key: meleeAttackDetection
152+
m_Metadata:
153+
m_Items: []
154+
- m_Id: 392920453876211712
155+
m_Key: meleeAttackFriendlyProtection
156+
m_Metadata:
157+
m_Items: []
146158
m_Metadata:
147159
m_Items: []
148160
m_KeyGenerator:

‎Assets/Localization/StringTables/Internal_Settings_en.asset‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,5 +236,19 @@ MonoBehaviour:
236236
and modding support
237237
m_Metadata:
238238
m_Items: []
239+
- m_Id: 392878225761951744
240+
m_Localized: 'Performance
241+
242+
Quality'
243+
m_Metadata:
244+
m_Items: []
245+
- m_Id: 392920400377864192
246+
m_Localized: Hit Detection
247+
m_Metadata:
248+
m_Items: []
249+
- m_Id: 392920453876211712
250+
m_Localized: Protect Friendlies and Neutrals
251+
m_Metadata:
252+
m_Items: []
239253
references:
240254
version: 1

‎Assets/Prefabs/Missiles/ArrowMissile.prefab‎

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,8 @@ GameObject:
1111
- component: {fileID: 4928002457579466}
1212
- component: {fileID: 82343321333735398}
1313
- component: {fileID: 114835290752812540}
14-
- component: {fileID: 135236093773449130}
1514
- component: {fileID: 108732554255048532}
1615
- component: {fileID: 114624404217668130}
17-
- component: {fileID: 54102960107042576}
18-
- component: {fileID: 64298782196861766}
1916
m_Layer: 14
2017
m_Name: ArrowMissile
2118
m_TagString: Untagged
@@ -150,19 +147,6 @@ MonoBehaviour:
150147
PreviewIndex: 0
151148
PreviewID: 3
152149
PreviewClip: 0
153-
--- !u!135 &135236093773449130
154-
SphereCollider:
155-
m_ObjectHideFlags: 0
156-
m_CorrespondingSourceObject: {fileID: 0}
157-
m_PrefabInstance: {fileID: 0}
158-
m_PrefabAsset: {fileID: 0}
159-
m_GameObject: {fileID: 1712884651827938}
160-
m_Material: {fileID: 0}
161-
m_IsTrigger: 0
162-
m_Enabled: 0
163-
serializedVersion: 2
164-
m_Radius: 0.4
165-
m_Center: {x: 0, y: 0, z: 0}
166150
--- !u!108 &108732554255048532
167151
Light:
168152
m_ObjectHideFlags: 0
@@ -250,33 +234,3 @@ MonoBehaviour:
250234
PostImpactLifespanInSeconds: 0.6
251235
PostImpactLightMultiplier: 1.5
252236
ImpactSound: 4
253-
--- !u!54 &54102960107042576
254-
Rigidbody:
255-
m_ObjectHideFlags: 0
256-
m_CorrespondingSourceObject: {fileID: 0}
257-
m_PrefabInstance: {fileID: 0}
258-
m_PrefabAsset: {fileID: 0}
259-
m_GameObject: {fileID: 1712884651827938}
260-
serializedVersion: 2
261-
m_Mass: 1
262-
m_Drag: 0
263-
m_AngularDrag: 0.05
264-
m_UseGravity: 0
265-
m_IsKinematic: 1
266-
m_Interpolate: 0
267-
m_Constraints: 0
268-
m_CollisionDetection: 0
269-
--- !u!64 &64298782196861766
270-
MeshCollider:
271-
m_ObjectHideFlags: 0
272-
m_CorrespondingSourceObject: {fileID: 0}
273-
m_PrefabInstance: {fileID: 0}
274-
m_PrefabAsset: {fileID: 0}
275-
m_GameObject: {fileID: 1712884651827938}
276-
m_Material: {fileID: 0}
277-
m_IsTrigger: 1
278-
m_Enabled: 0
279-
serializedVersion: 4
280-
m_Convex: 1
281-
m_CookingOptions: 30
282-
m_Mesh: {fileID: 0}

‎Assets/Prefabs/Missiles/ColdMissile.prefab‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ GameObject:
1111
- component: {fileID: 4187251767156800}
1212
- component: {fileID: 82507643407150988}
1313
- component: {fileID: 114467433757248316}
14-
- component: {fileID: 135961771109985534}
1514
- component: {fileID: 108958489047367644}
1615
- component: {fileID: 114701158002484598}
17-
- component: {fileID: 54482902062701562}
1816
m_Layer: 14
1917
m_Name: ColdMissile
2018
m_TagString: Untagged
@@ -149,19 +147,6 @@ MonoBehaviour:
149147
PreviewIndex: 0
150148
PreviewID: 3
151149
PreviewClip: 0
152-
--- !u!135 &135961771109985534
153-
SphereCollider:
154-
m_ObjectHideFlags: 0
155-
m_CorrespondingSourceObject: {fileID: 0}
156-
m_PrefabInstance: {fileID: 0}
157-
m_PrefabAsset: {fileID: 0}
158-
m_GameObject: {fileID: 1770169996000996}
159-
m_Material: {fileID: 0}
160-
m_IsTrigger: 0
161-
m_Enabled: 1
162-
serializedVersion: 2
163-
m_Radius: 0.4
164-
m_Center: {x: 0, y: 0, z: 0}
165150
--- !u!108 &108958489047367644
166151
Light:
167152
m_ObjectHideFlags: 0
@@ -249,19 +234,3 @@ MonoBehaviour:
249234
PostImpactLifespanInSeconds: 0.6
250235
PostImpactLightMultiplier: 1.5
251236
ImpactSound: 90
252-
--- !u!54 &54482902062701562
253-
Rigidbody:
254-
m_ObjectHideFlags: 0
255-
m_CorrespondingSourceObject: {fileID: 0}
256-
m_PrefabInstance: {fileID: 0}
257-
m_PrefabAsset: {fileID: 0}
258-
m_GameObject: {fileID: 1770169996000996}
259-
serializedVersion: 2
260-
m_Mass: 1
261-
m_Drag: 0
262-
m_AngularDrag: 0.05
263-
m_UseGravity: 0
264-
m_IsKinematic: 0
265-
m_Interpolate: 0
266-
m_Constraints: 0
267-
m_CollisionDetection: 0

‎Assets/Prefabs/Missiles/FireMissile.prefab‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ GameObject:
1111
- component: {fileID: 4187251767156800}
1212
- component: {fileID: 82507643407150988}
1313
- component: {fileID: 114467433757248316}
14-
- component: {fileID: 135961771109985534}
1514
- component: {fileID: 108958489047367644}
1615
- component: {fileID: 114701158002484598}
17-
- component: {fileID: 54482902062701562}
1816
m_Layer: 14
1917
m_Name: FireMissile
2018
m_TagString: Untagged
@@ -149,19 +147,6 @@ MonoBehaviour:
149147
PreviewIndex: 0
150148
PreviewID: 3
151149
PreviewClip: 0
152-
--- !u!135 &135961771109985534
153-
SphereCollider:
154-
m_ObjectHideFlags: 0
155-
m_CorrespondingSourceObject: {fileID: 0}
156-
m_PrefabInstance: {fileID: 0}
157-
m_PrefabAsset: {fileID: 0}
158-
m_GameObject: {fileID: 1770169996000996}
159-
m_Material: {fileID: 0}
160-
m_IsTrigger: 0
161-
m_Enabled: 1
162-
serializedVersion: 2
163-
m_Radius: 0.4
164-
m_Center: {x: 0, y: 0, z: 0}
165150
--- !u!108 &108958489047367644
166151
Light:
167152
m_ObjectHideFlags: 0
@@ -249,19 +234,3 @@ MonoBehaviour:
249234
PostImpactLifespanInSeconds: 0.6
250235
PostImpactLightMultiplier: 1.5
251236
ImpactSound: 89
252-
--- !u!54 &54482902062701562
253-
Rigidbody:
254-
m_ObjectHideFlags: 0
255-
m_CorrespondingSourceObject: {fileID: 0}
256-
m_PrefabInstance: {fileID: 0}
257-
m_PrefabAsset: {fileID: 0}
258-
m_GameObject: {fileID: 1770169996000996}
259-
serializedVersion: 2
260-
m_Mass: 1
261-
m_Drag: 0
262-
m_AngularDrag: 0.05
263-
m_UseGravity: 0
264-
m_IsKinematic: 0
265-
m_Interpolate: 0
266-
m_Constraints: 0
267-
m_CollisionDetection: 0

‎Assets/Prefabs/Missiles/MagicMissile.prefab‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ GameObject:
1111
- component: {fileID: 4187251767156800}
1212
- component: {fileID: 82507643407150988}
1313
- component: {fileID: 114467433757248316}
14-
- component: {fileID: 135961771109985534}
1514
- component: {fileID: 108958489047367644}
1615
- component: {fileID: 114701158002484598}
17-
- component: {fileID: 54482902062701562}
1816
m_Layer: 14
1917
m_Name: MagicMissile
2018
m_TagString: Untagged
@@ -149,19 +147,6 @@ MonoBehaviour:
149147
PreviewIndex: 0
150148
PreviewID: 3
151149
PreviewClip: 0
152-
--- !u!135 &135961771109985534
153-
SphereCollider:
154-
m_ObjectHideFlags: 0
155-
m_CorrespondingSourceObject: {fileID: 0}
156-
m_PrefabInstance: {fileID: 0}
157-
m_PrefabAsset: {fileID: 0}
158-
m_GameObject: {fileID: 1770169996000996}
159-
m_Material: {fileID: 0}
160-
m_IsTrigger: 0
161-
m_Enabled: 1
162-
serializedVersion: 2
163-
m_Radius: 0.4
164-
m_Center: {x: 0, y: 0, z: 0}
165150
--- !u!108 &108958489047367644
166151
Light:
167152
m_ObjectHideFlags: 0
@@ -249,19 +234,3 @@ MonoBehaviour:
249234
PostImpactLifespanInSeconds: 0.6
250235
PostImpactLightMultiplier: 1.5
251236
ImpactSound: 86
252-
--- !u!54 &54482902062701562
253-
Rigidbody:
254-
m_ObjectHideFlags: 0
255-
m_CorrespondingSourceObject: {fileID: 0}
256-
m_PrefabInstance: {fileID: 0}
257-
m_PrefabAsset: {fileID: 0}
258-
m_GameObject: {fileID: 1770169996000996}
259-
serializedVersion: 2
260-
m_Mass: 1
261-
m_Drag: 0
262-
m_AngularDrag: 0.05
263-
m_UseGravity: 0
264-
m_IsKinematic: 0
265-
m_Interpolate: 0
266-
m_Constraints: 0
267-
m_CollisionDetection: 0

‎Assets/Prefabs/Missiles/PoisonMissile.prefab‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ GameObject:
1111
- component: {fileID: 4187251767156800}
1212
- component: {fileID: 82507643407150988}
1313
- component: {fileID: 114467433757248316}
14-
- component: {fileID: 135961771109985534}
1514
- component: {fileID: 108958489047367644}
1615
- component: {fileID: 114701158002484598}
17-
- component: {fileID: 54482902062701562}
1816
m_Layer: 14
1917
m_Name: PoisonMissile
2018
m_TagString: Untagged
@@ -149,19 +147,6 @@ MonoBehaviour:
149147
PreviewIndex: 0
150148
PreviewID: 3
151149
PreviewClip: 0
152-
--- !u!135 &135961771109985534
153-
SphereCollider:
154-
m_ObjectHideFlags: 0
155-
m_CorrespondingSourceObject: {fileID: 0}
156-
m_PrefabInstance: {fileID: 0}
157-
m_PrefabAsset: {fileID: 0}
158-
m_GameObject: {fileID: 1770169996000996}
159-
m_Material: {fileID: 0}
160-
m_IsTrigger: 0
161-
m_Enabled: 1
162-
serializedVersion: 2
163-
m_Radius: 0.4
164-
m_Center: {x: 0, y: 0, z: 0}
165150
--- !u!108 &108958489047367644
166151
Light:
167152
m_ObjectHideFlags: 0
@@ -249,19 +234,3 @@ MonoBehaviour:
249234
PostImpactLifespanInSeconds: 0.6
250235
PostImpactLightMultiplier: 1.5
251236
ImpactSound: 87
252-
--- !u!54 &54482902062701562
253-
Rigidbody:
254-
m_ObjectHideFlags: 0
255-
m_CorrespondingSourceObject: {fileID: 0}
256-
m_PrefabInstance: {fileID: 0}
257-
m_PrefabAsset: {fileID: 0}
258-
m_GameObject: {fileID: 1770169996000996}
259-
serializedVersion: 2
260-
m_Mass: 1
261-
m_Drag: 0
262-
m_AngularDrag: 0.05
263-
m_UseGravity: 0
264-
m_IsKinematic: 0
265-
m_Interpolate: 0
266-
m_Constraints: 0
267-
m_CollisionDetection: 0

‎Assets/Prefabs/Missiles/ShockMissile.prefab‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ GameObject:
1111
- component: {fileID: 4187251767156800}
1212
- component: {fileID: 82507643407150988}
1313
- component: {fileID: 114467433757248316}
14-
- component: {fileID: 135961771109985534}
1514
- component: {fileID: 108958489047367644}
1615
- component: {fileID: 114701158002484598}
17-
- component: {fileID: 54482902062701562}
1816
m_Layer: 14
1917
m_Name: ShockMissile
2018
m_TagString: Untagged
@@ -149,19 +147,6 @@ MonoBehaviour:
149147
PreviewIndex: 0
150148
PreviewID: 3
151149
PreviewClip: 0
152-
--- !u!135 &135961771109985534
153-
SphereCollider:
154-
m_ObjectHideFlags: 0
155-
m_CorrespondingSourceObject: {fileID: 0}
156-
m_PrefabInstance: {fileID: 0}
157-
m_PrefabAsset: {fileID: 0}
158-
m_GameObject: {fileID: 1770169996000996}
159-
m_Material: {fileID: 0}
160-
m_IsTrigger: 0
161-
m_Enabled: 1
162-
serializedVersion: 2
163-
m_Radius: 0.4
164-
m_Center: {x: 0, y: 0, z: 0}
165150
--- !u!108 &108958489047367644
166151
Light:
167152
m_ObjectHideFlags: 0
@@ -249,19 +234,3 @@ MonoBehaviour:
249234
PostImpactLifespanInSeconds: 0.6
250235
PostImpactLightMultiplier: 1.5
251236
ImpactSound: 88
252-
--- !u!54 &54482902062701562
253-
Rigidbody:
254-
m_ObjectHideFlags: 0
255-
m_CorrespondingSourceObject: {fileID: 0}
256-
m_PrefabInstance: {fileID: 0}
257-
m_PrefabAsset: {fileID: 0}
258-
m_GameObject: {fileID: 1770169996000996}
259-
serializedVersion: 2
260-
m_Mass: 1
261-
m_Drag: 0
262-
m_AngularDrag: 0.05
263-
m_UseGravity: 0
264-
m_IsKinematic: 0
265-
m_Interpolate: 0
266-
m_Constraints: 0
267-
m_CollisionDetection: 0

‎Assets/Resources/defaults.ini.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ QuestRumorWeight = 50
118118
DisableEnemyDeathAlert=False
119119
HideLoginName=False
120120

121+
[MeleeAttacks]
122+
MeleeAttackDetection=0
123+
MeleeAttackFriendlyProtection=True
124+
121125
[Spells]
122126
EnableSpellLighting=True
123127
EnableSpellShadows=True

0 commit comments

Comments
 (0)