Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
0c77ea4
Fixed enabling all action maps for project wide actions overrides pla…
ritamerkl Feb 21, 2025
f6480e7
added changelog
ritamerkl Feb 21, 2025
d9e3b6a
added nullcheck
ritamerkl Feb 24, 2025
6afc84a
changed to duplicate actions for playerinput instead of using project…
ritamerkl Feb 24, 2025
2029be3
Merge branch 'develop' into fix-project-wide-actions-override-playeri…
ritamerkl Feb 24, 2025
98dec35
always duplicate action assets for PlayerInput to avoid manipulating …
ritamerkl Feb 24, 2025
4f64381
undo editing test
ritamerkl Feb 24, 2025
ae27089
reset
ritamerkl Feb 24, 2025
1655b7f
always duplicate PlayerInput action assets and removed redundant pjwd…
ritamerkl Feb 25, 2025
b05b5e8
fix tests and copying of asset
ritamerkl Feb 27, 2025
acf6225
revert deleting comment
ritamerkl Feb 27, 2025
9c6cda3
added comment
ritamerkl Feb 27, 2025
67002de
adjusted copying of asset to work for prefabs too
ritamerkl Feb 28, 2025
0e4b64b
disabling all maps is not necessary anymore with copy
ritamerkl Feb 28, 2025
8fab5a9
added new test to proof the first PlayerInput ActionAsset is copied
ritamerkl Feb 28, 2025
55b7d71
Merge branch 'develop' into fix-project-wide-actions-override-playeri…
ritamerkl Feb 28, 2025
ce0a9a5
renamed copy function
ritamerkl Feb 28, 2025
805f0d9
Merge branch 'develop' into fix-project-wide-actions-override-playeri…
ritamerkl Feb 28, 2025
93a4c69
enable actions on entered playmode
ritamerkl Mar 3, 2025
53a0e98
Merge branch 'develop' into fix-project-wide-actions-override-playeri…
ritamerkl Mar 3, 2025
9654ffd
Merge branch 'develop' into fix-project-wide-actions-override-playeri…
ritamerkl Mar 4, 2025
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
3 changes: 3 additions & 0 deletions Packages/com.unity.inputsystem/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ however, it has to be formatted properly to pass verification tests.

## [Unreleased] - yyyy-mm-dd

### Fixed
- Fixed an issue where all action maps were enabled initially for project wide actions, which overrode the PlayerInput action map configuration. [ISXB-920](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-920)

## [1.13.1] - 2025-02-18

### Fixed
Expand Down
3 changes: 2 additions & 1 deletion Packages/com.unity.inputsystem/InputSystem/InputSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3035,7 +3035,8 @@ private static void EnableActions()
if (actions == null)
return;

actions.Enable();
if (!actions.enabled)
actions.Enable();
}

private static void DisableActions(bool triggerSetupChanged = false)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -954,6 +954,10 @@ public void ActivateInput()

m_InputActive = true;

// reset state to default, only one action map is enabled at the initial state
// Project wide actions may have enabled action maps
actions.Disable();

// If we have no current action map but there's a default
// action map, make it current.
if (m_CurrentActionMap == null && m_Actions != null && !string.IsNullOrEmpty(m_DefaultActionMap))
Expand Down