Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## Unreleased

### Fixes

- Fixed input handling in samples to work with old and new input system ([#2319](https://github.com/getsentry/sentry-unity/pull/2319))

## 4.0.0-beta.2

### Breaking Changes
Expand Down
103 changes: 36 additions & 67 deletions samples/unity-of-bugs/Assets/Scenes/1_BugFarm.unity
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,7 @@ LightmapSettings:
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_LightingSettings: {fileID: 4890085278179872738, guid: e33f8a423c67a41b3986b87acd178c6c,
type: 2}
m_LightingSettings: {fileID: 4890085278179872738, guid: e33f8a423c67a41b3986b87acd178c6c, type: 2}
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
Expand Down Expand Up @@ -850,34 +849,14 @@ GameObject:
m_Component:
- component: {fileID: 582054328}
- component: {fileID: 582054327}
- component: {fileID: 582054326}
- component: {fileID: 582054329}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &582054326
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 582054325}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
m_Name:
m_EditorClassIdentifier:
m_SendPointerHoverToParent: 1
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Submit
m_CancelButton: Cancel
m_InputActionsPerSecond: 10
m_RepeatDelay: 0.5
m_ForceModuleActive: 0
--- !u!114 &582054327
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -908,6 +887,18 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &582054329
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 582054325}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7c8b4d2a1e3f5a94b8c6d9e2f7a1b3c5, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Sentry.Unity.Samples.AutoInputModuleManager
--- !u!1 &650546334
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1340,113 +1331,91 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2718688665650588677, guid: fc6aa2b03d79e456baf50accbd54b55e,
type: 3}
- target: {fileID: 2718688665650588677, guid: fc6aa2b03d79e456baf50accbd54b55e, type: 3}
propertyPath: m_Name
value: SentryUserFeedback
objectReference: {fileID: 0}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e,
type: 3}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e, type: 3}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e,
type: 3}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e, type: 3}
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e,
type: 3}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e, type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e,
type: 3}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e,
type: 3}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e,
type: 3}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e,
type: 3}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e,
type: 3}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e,
type: 3}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e,
type: 3}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e,
type: 3}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e,
type: 3}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e,
type: 3}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e,
type: 3}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e,
type: 3}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e,
type: 3}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e,
type: 3}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e,
type: 3}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e,
type: 3}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e,
type: 3}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e,
type: 3}
- target: {fileID: 6765944082946837483, guid: fc6aa2b03d79e456baf50accbd54b55e, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
Expand Down
37 changes: 14 additions & 23 deletions samples/unity-of-bugs/Assets/Scenes/2_NativeSupport.unity
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,7 @@ LightmapSettings:
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_LightingSettings: {fileID: 4890085278179872738, guid: 0c713dadd8121476f9902e9da9b68229,
type: 2}
m_LightingSettings: {fileID: 4890085278179872738, guid: 0c713dadd8121476f9902e9da9b68229, type: 2}
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
Expand Down Expand Up @@ -1074,34 +1073,14 @@ GameObject:
m_Component:
- component: {fileID: 582054328}
- component: {fileID: 582054327}
- component: {fileID: 582054326}
- component: {fileID: 582054329}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &582054326
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 582054325}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
m_Name:
m_EditorClassIdentifier:
m_SendPointerHoverToParent: 1
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Submit
m_CancelButton: Cancel
m_InputActionsPerSecond: 10
m_RepeatDelay: 0.5
m_ForceModuleActive: 0
--- !u!114 &582054327
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1132,6 +1111,18 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &582054329
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 582054325}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7c8b4d2a1e3f5a94b8c6d9e2f7a1b3c5, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Sentry.Unity.Samples.AutoInputModuleManager
--- !u!1 &655484390
GameObject:
m_ObjectHideFlags: 0
Expand Down
37 changes: 14 additions & 23 deletions samples/unity-of-bugs/Assets/Scenes/3_AdditionalSamples.unity
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,7 @@ LightmapSettings:
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_LightingSettings: {fileID: 4890085278179872738, guid: 9fece16c6a2ff4a5f9cd1f554dcb3aae,
type: 2}
m_LightingSettings: {fileID: 4890085278179872738, guid: 9fece16c6a2ff4a5f9cd1f554dcb3aae, type: 2}
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
Expand Down Expand Up @@ -292,34 +291,14 @@ GameObject:
m_Component:
- component: {fileID: 582054328}
- component: {fileID: 582054327}
- component: {fileID: 582054326}
- component: {fileID: 582054329}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &582054326
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 582054325}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
m_Name:
m_EditorClassIdentifier:
m_SendPointerHoverToParent: 1
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Submit
m_CancelButton: Cancel
m_InputActionsPerSecond: 10
m_RepeatDelay: 0.5
m_ForceModuleActive: 0
--- !u!114 &582054327
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -350,6 +329,18 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &582054329
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 582054325}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7c8b4d2a1e3f5a94b8c6d9e2f7a1b3c5, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Sentry.Unity.Samples.AutoInputModuleManager
--- !u!1 &735359051
GameObject:
m_ObjectHideFlags: 0
Expand Down
Loading