pengtaihao
/
com.unity.uiextensions.nosample
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
691 Commits
3 Branches
3 Tags
38 MiB
Commit Graph

691 Commits (34e3f82395894b5f7d47ab1fbd99ed496fb89c89)

Author SHA1 Message Date
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
Donny Sutherland f1697b4f91 fixed an issue with bezier curves where the segments of the generated mesh do not join up correctly 2019-09-01 13:31:59 +00:00
Simon (darkside) Jackson eecf9f70b7 update project.json to be more UPM compatible 2019-08-14 19:17:20 +01:00
Simon (darkside) Jackson 1628a9557f Testing and validation 2019-08-14 19:10:51 +01:00
Simon (darkside) Jackson ed5fbc7f45 Typo fix 2019-08-14 18:55:24 +01:00
Simon (darkside) Jackson 35995015bc Updating project for 2019 and adding assembly definitions for dev 
Plus minor 2019 fix for textpic
 2019-08-14 11:10:38 +01:00
Martin Shuttleworth ccf9279626 Merged in martin_thoughtmachine_net/unity-ui-extensions-scrollsnap-event-delta/scrollsnap-event-delta-extension (pull request #52) 
Added optional event delta to OnEndDrag

Approved-by: Simon Jackson <darkside@xna-uk.net>
 2019-08-13 20:32:21 +00:00
Brad Nelson 1d5bfd7e30 Merged in playemgames/unity-ui-extensions-7/Brad-Nelson/minor-fix-for-newer-unity-versions-1563051919060 (pull request #53) 
Minor fix for newer Unity versions.

Approved-by: Brad Nelson <info@play-em.com>
 2019-08-13 20:30:49 +00:00
sushanta chakraborty 9dac6864c1 Merged in sushanta1991/unity-ui-extensions-3/sushanta-chakraborty/textpiccs-edited-online-with-bitbucket-1-1565460043403 (pull request #54) 
TextPic.cs edited online with Bitbucket

Approved-by: sushanta chakraborty <kumar.suresh761651@gmail.com>
Approved-by: Simon Jackson <darkside@xna-uk.net>
 2019-08-13 20:30:07 +00:00
sushanta chakraborty 3e580876b1 TextPic.cs edited online with Bitbucket 
1. Solved 2 null reference exception, one where inspectorIconList is null at first when you create a TextPic.cs object directly from the menu. And another at GetOutputText() function where sometime count gets higher then m_HrefInfos.Count.
 2019-08-10 18:00:55 +00:00
Brad Nelson 1bc5bab70b Minor fix for newer Unity versions. 2019-07-13 21:05:42 +00:00
Martin Shuttleworth 61e019ac26 Added optional event delta to OnEndDrag - to allow bail out of swipe action if swipe motion is actually negligible at end of drag 2019-07-10 17:36:36 +01:00
Brad Nelson 1dc2b604e2 Merged in playemgames/unity-ui-extensions-6/Brad-Nelson/code-cleanup-of-textpic-fixes-for-text-r-1560162172987 (pull request #51) 
Code cleanup of TextPic, fixes for text rendering with Unity 2019.1.5 and above.
 2019-06-12 22:54:41 +00:00
Brad Nelson 9496fcc0e6 Code cleanup of TextPic, fixes for text rendering with Unity 2019.1.5 and above. Made a default function for hyperlink text to work out of the box with a function OnHrefClick to override with own custom functionality if desired. Optimizations and caching of variables. 2019-06-10 10:23:50 +00:00
Simon Jackson 3f9080a660 Minor Formatting 2019-05-28 10:20:50 +00:00
Simon Jackson 536ebefb43 LICENSE edited online with BitbucketUpdated wrapping 2019-05-28 10:19:28 +00:00
Simon Jackson 45a886b7b5 LICENSE edited online with BitbucketUpdated to 3 clause BSD license 2019-05-28 10:18:01 +00:00
Jesús González d144c40a6b Merged in jesusmgg/unity-ui-extensions (pull request #50) 
Added a new Event to ReorderableList: OnElementDroppedWithMaxItems.
 2019-04-10 14:01:34 +00:00
Jesús González 61aab3765b Reorderable lists now have a new field "EqualizeSizesOnDrag", default to false. When it is true it sets every item size (when being dragged over the current list) to the current size of the first element of the list. 
true was the default behaviour before, and it might be useful in some cases so I left the option there, but in most use cases I encountered so far, and according to Issue 268 (https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/issues/268/re-orderable-lists-different-width-height) the false behaviour is expected.
 2019-04-10 09:43:17 -04:00
Jesús González 93f9a314cf Added a new Event to ReorderableList: OnElementDroppedWithMaxItems. 
It is called when an object is dropped on a ReorderableList with no more space left (currentItems >= maxItems).
 2019-04-09 20:35:34 -04:00
Simon (Darkside) Jackson e0f5901dda Muck up with release formatting on the home page 2019-03-09 14:18:39 +00:00
Simon (Darkside) Jackson 72df83f02f Release 2019.1 (2.1) CHECKPOINT 2019-03-09 14:09:22 +00:00
Simon (Darkside) Jackson 423fd6bd78 Updated and included a new LineRenderer that is based off an Array instead of a list to reduce allocations. 2019-03-09 13:26:11 +00:00
Simon (Darkside) Jackson 43eaa870e1 Resolved a number of .NET warnings and invalid properties 2019-03-07 18:11:51 +00:00
Simon (Darkside) Jackson 22b2ec2ec2 Updated ScrollConflictManager with fix from Jared Turner #85 2019-03-07 17:04:10 +00:00
Brad Nelson e813cd70a9 Merged in playemgames/unity-ui-extensions-5/playemgames/fixes-to-textpic-to-make-sure-images-are-1551486174251 (pull request #49) 
Fixes to TextPic to make sure images are culled properly.

Approved-by: Brad Nelson <info@play-em.com>
 2019-03-05 15:42:28 +00:00
Brad Nelson 561cc87cf0 Fixes to TextPic to make sure images are culled properly. 2019-03-02 00:23:06 +00:00
lars me d6bb530fee Merged in larsme/unity-ui-extensions/Reordable_List (pull request #48) 
More Options for ReordableList

Approved-by: Simon Jackson <darkside@xna-uk.net>
 2019-02-25 15:07:48 +00:00
lars me ba6dc87b11 Merged in larsme/unity-ui-extensions/UI_vertical_scroller (pull request #47) 
More Options for UI Vertical Scroller

Approved-by: Simon Jackson <darkside@xna-uk.net>
 2019-02-25 15:04:58 +00:00
lars me d7d293a348 Merged in larsme/unity-ui-extensions/inputField_Enter_Submit_defocus_Input_Option (pull request #46) 
Defocus Option and Demo for Input Enter Submit Script
 2019-02-25 15:01:47 +00:00
lars me 50a810ba42 Merged in larsme/unity-ui-extensions/corrected_sign_for_horizontal_scrollsnap_left_fast_swipe (pull request #45) 
corrected sign for horizontal scrollsnap left fast swipe

Approved-by: Simon Jackson <darkside@xna-uk.net>
 2019-02-25 15:00:23 +00:00
LARS-LAPTOP2\larsme c8b7085f27 More Options for ReordableList: 
- Max item count, after which no more items can be dropped
- IsDisplacable option: If true, an item can be dropped into a full list by displacing one of its items,
  it may replace the dragged item in its origin list, be dropped in space or be deleted
  depending on the dragged item's origin list and the displaced item
- Added respective Events
- fixed ever increasing number of _listContent components
- Stopped dragged item from blocking Raycasts
 2019-02-22 18:35:03 +01:00