Refresh package files

.npmignore

@@ -33,6 +33,7 @@ sysinfo.txt
 *.apk
 *.unitypackage
 /.vs
+*.gitmodules
 
 # UPM Build updates
 [Ee]xamples.meta

CHANGELOG.md

@@ -6,11 +6,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ## 2019.6 - 2.5 - Bug squash - 2021/05/10
 
-<<<<<<< HEAD
-It has been a while since the last update and although Unity keeps changing, thankfully the parts underneath do not.  Thanks to some awesome work by our contributors and the test teams, we made a run on some underlying bugs and issues.  If you spot anything else, please log it on the BitBucket site for resolution.
-=======
 Its been a while since the last update and although Unity keeps changing, thankfully the parts underneath do not.  THanks to some awesome work by our contributors and the test teams, we made a run on some underlying bugs and issues.  If you spot anything else, please log it on the BitBucket site for resolution.
->>>>>>> 383e19fb0512e6c4e942abb55d856a8578f1b76d
 
 > Be sure to logon to the new [Gitter Chat](https://gitter.im/Unity-UI-Extensions/Lobby) site for the UI Extensions project, if you have any questions, queries or suggestions
 >

README.md

@@ -68,61 +68,50 @@ To get started with the project, here's a little guide:
 
 ## [Updates:](https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/wiki/ReleaseNotes/RELEASENOTES)
 
-## Update 2019.5 - 2.3  - Accelerated Deployment
+## Maintenance release 2019.6 - 2.5 - Bug squash
+
+Its been a while since the last update and although Unity keeps changing, thankfully the parts underneath do not.  THanks to some awesome work by our contributors and the test teams, we made a run on some underlying bugs and issues.  If you spot anything else, please log it on the BitBucket site for resolution.
 
-Since the move to UPM, the team have been able to react quicker and push out fixes a lot easier, without affecting previous installation (whilst still adhering to Unity's backwards compatibility pattern).  So it is with great news we announce this new release, faster that ever :D  (and thanks to UPM, easier to upgrade than ever).
 Be sure to also check out the "Examples" option in the Package Manager window to import the samples to your project.
 
 > Be sure to logon to the new [Gitter Chat](https://gitter.im/Unity-UI-Extensions/Lobby) site for the UI Extensions project, if you have any questions, queries or suggestions
 >
 > Much easier that posting a question / issue on YouTube, Twitter or Facebook :D
 >
-> ## [UIExtensions Gitter Chanel](https://gitter.im/Unity-UI-Extensions/Lobby)
+> ## [UIExtensions Gitter Channel](https://gitter.im/Unity-UI-Extensions/Lobby)
 
 ### New / updated features
 
-* Add squircle primitive
+- Updated UI Line connector to use relative position instead of anchored position to verify if the Lines need updating.
-* Adding new magnetic scroll control
+- Allow menu prefabs to not have to have canvas components. This allows you to use any type of prefab as a "menu". Adam Kapos mentions the concept on the Unite talk, https://youtu.be/wbmjturGbAQ?t=1654
-* Added a static library to collate shaders on first use.
+- Updated segment line drawing for Line Lists. Seems Unity no longer needs UV's to be wrapped manually.
-* Finalized new InputManagerHelper, which translates input based on the operating input system, new or old Updated CardStack2D to have defined keyboard input or specific gamepad input over the older axisname for new input system.
+- Updated the AutoCompleteComboBox to display text as entered (instead of all lowercase)
-* Examples now included with UPM delivery and available as a button on the UPM package manager window
+- Updated the ComboBox to display text as entered (instead of all lowercase)
-* Updated DropDown and Autocomplete controls based on feedback in #204
+- Updated ComboBox Examples to include programmatic versions
-* Updated Accordion to support both Vertical as well as Horizontal layout
+- Further ComboBox improvements including:
-* Updated ComboBox controls to improve better programmatic controls
+  * Upwards panel
-* Updates to the Infinite scroll to support content of various sizes
+  * Start fixes
-* Updated UI Knob control - enabled dragging outside the target area, added example scene
+  * Item Template resize
-* Minor update to MagneticInfinite Scroll
+  * Disabled sorting on combobox as it wasn't working
-* Refactored and extended the ContentScrollSnap control
+  * Disabled Slider handle when not in use
-* Added protection against errors and empty scrollrect content
+  * Updated Example
-* Added new SetNewItems function to add children programmatically to the control and reset accordingly
+- Updated the new Input system switch and tested against 2021
-* Patch supplied by a contributor to improve the texture sheet use with the UIParticlesystem
-* Added "SetKnobValue" function which allows the setting of Value and loops
-* Added the programmatic capability to change the parent scroll rect on the ScrollConflictManager at runtime.
 
 ### Examples / Examples / Examples
 
-Examples now have their own package, this simplifies their use and deployment. Especially in 2019 with the UPM deployment.
+Examples can be found either in the UPM package manager window or via the extra downloadable UnityAsset from the Bitbucket site - https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/wiki/Downloads
-
-* New UI Knob examples
-* New Magnetic Scroll Example
-* Updated ComboBox examples for programmatic testing
 
 ### Fixes
 
-* Fix to add a "RequireComponent" to Primitives as Unity 2020 does not add them by default
+- Reordering issue resolved with ScrollRectOcclusion.
-* Remove old Examples submodule
+- Fixed Sorting at min and max positions for ScrollRect
-* Updated submodules to hide Examples folder Additionally, updated Package manifest to allow importing of examples direct from UPM package.
+- Updated ScrollToSelect script provided by zero3growlithe, tested and vastly reduces the previous jitter. Still present but barely noticeable now.
-* Fixed hard swipe to ensure it only ever moves one page, no matter how far you swipe.
+- Fixed Issue # 363 Update Combobox control that takes multiple items programmatically, to only allow distinct items
-* Fixed a conflict when using the ScrollConflictManager in child content of a HSS or VSS
+- Fixed the issues where dragging outside the range slider handle causes the range to update. - Resolves #369
-* Fix for UI Particle system looping
+- Resolves an issue with Unity putting the previous controls vertex array in an uninitialised control.
-* Fixed public GoToScreen call to only raise events internally (not multiple)
+- Applied J.R. Mitchell's fix for the Accordion Controls/Accordion/AccordionElement.cs - resolves: #364
-* Final roll-up and fix. Resolved race condition for associated pagination controls.
+- Resolved issue where the Content Scroll snap issue with only 1 child. Resolves #362
-* Fixed issue with page events not being raised when inertia was disabled (velocity was always zero)
+- Updated the PaginationManager to override if the ScrollSnap is in motion.
-* When cloned, reorderable list was creating a second List Content component that was not initialized. Refactored to ensure only one list content was present and is initialized correctly
-* Reorderable list items marked as transferable, remain transferable after being dropped
-* Patch to resolve issues without the new Input System installed
-* Refined magnetic scroll and dependencies while documenting Updated example
-* Patch Tooltip
 
 ### Known issues
 
@@ -132,9 +121,7 @@ No new issues in this release, but check the issues list for things we are curre
 
 ## Upgrade Notes
 
-Due to the restructure of the package to meet Unity's new package guidelines, we recommend **Deleting the current Unity UI Extensions** folder prior to importing the new package.
+We recommend using the UPM delivery method. If you are using the Unity asset, there should be no issues updating but if you have a problem, just deleted the old Unity-UI-Extensions folder and import the asset new.
-
-For Unity 2019 users using the new UPM deployment, be sure to delete the existing folder in your assets folder before adding the new package to avoid conflict.
 
 -----
 
@@ -159,7 +146,7 @@ There are almost 70+ extension controls / effect and other utilities in the proj
 ## [UI Extensions controls list](https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/wiki/Controls)
 
 [Controls](https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/wiki/Controls#markdown-header-controls)|||||
-------|------|------|------|
+------|------|------|------|------|
 Accordion|ColorPicker|Selection Box|UI Flippable|ComboBox
 AutoComplete ComboBox|DropDown List|BoundToolTip|UIWindowBase|UI Knob
 TextPic|Input Focus|Box Slider|Cooldown Button|Segmented Control
@@ -167,27 +154,27 @@ Stepper|Range Slider|Radial Slider|MultiTouch Scroll Rect|
 ||||
 
 [Primitives](https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/wiki/Controls#markdown-header-primitives)|||||
-------|------|------|------|
+------|------|------|------|------|
 UILineRenderer|UILineTextureRenderer|UICircle|DiamondGraph|UICornerCut
 UIPolygon||||
 ||||
 
 [Layouts](https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/wiki/Controls#markdown-header-layouts)|||||
-------|------|------|------|
+------|------|------|------|------|
 Horizontal Scroll Snap|Vertical Scroll Snap|Flow Layout Group|Radial Layout|Tile Size Fitter
 Scroll Snap (alt implementation)|Reorderable List|UI Vertical Scroller|Curved Layout|Table Layout
 FancyScrollView|Card UI|Scroll Position Controller||
 ||||
 
 [Effects](https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/wiki/Controls#markdown-header-effect_components)|||||
-------|------|------|------|
+------|------|------|------|------|
 Best Fit Outline|Curved Text|Gradient|Gradient2|Letter Spacing
 NicerOutline|RaycastMask|UIFlippable|UIImageCrop|SoftAlphaMask
 CylinderText|UIParticleSystem|CurlyUI|Shine Effect|Shader Effects
 ||||
 
 [Additional Components](https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/wiki/Controls#markdown-header-additional_components)|||||
-------|------|------|------|
+------|------|------|------|------|
 ReturnKeyTrigger|TabNavigation|uGUITools|ScrollRectTweener|ScrollRectLinker
 ScrollRectEx|UI_InfiniteScroll|UI_ScrollRectOcclusion|UIScrollToSelection|UISelectableExtension
 switchToRectTransform|ScrollConflictManager|CLFZ2 (Encryption)|DragCorrector|PPIViewer
@@ -218,9 +205,9 @@ Got a script you want added? Then just fork the bitbucket repository and submit
 
 Just ensure:
 
-* The header of the script should match the standard used in all scripts
+* The header of the script should match the standard used in all scripts.
-* The script uses the **Unity.UI.Extensions** namespace so they do not affect any other developments
+* The script uses the **Unity.UI.Extensions** namespace so they do not affect any other developments.
-* (optional) Add Component and Editor options where possible (editor options are in the Editor\UIExtensionsMenuOptions.cs file)
+* (optional) Add Component and Editor options where possible. (editor options are in the Editor\UIExtensionsMenuOptions.cs file)
 
 ## [License](https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/wiki/License)
 

package.json

@@ -1,14 +1,14 @@
 {
   "name": "com.unity.uiextensions",
   "displayName": "Unity UI Extensions",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "description": "An extension project for the Unity3D UI system, all crafted and contributed by the awesome Unity community",
   "author": "Simon darkside Jackson <@SimonDarksideJ>",
   "contributors": [{
   "name": "SimonDarksideJ",
   "twitter": "@SimonDarksideJ"
 }],
-  "unity": "2019.3",
+  "unity": "2019.4",
   "repository": {
   "type": "git",
   "url": "git+https://bitbucket.org/UnityUIExtensions/unity-ui-extensions.git"