Skip to content

Raycast look-ahead for projectiles and Bounding Box-based weapon collision + fixes and optimizations. #2781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KABoissonneault merged 8 commits into from
Jun 9, 2026
Merged

Raycast look-ahead for projectiles and Bounding Box-based weapon collision + fixes and optimizations. #2781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
85bcb6b
Implemented PR #2472 as is. Additionally "Ignore Raycast" is now excl…
RedRoryOTheGlen Mar 31, 2026
1da9ef3
Revised layer mask initialization so it only happens once. Applied la…
RedRoryOTheGlen Mar 31, 2026
a581e30
Fixed arrow model offset from center of projectile object to align it…
RedRoryOTheGlen Mar 31, 2026
9b8496c
Incorporated optimizations to DaggerfallMissile and WeaponManager fro…
RedRoryOTheGlen Mar 31, 2026
59e1893
Fixed an oversight from #2472 that caused missiles with null caster t…
RedRoryOTheGlen Apr 1, 2026
ce65618
Added a public static method to DaggerfallMissile allowing external c…
RedRoryOTheGlen Apr 5, 2026
a9658d4
Implemented bounding box-based weapon collision. Added settings to Ad…
RedRoryOTheGlen Apr 7, 2026
bc15e39
Implemented radial weapon reach into the LOS check. Restructured the …
RedRoryOTheGlen Jun 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions Assets/Localization/StringTables/Internal_Settings Shared Data.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,18 @@ MonoBehaviour:
m_Key: textureArrayInfo
m_Metadata:
m_Items: []
- m_Id: 392878225761951744
m_Key: meleeAttackDetectionModes
m_Metadata:
m_Items: []
- m_Id: 392920400377864192
m_Key: meleeAttackDetection
m_Metadata:
m_Items: []
- m_Id: 392920453876211712
m_Key: meleeAttackFriendlyProtection
m_Metadata:
m_Items: []
m_Metadata:
m_Items: []
m_KeyGenerator:
Expand Down
14 changes: 14 additions & 0 deletions Assets/Localization/StringTables/Internal_Settings_en.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,5 +236,19 @@ MonoBehaviour:
and modding support
m_Metadata:
m_Items: []
- m_Id: 392878225761951744
m_Localized: 'Performance

Quality'
m_Metadata:
m_Items: []
- m_Id: 392920400377864192
m_Localized: Hit Detection
m_Metadata:
m_Items: []
- m_Id: 392920453876211712
m_Localized: Protect Friendlies and Neutrals
m_Metadata:
m_Items: []
references:
version: 1
46 changes: 0 additions & 46 deletions Assets/Prefabs/Missiles/ArrowMissile.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,8 @@ GameObject:
- component: {fileID: 4928002457579466}
- component: {fileID: 82343321333735398}
- component: {fileID: 114835290752812540}
- component: {fileID: 135236093773449130}
- component: {fileID: 108732554255048532}
- component: {fileID: 114624404217668130}
- component: {fileID: 54102960107042576}
- component: {fileID: 64298782196861766}
m_Layer: 14
m_Name: ArrowMissile
m_TagString: Untagged
Expand Down Expand Up @@ -150,19 +147,6 @@ MonoBehaviour:
PreviewIndex: 0
PreviewID: 3
PreviewClip: 0
--- !u!135 &135236093773449130
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1712884651827938}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 0
serializedVersion: 2
m_Radius: 0.4
m_Center: {x: 0, y: 0, z: 0}
--- !u!108 &108732554255048532
Light:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -250,33 +234,3 @@ MonoBehaviour:
PostImpactLifespanInSeconds: 0.6
PostImpactLightMultiplier: 1.5
ImpactSound: 4
--- !u!54 &54102960107042576
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1712884651827938}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 0
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!64 &64298782196861766
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1712884651827938}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 0
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 0}
31 changes: 0 additions & 31 deletions Assets/Prefabs/Missiles/ColdMissile.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ GameObject:
- component: {fileID: 4187251767156800}
- component: {fileID: 82507643407150988}
- component: {fileID: 114467433757248316}
- component: {fileID: 135961771109985534}
- component: {fileID: 108958489047367644}
- component: {fileID: 114701158002484598}
- component: {fileID: 54482902062701562}
m_Layer: 14
m_Name: ColdMissile
m_TagString: Untagged
Expand Down Expand Up @@ -149,19 +147,6 @@ MonoBehaviour:
PreviewIndex: 0
PreviewID: 3
PreviewClip: 0
--- !u!135 &135961771109985534
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1770169996000996}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.4
m_Center: {x: 0, y: 0, z: 0}
--- !u!108 &108958489047367644
Light:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -249,19 +234,3 @@ MonoBehaviour:
PostImpactLifespanInSeconds: 0.6
PostImpactLightMultiplier: 1.5
ImpactSound: 90
--- !u!54 &54482902062701562
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1770169996000996}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 0
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
31 changes: 0 additions & 31 deletions Assets/Prefabs/Missiles/FireMissile.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ GameObject:
- component: {fileID: 4187251767156800}
- component: {fileID: 82507643407150988}
- component: {fileID: 114467433757248316}
- component: {fileID: 135961771109985534}
- component: {fileID: 108958489047367644}
- component: {fileID: 114701158002484598}
- component: {fileID: 54482902062701562}
m_Layer: 14
m_Name: FireMissile
m_TagString: Untagged
Expand Down Expand Up @@ -149,19 +147,6 @@ MonoBehaviour:
PreviewIndex: 0
PreviewID: 3
PreviewClip: 0
--- !u!135 &135961771109985534
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1770169996000996}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.4
m_Center: {x: 0, y: 0, z: 0}
--- !u!108 &108958489047367644
Light:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -249,19 +234,3 @@ MonoBehaviour:
PostImpactLifespanInSeconds: 0.6
PostImpactLightMultiplier: 1.5
ImpactSound: 89
--- !u!54 &54482902062701562
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1770169996000996}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 0
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
31 changes: 0 additions & 31 deletions Assets/Prefabs/Missiles/MagicMissile.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ GameObject:
- component: {fileID: 4187251767156800}
- component: {fileID: 82507643407150988}
- component: {fileID: 114467433757248316}
- component: {fileID: 135961771109985534}
- component: {fileID: 108958489047367644}
- component: {fileID: 114701158002484598}
- component: {fileID: 54482902062701562}
m_Layer: 14
m_Name: MagicMissile
m_TagString: Untagged
Expand Down Expand Up @@ -149,19 +147,6 @@ MonoBehaviour:
PreviewIndex: 0
PreviewID: 3
PreviewClip: 0
--- !u!135 &135961771109985534
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1770169996000996}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.4
m_Center: {x: 0, y: 0, z: 0}
--- !u!108 &108958489047367644
Light:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -249,19 +234,3 @@ MonoBehaviour:
PostImpactLifespanInSeconds: 0.6
PostImpactLightMultiplier: 1.5
ImpactSound: 86
--- !u!54 &54482902062701562
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1770169996000996}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 0
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
31 changes: 0 additions & 31 deletions Assets/Prefabs/Missiles/PoisonMissile.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ GameObject:
- component: {fileID: 4187251767156800}
- component: {fileID: 82507643407150988}
- component: {fileID: 114467433757248316}
- component: {fileID: 135961771109985534}
- component: {fileID: 108958489047367644}
- component: {fileID: 114701158002484598}
- component: {fileID: 54482902062701562}
m_Layer: 14
m_Name: PoisonMissile
m_TagString: Untagged
Expand Down Expand Up @@ -149,19 +147,6 @@ MonoBehaviour:
PreviewIndex: 0
PreviewID: 3
PreviewClip: 0
--- !u!135 &135961771109985534
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1770169996000996}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.4
m_Center: {x: 0, y: 0, z: 0}
--- !u!108 &108958489047367644
Light:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -249,19 +234,3 @@ MonoBehaviour:
PostImpactLifespanInSeconds: 0.6
PostImpactLightMultiplier: 1.5
ImpactSound: 87
--- !u!54 &54482902062701562
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1770169996000996}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 0
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
31 changes: 0 additions & 31 deletions Assets/Prefabs/Missiles/ShockMissile.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ GameObject:
- component: {fileID: 4187251767156800}
- component: {fileID: 82507643407150988}
- component: {fileID: 114467433757248316}
- component: {fileID: 135961771109985534}
- component: {fileID: 108958489047367644}
- component: {fileID: 114701158002484598}
- component: {fileID: 54482902062701562}
m_Layer: 14
m_Name: ShockMissile
m_TagString: Untagged
Expand Down Expand Up @@ -149,19 +147,6 @@ MonoBehaviour:
PreviewIndex: 0
PreviewID: 3
PreviewClip: 0
--- !u!135 &135961771109985534
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1770169996000996}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.4
m_Center: {x: 0, y: 0, z: 0}
--- !u!108 &108958489047367644
Light:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -249,19 +234,3 @@ MonoBehaviour:
PostImpactLifespanInSeconds: 0.6
PostImpactLightMultiplier: 1.5
ImpactSound: 88
--- !u!54 &54482902062701562
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1770169996000996}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 0
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
4 changes: 4 additions & 0 deletions Assets/Resources/defaults.ini.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@ QuestRumorWeight = 50
DisableEnemyDeathAlert=False
HideLoginName=False

[MeleeAttacks]
MeleeAttackDetection=0
MeleeAttackFriendlyProtection=True

[Spells]
EnableSpellLighting=True
EnableSpellShadows=True
Expand Down
Loading