Commit Graph

722 Commits (4ffa6310591715f740b84af43a7cc33a9ffda89f)

Author SHA1 Message Date
Simon (darkside) Jackson f44afc7c6d Check-in of the new development branch, this will retire the old default "Master" branch. 2020-06-29 17:47:34 +01:00
Simon Jackson 93fda056a0 Merged in fix/ScrollSnapFix (pull request #74)
Resolution for 323
2020-06-22 15:01:54 +00:00
Simon (darkside) Jackson 184f608ed7 Switched to using AnchoredPosition as key rather than the original LocalPosition. This seems to resolve the long standing intermittent issue with the content becoming offset on scroll. 2020-06-22 15:48:16 +01:00
Simon Jackson dea0699435 README.md edited online with Bitbucket 2020-05-27 12:36:39 +00:00
Simon Jackson 40f1ae3ee4 Merged in ScrollConflictMngr-Update (pull request #73)
ScrollConflict manager update
2020-05-22 16:27:51 +00:00
Simon (darkside) Jackson 5c94a03081 Updated enhancement to scm to work generically with either vertical or horizontal scroll snaps.
Will also automatically configure the parent scroll snap if missing
Added fault protection in case a ParentScrollSnap is not available.
2020-05-22 13:29:03 +01:00
Matthew Prinold 6ea1c4e8e5 Merged in Matthew-Prinold/scrollconflictmanagercs-edited-online-wi-1590141623351 (pull request #71)
ScrollConflictManager.cs edited online with Bitbucket now works with scrollsnap Horizontal and calls the appropriate events

Approved-by: Simon Jackson
2020-05-22 11:59:23 +00:00
Simon Jackson bf59edf11d Merged in HSS-VSS-Refactor (pull request #72)
Refactored HSS/VSS
2020-05-22 11:28:18 +00:00
Simon (darkside) Jackson 018bb1c524 Refactored HSS/VSS to move the onEndDrag interface bindings are on the BaseScrollSnap instead of the child controls 2020-05-22 12:15:58 +01:00
Matthew Prinold 0331d960e1 ScrollConflictManager.cs edited online with Bitbucket now works with scrollsnap Horizontal and calls the appropriate events 2020-05-22 10:00:35 +00:00
Simon Jackson 84c030278b Merged in UIParticleSystemUpdate (pull request #67)
Updated UI Particle System to recognise "PlayOnAwake"
2020-05-22 09:43:22 +00:00
duz1000 47425f030a Merged in feature/UIWindowBase_transform_changes (pull request #69)
UIWindowBase can optionally be set to a different transform.

Approved-by: Simon Jackson
2020-05-22 09:43:03 +00:00
c0ffee 59b184d627 Merged in c0ffeeartc/unity-ui-extensions (pull request #70)
Added undo to uGUITools.AnchorsToCorners, uGUITools.CornersToAnchors
2020-05-22 09:39:23 +00:00
c0ffeeartc b49dd4e918 Added undo to uGUITools.AnchorsToCorners, uGUITools.CornersToAnchors 2020-05-22 03:13:47 +03:00
Du-z c4bf532df4 The transform to move when dragging can be optionally be set to a different transform.
This is useful for when you want just the top bar of a window to be used as a drag handle, a parent transforms position can be moved instead.
2020-05-16 12:16:13 +10:00
Simon (darkside) Jackson f1fbd9dacd Added ability to recognise when "PlayOnAwake" was disabled for a Particle System
Also added three programmatic calls to Play, Pause and Stop the effect.
2020-04-19 11:42:58 +01:00
Chad Kilgore 079fbe952f Merged in nrvllrgrs/unity-ui-extensions/fixRadialSlider (pull request #66)
Fix to allow radial slider to start from positions other than left
2020-03-15 19:10:44 +00:00
bluefallsky c1336f4a1d Merged in bluefallsky/unity-ui-extensions (pull request #65)
Fix UI Particles: Texture sheet animation + Random row(#256)
2020-03-15 14:44:10 +00:00
Chad Kilgore 326a2eed75 Fix to allow radial slider to start from positions other than left 2020-03-14 22:14:45 -05:00
bluefallsky a15d4f1529 Fix UI Particles: Texture sheet animation + Random row(#256) 2020-01-31 18:00:48 +09:00
Simon Jackson 3109d07169 Merged in ScrollSnapinfiniteFix (pull request #64)
Fixed issues with HSS/VSS in conjunction with the UI_Infinite Scroll
2020-01-19 10:52:15 +00:00
Simon (darkside) Jackson 162bb7ca56 Fixed issues with HSS/VSS in conjunction with the UI_Infinite Scroll
* Vertical Scroller now works with infinite ScrollSnapBase
* Resolved issue with Procedural scrollers used with infinite ScrollSnapBase
* Resolved issue with UI Infinite scroll which couldn't handle content in reverse order
2020-01-19 10:50:39 +00:00
Simon (darkside) Jackson 0a5444b22b Updated Fancy ScrollView and added Example 8 2019-12-04 17:25:31 +00:00
Simon (darkside) Jackson c41ad9a163 Updated ScrollSnapScrollbarHelper to only be added in the scene per object once
Resolves #304
2019-12-04 16:08:27 +00:00
Simon (darkside) Jackson c9a6b52d19 Enhanced the LineRender to allow it to have its points queried automatically.
Improved the demo
2019-11-25 18:49:01 +00:00
Simon (darkside) Jackson 41e082802a Updated FancyScrollView to latest 2019-11-16 14:49:21 +00:00
Simon (darkside) Jackson 88b4a54603 Added Range Slider to controls list 2019-11-15 18:48:20 +00:00
Simon (darkside) Jackson 9746d1f7db Clean-up post the separation of Examples to a new branch 2019-11-15 16:28:37 +00:00
Simon Jackson b3e4b0fcd5 Merged in fancyscrollview_Update (pull request #62)
Updated Fancy Scroll view to the latest
2019-11-15 16:03:08 +00:00
Ben MacKinnon 462662ed27 Merged in Dover8/unity-ui-extensions (pull request #60)
Range Slider
2019-11-15 15:55:47 +00:00
Ben MacKinnon 0b75997fa4 Merge branch 'master' of bitbucket.org:Dover8/unity-ui-extensions 2019-11-13 11:09:44 +00:00
Ben MacKinnon cea147dc75 Added Range Slider controller. Squashed commit of previous work.
commit 6c5cf2dc036cf385b81fdfc8072300704b06b435
Merge: fb991af bf30261
Author: Ben MacKinnon <ben.mackinnon@soluis.com>
Date:   Tue Nov 12 17:54:34 2019 +0000

    Merge branch 'refs/heads/master' into range-slider

commit bf302616b8ae377a859d2012b856dc370efe40c2
Merge: 10919c6 76d2299
Author: Ben MacKinnon <bilmackinnon@googlemail.com>
Date:   Tue Nov 12 17:44:57 2019 +0000

    Merge pull request #1 from Dover8/range-slider

    Range slider

commit 76d22998d38801ab35ba19743d944263041924a5
Author: Ben MacKinnon <ben.mackinnon@soluis.com>
Date:   Tue Nov 12 17:36:23 2019 +0000

    Updated PointerDown to update the target graphic

    Re-enabling colour tint interaction.

commit 2d2ca219d5c0865ba4eaa428e8a167118aa06360
Author: Ben MacKinnon <ben.mackinnon@soluis.com>
Date:   Tue Nov 12 16:59:29 2019 +0000

    Updated headers to match the standard format of the project

commit 9a0d3f4aaddbcee2565693b0733c0001a2de2a90
Author: Ben MacKinnon <ben.mackinnon@soluis.com>
Date:   Tue Nov 12 16:43:22 2019 +0000

    Some further default value set when creating a RangeSlider

commit 748d1484568e16aa0bd2e3949330e48ce7245570
Author: Ben MacKinnon <ben.mackinnon@soluis.com>
Date:   Tue Nov 12 16:38:34 2019 +0000

    Added the menu creation options for the Range Slider

commit fa9e9beceede8c708529cd6a3ea98673b2d6d2c2
Author: Ben MacKinnon <ben.mackinnon@soluis.com>
Date:   Tue Nov 12 12:55:38 2019 +0000

    Editor layout for the Range Slider

    Using the EditorGUILayout.MinMaxSlider to control the RangeSlider. It was this control that we are replicating in the UI.

commit 32b731548e8e7f286964a4a7a35fd945e5d5a31a
Author: Ben MacKinnon <ben.mackinnon@soluis.com>
Date:   Mon Nov 11 16:19:16 2019 +0000

    Updated namespace and header

commit 4d0fa2e7dc535b343cf10def6e01886383cc88ac
Author: Ben MacKinnon <ben.mackinnon@soluis.com>
Date:   Mon Sep 16 12:41:45 2019 +0100

    Added interaction

    Range slider is now interactable with both handles and the bar

commit f4be93752719a08b95594e545eb16b27d3b3bcea
Author: Ben MacKinnon <ben.mackinnon@soluis.com>
Date:   Fri Sep 13 15:27:15 2019 +0100

    copied over the WIP RangeSlider from current project
2019-11-13 11:09:37 +00:00
Ben MacKinnon 8ef328fad3 Squashed commit of the following:
commit 6c5cf2dc036cf385b81fdfc8072300704b06b435
Merge: fb991af bf30261
Author: Ben MacKinnon <ben.mackinnon@soluis.com>
Date:   Tue Nov 12 17:54:34 2019 +0000

    Merge branch 'refs/heads/master' into range-slider

commit bf302616b8ae377a859d2012b856dc370efe40c2
Merge: 10919c6 76d2299
Author: Ben MacKinnon <bilmackinnon@googlemail.com>
Date:   Tue Nov 12 17:44:57 2019 +0000

    Merge pull request #1 from Dover8/range-slider

    Range slider

commit 76d22998d38801ab35ba19743d944263041924a5
Author: Ben MacKinnon <ben.mackinnon@soluis.com>
Date:   Tue Nov 12 17:36:23 2019 +0000

    Updated PointerDown to update the target graphic

    Re-enabling colour tint interaction.

commit 2d2ca219d5c0865ba4eaa428e8a167118aa06360
Author: Ben MacKinnon <ben.mackinnon@soluis.com>
Date:   Tue Nov 12 16:59:29 2019 +0000

    Updated headers to match the standard format of the project

commit 9a0d3f4aaddbcee2565693b0733c0001a2de2a90
Author: Ben MacKinnon <ben.mackinnon@soluis.com>
Date:   Tue Nov 12 16:43:22 2019 +0000

    Some further default value set when creating a RangeSlider

commit 748d1484568e16aa0bd2e3949330e48ce7245570
Author: Ben MacKinnon <ben.mackinnon@soluis.com>
Date:   Tue Nov 12 16:38:34 2019 +0000

    Added the menu creation options for the Range Slider

commit fa9e9beceede8c708529cd6a3ea98673b2d6d2c2
Author: Ben MacKinnon <ben.mackinnon@soluis.com>
Date:   Tue Nov 12 12:55:38 2019 +0000

    Editor layout for the Range Slider

    Using the EditorGUILayout.MinMaxSlider to control the RangeSlider. It was this control that we are replicating in the UI.

commit 32b731548e8e7f286964a4a7a35fd945e5d5a31a
Author: Ben MacKinnon <ben.mackinnon@soluis.com>
Date:   Mon Nov 11 16:19:16 2019 +0000

    Updated namespace and header

commit 4d0fa2e7dc535b343cf10def6e01886383cc88ac
Author: Ben MacKinnon <ben.mackinnon@soluis.com>
Date:   Mon Sep 16 12:41:45 2019 +0100

    Added interaction

    Range slider is now interactable with both handles and the bar

commit f4be93752719a08b95594e545eb16b27d3b3bcea
Author: Ben MacKinnon <ben.mackinnon@soluis.com>
Date:   Fri Sep 13 15:27:15 2019 +0100

    copied over the WIP RangeSlider from current project
2019-11-13 11:06:33 +00:00
Moritz Umfahrer fb991af4ee Merged in mumfahrer/unity-ui-extensions (pull request #59)
Fix for division by zero error in Gradient2.cs
2019-10-30 14:00:33 +00:00
Moritz Umfahrer 29e7787c84 Additional zero divisions checks and value constraints 2019-10-30 09:04:30 +01:00
Moritz Umfahrer 4ac901e416 Fix for division by zero error in Gradient2.cs 2019-10-29 11:48:36 +01:00
Richard Jose ae01ccead4 Merged in bfsrjose/unity-ui-extensions (pull request #58)
Add ZTest [unity_GUIZTestMode] to ui particle shaders so that they work with the lightweight render pipeline (lwrp)
2019-10-23 19:03:15 +00:00
Richard Jose eb6252e142 Add ZTest [unity_GUIZTestMode] to ui particle shaders so that they work with the lightweight render pipeline (lwrp) 2019-10-22 15:27:10 -06:00
Simon Jackson 58e9772ccb Updated Fancy Scroll view to the latest 2019-09-27 13:30:11 +01:00
Simon Jackson 1b3cba6b9d Updated .gitignore to exclude the Examples folder, as this has been moved to a separate branch 2019-09-25 14:04:11 +01:00
Simon Jackson af4cb4428d Updated ScrollConflict Manager to handle multiple patent/dependant scrollrects
https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/issues/300/scrollconflictmanager-not-working-if
2019-09-25 14:02:40 +01:00
Simon Jackson 15f5ff7886 Updated package def to just the repo and not my logon 2019-09-25 12:54:59 +01:00
Simon Jackson 10919c6e7b Examples.meta edited online with Bitbucket 2019-09-09 12:58:10 +00:00
Simon Jackson f6f3730980 Removal of Examples for UPM Packaging 2019-09-09 13:39:20 +01:00
Simon Jackson 8529be430c Merged in update/2019_2 (pull request #57)
Updated package.json for UPM package testing
2019-09-09 12:02:52 +00:00
Simon Jackson d2130416a4 Updated package.json for UPM package testing 2019-09-09 13:01:18 +01:00
Donny Sutherland bc10ac6d57 Merged in donnysobonny/unity-ui-extensions (pull request #56)
Master
2019-09-09 11:59:13 +00:00
Donny Sutherland a6e7401670 removed historic comments 2019-09-09 11:05:36 +00:00
Simon Jackson 2548e28cc0 Merged in update/2019_2 (pull request #55)
Updating project for 2019 and adding assembly definitions for dev

Approved-by: Jesse Talavera-Greenberg <jessetalavera@aol.com>
2019-09-09 10:48:58 +00:00
Simon Jackson 829db576d9 Removed asset from UPM source, moved to releases / downloads 2019-09-09 11:43:08 +01:00