diff --git a/Assets/SimpleMinMaxSlider/Scripts/Editor.meta b/Assets/SimpleMinMaxSlider/Editor.meta similarity index 100% rename from Assets/SimpleMinMaxSlider/Scripts/Editor.meta rename to Assets/SimpleMinMaxSlider/Editor.meta diff --git a/Assets/SimpleMinMaxSlider/Scripts/Editor/MinMaxSliderDrawer.cs b/Assets/SimpleMinMaxSlider/Editor/MinMaxSliderDrawer.cs similarity index 97% rename from Assets/SimpleMinMaxSlider/Scripts/Editor/MinMaxSliderDrawer.cs rename to Assets/SimpleMinMaxSlider/Editor/MinMaxSliderDrawer.cs index 6b53eab..0f1614f 100644 --- a/Assets/SimpleMinMaxSlider/Scripts/Editor/MinMaxSliderDrawer.cs +++ b/Assets/SimpleMinMaxSlider/Editor/MinMaxSliderDrawer.cs @@ -61,10 +61,10 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten minMaxAttribute.min,minMaxAttribute.max); if(minVal < minMaxAttribute.min){ - maxVal = minMaxAttribute.min; + minVal = minMaxAttribute.min; } - if(minVal > minMaxAttribute.max){ + if(maxVal > minMaxAttribute.max){ maxVal = minMaxAttribute.max; } diff --git a/Assets/SimpleMinMaxSlider/Scripts/Editor/MinMaxSliderDrawer.cs.meta b/Assets/SimpleMinMaxSlider/Editor/MinMaxSliderDrawer.cs.meta similarity index 100% rename from Assets/SimpleMinMaxSlider/Scripts/Editor/MinMaxSliderDrawer.cs.meta rename to Assets/SimpleMinMaxSlider/Editor/MinMaxSliderDrawer.cs.meta diff --git a/Assets/SimpleMinMaxSlider/Editor/SimpleMinMaxSlider.Editor.asmdef b/Assets/SimpleMinMaxSlider/Editor/SimpleMinMaxSlider.Editor.asmdef new file mode 100644 index 0000000..36d0ca7 --- /dev/null +++ b/Assets/SimpleMinMaxSlider/Editor/SimpleMinMaxSlider.Editor.asmdef @@ -0,0 +1,17 @@ +{ + "name": "SimpleMinMaxSlider.Editor", + "references": [ + "GUID:4099e5319e98558428028d54bc62664e" + ], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/SimpleMinMaxSlider/Editor/SimpleMinMaxSlider.Editor.asmdef.meta b/Assets/SimpleMinMaxSlider/Editor/SimpleMinMaxSlider.Editor.asmdef.meta new file mode 100644 index 0000000..d424928 --- /dev/null +++ b/Assets/SimpleMinMaxSlider/Editor/SimpleMinMaxSlider.Editor.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 996382cd14154894c8a452523295de56 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SimpleMinMaxSlider/Scripts.meta b/Assets/SimpleMinMaxSlider/Runtime.meta similarity index 77% rename from Assets/SimpleMinMaxSlider/Scripts.meta rename to Assets/SimpleMinMaxSlider/Runtime.meta index ae703f7..e808a5f 100644 --- a/Assets/SimpleMinMaxSlider/Scripts.meta +++ b/Assets/SimpleMinMaxSlider/Runtime.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f4be9f6fb652f19488b46fbc9bac8be5 +guid: b3cab51dae6795541ad62fc20ebab25f folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/SimpleMinMaxSlider/Scripts/MinMaxSliderAttribute.cs b/Assets/SimpleMinMaxSlider/Runtime/MinMaxSliderAttribute.cs similarity index 100% rename from Assets/SimpleMinMaxSlider/Scripts/MinMaxSliderAttribute.cs rename to Assets/SimpleMinMaxSlider/Runtime/MinMaxSliderAttribute.cs diff --git a/Assets/SimpleMinMaxSlider/Scripts/MinMaxSliderAttribute.cs.meta b/Assets/SimpleMinMaxSlider/Runtime/MinMaxSliderAttribute.cs.meta similarity index 100% rename from Assets/SimpleMinMaxSlider/Scripts/MinMaxSliderAttribute.cs.meta rename to Assets/SimpleMinMaxSlider/Runtime/MinMaxSliderAttribute.cs.meta diff --git a/Assets/SimpleMinMaxSlider/SimpleMinMaxSlider.asmdef b/Assets/SimpleMinMaxSlider/Runtime/SimpleMinMaxSlider.asmdef similarity index 100% rename from Assets/SimpleMinMaxSlider/SimpleMinMaxSlider.asmdef rename to Assets/SimpleMinMaxSlider/Runtime/SimpleMinMaxSlider.asmdef diff --git a/Assets/SimpleMinMaxSlider/SimpleMinMaxSlider.asmdef.meta b/Assets/SimpleMinMaxSlider/Runtime/SimpleMinMaxSlider.asmdef.meta similarity index 100% rename from Assets/SimpleMinMaxSlider/SimpleMinMaxSlider.asmdef.meta rename to Assets/SimpleMinMaxSlider/Runtime/SimpleMinMaxSlider.asmdef.meta diff --git a/Logs/Packages-Update.log b/Logs/Packages-Update.log index 5240b05..48ae445 100644 --- a/Logs/Packages-Update.log +++ b/Logs/Packages-Update.log @@ -29,3 +29,12 @@ The following packages were updated: com.unity.timeline from version 1.1.0 to 1.2.9 The following packages were removed: com.unity.package-manager-ui@2.2.0 + +=== Fri Sep 25 09:32:24 2020 + +Packages were changed. +Update Mode: updateDependencies + +The following packages were updated: + com.unity.ide.vscode from version 1.1.3 to 1.1.4 + com.unity.test-framework from version 1.1.9 to 1.1.13 diff --git a/Packages/manifest.json b/Packages/manifest.json index 9d99bb1..f03ba34 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -5,8 +5,8 @@ "com.unity.collab-proxy": "1.2.16", "com.unity.ext.nunit": "1.0.0", "com.unity.ide.rider": "1.1.4", - "com.unity.ide.vscode": "1.1.3", - "com.unity.test-framework": "1.1.9", + "com.unity.ide.vscode": "1.1.4", + "com.unity.test-framework": "1.1.13", "com.unity.textmeshpro": "2.0.1", "com.unity.timeline": "1.2.9", "com.unity.ugui": "1.0.0", diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 4d3ac50..1c8f32f 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.3.0f5 -m_EditorVersionWithRevision: 2019.3.0f5 (44796c9d3c2c) +m_EditorVersion: 2019.3.10f1 +m_EditorVersionWithRevision: 2019.3.10f1 (5968d7f82152) diff --git a/README.md b/README.md index 1ccf284..b561bc3 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ 1. Open package manager 2. Add package from git URL - 3. Paste: https://github.com/GucioDevs/SimpleMinMaxSlider.git#upm (remember the #upm at the end) + 3. Paste: https://github.com/Adamcbrz/SimpleMinMaxSlider.git#upm (remember the #upm at the end) 4. Let Unity do its thing 5. Done. diff --git a/SimpleMinMaxSlider.unitypackage b/SimpleMinMaxSlider.unitypackage index 2830e7e..66c8346 100644 Binary files a/SimpleMinMaxSlider.unitypackage and b/SimpleMinMaxSlider.unitypackage differ