Skip to content

Feature/unity 2021 #105

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 4 commits into from
Oct 24, 2022
Merged

Feature/unity 2021 #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
daaca79
fix: 2021 issues
brunomikoski Aug 17, 2022
749a01e
fix: #104
brunomikoski Oct 24, 2022
b9f9c3d
fix: meta files
brunomikoski Oct 24, 2022
729ff26
Update CHANGELOG.MD
brunomikoski Oct 24, 2022
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

# [1.9.2]
### Changed
- Fixed compatibility issues with Unity 2021
- Fixed Wizard settings been shared between multiple projects

# [1.9.1]
### Changed
- Fixed non editor builds issue
Expand Down Expand Up @@ -344,6 +349,7 @@ public bool IsValidConsumable(Consumable consumable)
- First initial working version


[1.9.2]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.9.2
[1.9.1]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.9.1
[1.9.0]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.9.0
[1.8.3]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.8.3
Expand Down
2 changes: 1 addition & 1 deletion Scripts/Editor/Core/CollectionCustomEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ private void OnClickToAddNewItem(Rect buttonRect, ReorderableList list)

private float GetCollectionItemHeight(int index)
{
if (itemHidden[index])
if (itemHidden == null || itemHidden[index])
return 0;

return Mathf.Max(
Expand Down
20 changes: 10 additions & 10 deletions Scripts/Editor/Wizzard/CreateCollectionWizard.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,33 +249,33 @@ private int MaximumNamespaceDepth
private static readonly EditorPreferenceBool FoldoutSettings =
new EditorPreferenceBool(FOLDOUT_SETTINGS_KEY, true);
private static readonly EditorPreferenceBool FoldoutScriptableObject =
new EditorPreferenceBool(FOLDOUT_SCRIPTABLE_OBJECT_KEY, false);
private static readonly EditorPreferenceBool FoldoutScript = new EditorPreferenceBool(FOLDOUT_SCRIPT_KEY, false);
new EditorPreferenceBool(FOLDOUT_SCRIPTABLE_OBJECT_KEY, false, true);
private static readonly EditorPreferenceBool FoldoutScript = new EditorPreferenceBool(FOLDOUT_SCRIPT_KEY, false, true);


private static readonly EditorPreferenceBool WaitingRecompileForContinue =
new EditorPreferenceBool(WAITING_SCRIPTS_TO_RECOMPILE_TO_CONTINUE_KEY);
new EditorPreferenceBool(WAITING_SCRIPTS_TO_RECOMPILE_TO_CONTINUE_KEY, false, true);

private static readonly EditorPreferenceString LastCollectionScriptableObjectPath =
new EditorPreferenceString(LAST_COLLECTION_SCRIPTABLE_OBJECT_PATH_KEY);
new EditorPreferenceString(LAST_COLLECTION_SCRIPTABLE_OBJECT_PATH_KEY, null, true);

private static readonly EditorPreferenceString LastCollectionFullName =
new EditorPreferenceString(LAST_COLLECTION_FULL_NAME_KEY);
new EditorPreferenceString(LAST_COLLECTION_FULL_NAME_KEY, null, true);

private static readonly EditorPreferenceString LastScriptsTargetFolder =
new EditorPreferenceString(LAST_TARGET_SCRIPTS_FOLDER_KEY);
new EditorPreferenceString(LAST_TARGET_SCRIPTS_FOLDER_KEY, null, true);

private static readonly EditorPreferenceString LastGeneratedCollectionScriptPath =
new EditorPreferenceString(LAST_GENERATED_COLLECTION_SCRIPT_PATH_KEY);
new EditorPreferenceString(LAST_GENERATED_COLLECTION_SCRIPT_PATH_KEY, null, true);

private static readonly EditorPreferenceBool CreateFolderForThisCollection =
new EditorPreferenceBool(CREATE_FOLDER_FOR_THIS_COLLECTION_KEY);
new EditorPreferenceBool(CREATE_FOLDER_FOR_THIS_COLLECTION_KEY, false, true);

private static readonly EditorPreferenceBool CreateFolderForThisCollectionScripts =
new EditorPreferenceBool(CREATE_FOLDER_FOR_THIS_COLLECTION_SCRIPTS_KEY);
new EditorPreferenceBool(CREATE_FOLDER_FOR_THIS_COLLECTION_SCRIPTS_KEY, false, true);

private static readonly EditorPreferenceString CollectionFormat =
new EditorPreferenceString(COLLECTION_FORMAT_KEY, COLLECTION_FORMAT_DEFAULT);
new EditorPreferenceString(COLLECTION_FORMAT_KEY, COLLECTION_FORMAT_DEFAULT, true);

private string cachedCollectionName = COLLECTION_NAME_DEFAULT;
private string CollectionName
Expand Down
2 changes: 1 addition & 1 deletion Scripts/Runtime/Utils/AssetDatabaseUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ public static void CreatePathIfDontExist(string targetPath)
public static void RenameAsset(Object targetObject, string newName)
{
#if UNITY_EDITOR
targetObject.name = newName;
UnityEditor.AssetDatabase.RenameAsset(UnityEditor.AssetDatabase.GetAssetPath(targetObject), newName);
targetObject.name = newName;
ObjectUtility.SetDirty(targetObject);
#endif
}
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.brunomikoski.scriptableobjectcollection",
"displayName": "Scriptable Object Collection",
"version": "1.9.1",
"version": "1.9.2",
"unity": "2018.4",
"description": "A library to help improve the usability of Unity3D Scriptable Objects by grouping then into a collection and exposing then by code or nice inspectors!",
"keywords": [
Expand Down