Skip to content

Add conditional localization import #10

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
merged 3 commits into from
Oct 15, 2021
Merged

Add conditional localization import #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24f4b29
Add conditional localization import
riina Apr 9, 2021
123bdf0
Mark v1.2.0-preview.0 (unlikely name)
riina Sep 14, 2021
443811a
Adjust version to 1.2.1-preview.0
riina Sep 25, 2021
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this package will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [1.2.1-preview.0] - 2021-9-14
### Changed
- Added *conditional* localization attribute definition. Fixes editor script import on 2020.3 while preserving functions on 2019.4.

## [1.1.0] - 2019-10-31
*This is the first version of UnityChan Spring Bone in the package form.*

Expand Down
6 changes: 5 additions & 1 deletion Editor/AssmblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
using UnityEditor.Localization.Editor;
#if UNITY_2020_1_OR_NEWER
using Localization = UnityEditor.LocalizationAttribute;
#else
using Localization = UnityEditor.Localization.Editor.LocalizationAttribute;
#endif

[assembly: Localization]
6 changes: 5 additions & 1 deletion Editor/AutoSpringBoneSetup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
using System.Linq;
using UnityEditor;
using UnityEngine;
using UnityEditor.Localization.Editor;
#if UNITY_2020_2_OR_NEWER
using Localization = UnityEditor.L10n;
#else
using Localization = UnityEditor.Localization.Editor.Localization;
#endif

namespace Unity.Animations.SpringBones
{
Expand Down
6 changes: 5 additions & 1 deletion Editor/GUI/Windows/LoadSpringBoneSetupWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
using System.Linq;
using UnityEditor;
using UnityEngine;
using UnityEditor.Localization.Editor;
#if UNITY_2020_2_OR_NEWER
using Localization = UnityEditor.L10n;
#else
using Localization = UnityEditor.Localization.Editor.Localization;
#endif

namespace Unity.Animations.SpringBones
{
Expand Down
6 changes: 5 additions & 1 deletion Editor/GUI/Windows/MirrorSpringBoneWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
using UnityEditor;
using UnityEngine;
using Unity.Animations.SpringBones.GameObjectExtensions;
using UnityEditor.Localization.Editor;
#if UNITY_2020_2_OR_NEWER
using Localization = UnityEditor.L10n;
#else
using Localization = UnityEditor.Localization.Editor.Localization;
#endif

namespace Unity.Animations.SpringBones
{
Expand Down
6 changes: 5 additions & 1 deletion Editor/GUI/Windows/SaveSpringBoneSetupWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
using System.Linq;
using UnityEditor;
using UnityEngine;
using UnityEditor.Localization.Editor;
#if UNITY_2020_2_OR_NEWER
using Localization = UnityEditor.L10n;
#else
using Localization = UnityEditor.Localization.Editor.Localization;
#endif

namespace Unity.Animations.SpringBones
{
Expand Down
6 changes: 5 additions & 1 deletion Editor/GUI/Windows/SpringBoneSetupErrorWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
using System.Linq;
using UnityEditor;
using UnityEngine;
using UnityEditor.Localization.Editor;
#if UNITY_2020_2_OR_NEWER
using Localization = UnityEditor.L10n;
#else
using Localization = UnityEditor.Localization.Editor.Localization;
#endif

namespace Unity.Animations.SpringBones
{
Expand Down
6 changes: 5 additions & 1 deletion Editor/GUI/Windows/SpringBoneWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
using Unity.Collections;
using UnityEditor;
using UnityEngine;
using UnityEditor.Localization.Editor;
#if UNITY_2020_2_OR_NEWER
using Localization = UnityEditor.L10n;
#else
using Localization = UnityEditor.Localization.Editor.Localization;
#endif

namespace Unity.Animations.SpringBones
{
Expand Down
6 changes: 5 additions & 1 deletion Editor/SpringBoneEditorActions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
using System.Linq;
using UnityEditor;
using UnityEngine;
using UnityEditor.Localization.Editor;
#if UNITY_2020_2_OR_NEWER
using Localization = UnityEditor.L10n;
#else
using Localization = UnityEditor.Localization.Editor.Localization;
#endif

namespace Unity.Animations.SpringBones
{
Expand Down
6 changes: 5 additions & 1 deletion Editor/SpringColliderEditorActions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
using System.Linq;
using UnityEditor;
using UnityEngine;
using UnityEditor.Localization.Editor;
#if UNITY_2020_2_OR_NEWER
using Localization = UnityEditor.L10n;
#else
using Localization = UnityEditor.Localization.Editor.Localization;
#endif

namespace Unity.Animations.SpringBones
{
Expand Down
6 changes: 5 additions & 1 deletion Editor/Utility/FindGameObjectsWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
using System.Linq;
using UnityEditor;
using UnityEngine;
using UnityEditor.Localization.Editor;
#if UNITY_2020_2_OR_NEWER
using Localization = UnityEditor.L10n;
#else
using Localization = UnityEditor.Localization.Editor.Localization;
#endif

namespace Unity.Animations.SpringBones
{
Expand Down
6 changes: 5 additions & 1 deletion Editor/Utility/SetObjectParentWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
using System.Linq;
using UnityEditor;
using UnityEngine;
using UnityEditor.Localization.Editor;
#if UNITY_2020_2_OR_NEWER
using Localization = UnityEditor.L10n;
#else
using Localization = UnityEditor.Localization.Editor.Localization;
#endif

namespace Unity.Animations.SpringBones
{
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "com.unity.springbone",
"displayName": "Unity Chan Spring Bone",
"version": "1.2.0-preview",
"version": "1.2.1-preview.0",
"unity": "2019.4",
"description": "Sping Bone System for lightweight secondary animations.",
"keywords": ["animation"],
Expand Down