Commit Graph

259 Commits (68b0445b28237e48d7a656ae62f8bc412baccc31)

Author SHA1 Message Date
Simon Jackson 937daaa227 Manual merge for PR #9
Resolves an issue with the EventSystem and EventTriggers
2017-06-19 18:48:49 +01:00
Simon Jackson e373565536 Resolves #139
New properties to improve the resolution for a line, which when combined with the LineList creates a dotted line.

Supports two modes: dashes based on segments or the entire line.
2017-06-12 09:02:46 +01:00
Simon Jackson 9ce211c5fc Resolves #143
Performance tweaked the existing Linq method and at the request of #143 , added a new array sort alternative.
2017-06-10 14:33:12 +01:00
Simon Jackson 6a29b9957e Updated Text demo scene with additional effects and animated some of the controls, just for effect 2017-06-05 16:01:47 +01:00
Simon Jackson 20a6cc962c Updated Gradient scripts to "SetAllDirty" when properties changed, to ally changing through code.
Resolves #145

Thanks to @chrisparton1991 for the fix
2017-06-04 18:19:14 +01:00
Simon Jackson a059c148a6 Various patches and also enabled the ReorderableList in SS-Camera / Worldspace 2017-06-03 17:59:12 +01:00
Simon Jackson e4991aba05 Rolled back Floating Joystick as it had too many dependencies, will review and re-add later
Added fix to DropDownList to enable firing the changed event for the first item.
Added new ComboBox example scene.
2017-05-16 18:51:24 +01:00
Simon Jackson 438fc0fa81 Merged in newgradienttypes (pull request #7)
Added 2 new gradient types for the Gradient2 component: radial and diamond
2017-05-08 11:09:41 +00:00
Simon Jackson 2fb1a35698 Merged in floatingjoystick (pull request #8)
Added a floating joystick (appears in a tap position)
2017-05-08 11:09:06 +00:00
Simon Jackson 1482d7c440 Resolves #138
Line Renderer now renders based on Pivot and resolves drawing issue with Editor script when using !Relative.

However, need to update editor script to work with relative drawing.
2017-05-08 00:18:06 +01:00
Simon Jackson c6f095efeb Resolves #140
At the request of the PR update author
2017-05-07 18:16:36 +01:00
Simon Jackson 35b88a2487 Fixed Line endings on shaders (?)
Removed unnecessary usings (who knew there were so many, I'm normally so tidy :P)
2017-05-05 14:25:48 +01:00
Simon Jackson dc809858b9 1st Pass update, Updated controls:
* DropDownList/ComboBox
* Reorderable List (Screen Space Camera Updates
* Curved text fixes
2017-05-05 14:06:52 +01:00
Tima Zhum 11519cd4bc Added 2 new gradient types for the Gradient2 component: radial and diamond 2017-04-18 02:46:33 +06:00
Tima Zhum fe2ed6c7ce Added a floating joystick (appears in a tap position) 2017-04-17 20:00:24 +06:00
Simon Jackson a09a5b5322 First pass 1.3 updates:
* SelectableScaler.cs
* MonoSpacing
* MultiTouchScrollRect.cs
* BezierLineRendererEditor.cs
* WIP - DropDownList / AutoCompleteComboBox
2017-04-15 19:12:44 +01:00
lars me 7824978a8f Merged in larsme/unity-ui-extensions (pull request #2)
Additional Options for DropDownList & AutoCompleteComboBox

Few post fixes required
2017-04-15 17:55:56 +00:00
PixelEnvision 67bf28cb5a Merged in PixelEnvision/unity-ui-extensions (pull request #3)
ScrollRectMultiTouchFix.cs
2017-04-15 16:19:09 +00:00
PixelEnvision 4520bf26d7 ScrollRectMultiTouchFix.cs edited online with Bitbucket 2017-03-30 22:40:57 +00:00
PixelEnvision 90a87e6e4d I've found out today that Unity's ScrollRect is behaving erratic when more than one touch is used for drag. I think that's a bug with UI. It jumps between fingers (to moving one), this script fixes it by blocking event data based on touch id. 2017-03-30 20:42:37 +00:00
LARS-LAPTOP2\larsme 8549c3ba6a Replaced OnSelectionChanged with event(s) accessible from the inspector (DropDownList & AutoCompleteComboBox) 2017-03-27 14:33:08 +02:00
LARS-LAPTOP2\larsme 6565b1a6d1 Option to change Input Text Color based on matching Items 2017-03-27 14:03:39 +02:00
LARS-LAPTOP2\larsme b315784caf Option to automatically select your first Item on Start (DropDownList & AutoCompleteComboBox) 2017-03-27 13:11:24 +02:00
LARS-LAPTOP2\larsme 9ac4eb6969 option to set interactible to false if there are no items to be selected (DropDownList and AutoCompleteComboBox) 2017-03-27 12:52:51 +02:00
LARS-LAPTOP2\larsme 98c92f4cde centralized interactable 2017-03-27 12:03:05 +02:00
herbst 1ef67d5fba mono spacing text works with right alignment now, example scene 2017-03-22 14:16:03 +01:00
herbst 9e786f6aa6 added monospacing script and added TextEffects example scene 2017-03-22 12:56:21 +01:00
Simon Jackson 966f82da3f Added option to NOT restart control
Also switched to the InitialiseChildObjectsFromScene (whoops)
2017-03-12 15:29:59 +00:00
Simon Jackson f89702ddc6 Minor VSS/HSS bugfixes and enhancements, resolving #114 2017-03-12 15:18:36 +00:00
Simon Jackson ec31c8b5d6 Moved Initialize from Start to Awake to resolve #126 2017-03-12 10:45:39 +00:00
Simon Jackson 49806ebb44 Fix to Primitive Base to ensure the control is redrawn when it's enabled, resolves #116 2017-03-06 16:24:47 +00:00
Simon Jackson cc7c66f9f5 Updated Scroll Snap Base to resolve #119 2017-02-23 15:18:16 +00:00
Simon Jackson 82585a7cb2 Added UIGridRenderer thanks to John Hattan
Fixed "line Endings" errors
2017-02-17 12:54:40 +00:00
Simon Jackson bddf5ad8b0 Updated primitive controls to Set Control Dirty should its effect parameters change
--HG--
branch : develop_5.3
2017-02-10 16:45:50 +00:00
Simon Jackson df3ff02bd5 Replicated the ScrollSnap fix (#91) to the VSS
--HG--
branch : develop_5.3
2017-02-10 16:04:24 +00:00
Chris Parton fdfd114157 Improved scroll snap containers to disable navigation buttons when appropriate.
Reordered PrevButton and NextButton to be more logical.

--HG--
branch : navigation_button_toggle
2017-02-07 21:55:38 +11:00
Simon Jackson 0d28905892 Patch for Bullet initialisation, wasn't selecting the right bullet on start.
--HG--
branch : develop_5.3
2017-01-08 12:11:13 +00:00
Simon Jackson 5820447547 Fix for #109.
Add Screen Change event to "GoToPage"

--HG--
branch : develop_5.3
2017-01-08 12:03:27 +00:00
Simon Jackson 1a18b3b4cc Added new NonDrawingGraphic control and editor script
Resolved request #107

--HG--
branch : develop_5.3
2017-01-04 21:58:07 +00:00
Simon Jackson 344ca57f4b Updated VSS / HSS to handle pages with interactable components.
Interactables mess with the Pointer Down/Up events that the control used when a mouse is used, so implementation changes to suit.

--HG--
branch : develop_5.3
2017-01-04 13:18:28 +00:00
Simon Jackson 38d98a0fad Resolution for #80 issue where onPageChanged is fired multiple times for Next/Previous.
--HG--
branch : develop_5.3
2017-01-04 12:32:44 +00:00
Simon Jackson cd3f79ef7c 2 patches for HSS/VSS
* Added new overload to AddChild, allows to set WorldPositionStays for added childen
* New RemoveAllChildren function

--HG--
branch : develop_5.3
2017-01-04 12:16:11 +00:00
Simon Jackson 21ad76580e Minor patchfix on HSS/VSS - Starting screen validation failed on new scenes?
--HG--
branch : develop_5.3
2017-01-02 18:17:18 +00:00
Simon Jackson c1682b11a8 Pre-Release upload - tested and working
--HG--
branch : develop_5.3
2016-12-31 17:01:49 +00:00
Simon Jackson b2ae5db354 Update for pre-release
--HG--
branch : develop_5.3
2016-12-31 15:59:57 +00:00
Simon Jackson e0c3864fb7 Resolved issue with HSS/VSS not resizing when Rect/Scene changes
Updated HSS/VSS Visibility logic so it's more refined.

--HG--
branch : develop_5.3
2016-12-31 15:14:39 +00:00
Rahul Raman 66cbf0da23 Modified Vertical layout functions to use nested loops to minimize condition test failures
--HG--
branch : develop_5.3
2016-12-31 09:12:29 +00:00
Simon Jackson 909589e544 Updated Table Layout Group component for release and added docs
--HG--
branch : develop_5.3
2016-12-30 17:28:34 +00:00
Simon Jackson 473c0f3757 Merged in rahul_raman/unity-ui-extensions (pull request #36)
New TableLayoutGroup Component

--HG--
branch : develop_5.3
2016-12-30 16:57:54 +00:00
Simon Jackson b169e98452 Reversed clean-up, was actually used :S
--HG--
branch : develop_5.3
2016-12-30 15:56:00 +00:00
Simon Jackson df9ea42e02 Updated HSS/VSS OnSelectionChangeEndEvent to also output the landed page number (zero indexed)
Some redundant code clean-up

--HG--
branch : develop_5.3
2016-12-30 15:53:44 +00:00
Simon Jackson aadba190c8 Fixed PageChanged event for HSS/VSS
Fixed WorldSpace use of HSS/VSS (also created a new feature :D)
Minor editor options fix for boxslider

--HG--
branch : develop_5.3
2016-12-30 15:44:36 +00:00
Simon Jackson f0ba3cfae5 Minor fixes and additions
Updates to resolve reports in Issue #80

--HG--
branch : develop_5.3
2016-12-29 22:03:04 +00:00
Rahul Raman 6888cb500d Refactored CalculateLayoutInputVertical; Released memory used by temporary array for reclaiming by the GC; Added comments to help understand the script better
--HG--
branch : develop_5.3
2016-12-28 20:37:03 +00:00
Rahul Raman 1d251301eb Improved calculation of SetLayoutHorizontal and SetLayoutVertical; Renamed certain variables, removed certain others and refactored code to be more sensible; Fixed behaviour for a specific configuration of TableLayoutGroup and ContentSizeFitter
--HG--
branch : develop_5.3
2016-12-28 16:15:52 +00:00
Rahul Raman 5a64abfa80 Fixed behaviour when no column width is provided
--HG--
branch : develop_5.3
2016-12-28 06:46:38 +00:00
Rahul Raman 2e8682a491 Cleanup: Renamed "Cell Spacing" as "Column Spacing"
--HG--
branch : develop_5.3
2016-12-27 21:59:20 +00:00
Rahul Raman b8bd371232 Cleanup: Added sensible defaults. Removed all initialization errors.
--HG--
branch : develop_5.3
2016-12-27 21:54:32 +00:00
Rahul Raman 9cf482d6ed Allowed flexible row expansion as a choice, instead of a compulsion
--HG--
branch : develop_5.3
2016-12-27 21:34:16 +00:00
Rahul Raman da480b1f8b Clean up: Removed duplicate calculations and unnecessary intermediate variables.
--HG--
branch : develop_5.3
2016-12-27 20:46:57 +00:00
Rahul Raman ff95c38ee2 Fixed computation of cell positions for all start corners
--HG--
branch : develop_5.3
2016-12-27 20:28:12 +00:00
Rahul Raman 81dd26b5ef Edited SetLayoutVertical() to avoid unnecessary recomputation of maxPreferredHeightInRow
--HG--
branch : develop_5.3
2016-12-27 20:16:50 +00:00
Rahul Raman bbd5102246 Renaming "TableLayout.cs" to "TableLayoutGroup.cs" to be consistent with Unity component naming
--HG--
branch : develop_5.3
2016-12-27 20:14:03 +00:00
Rahul Raman b350b270f7 Added TableLayout component that child objects into a non-uniform grid, with fixed, user-defined column widths and flexible row heights
--HG--
branch : develop_5.3
2016-12-27 19:51:46 +00:00
Simon Jackson 3e0d105646 Merged PR for ExtensionsToggle
Updated for UI EXtensions Standards

--HG--
branch : develop_5.3
2016-12-24 12:41:30 +00:00
Simon Jackson 7703ca739c Merge with extensions-toggle-new-event
--HG--
branch : develop_5.3
2016-12-24 12:33:02 +00:00
Simon Jackson ac07bc554a Updated new Softmask Script to UI Extensions standards. Removed unneeded Text shader and cleaned up.
--HG--
branch : develop_5.3
2016-12-24 12:27:42 +00:00
valtain@gmail.com af8abe9551 Softmask fix
maskRect in canvas space not in world space

--HG--
branch : develop_5.3
2016-12-24 18:03:52 +09:00
valtain@gmail.com 5ed1e48cb2 Recomit softmask fix
--HG--
branch : develop_5.3
2016-12-24 05:18:01 +09:00
Simon Jackson 32d8a82e05 Merged in sushanta1991/unity-ui-extensions-2/sushanta1991/-onpopulatemesh-was-getting-called-befor-1480940993474 (pull request #31)
// OnPopulateMesh() was getting called before m_OutputText was updated in function UpdateQuadImage(), Due to this, m_HrefInfos.boxes where not getting created, which in further resulted into non clickable text. This is happening in Unity5.5.

--HG--
branch : develop_5.3
2016-12-21 19:09:24 +00:00
Simon Jackson f98aa18981 A little tidying of the ScrollSnap base script, nothing to see here :D
--HG--
branch : develop_5.3
2016-12-21 18:50:42 +00:00
Simon Jackson 94f857d203 Remaining issues resolved.
Now to double check YT and BB for any remaining unresolved issues

--HG--
branch : develop_5.3
2016-12-21 17:51:38 +00:00
Simon Jackson a72c45e02a Almost complete:
* Scrolling - working
* Fast Swipe - working (as well as Unity can fast swipe :S)
* Mask with only visible items - working
* Jump to page - working

Just found a bug with removing / adding items

--HG--
branch : develop_5.3
2016-12-21 16:52:19 +00:00
Simon Jackson 4bd100c7e9 Initial check-in of visible ony VSS (HSS yet to be updated)
--HG--
branch : develop_5.3
2016-12-18 22:51:16 +00:00
Simon Jackson d101a574c8 Removed arrays from control and refactored, heavy perf inprovement
Downside it made my "visible" improvement redundant and need to re-implement.

--HG--
branch : develop_5.3
2016-12-10 13:36:28 +00:00
sushanta chakraborty ec0292b579 // OnPopulateMesh() was getting called before m_OutputText was updated in function UpdateQuadImage(), Due to this, m_HrefInfos.boxes where not getting created, which in further resulted into non clickable text. This is happening in Unity5.5.
So what i did is i assigned m_Text = GetOutputText(); directly in  OnPopulateMesh() function, which solved the problem.

--HG--
branch : sushanta1991/-onpopulatemesh-was-getting-called-befor-1480940993474
2016-12-05 12:29:57 +00:00
Simon Jackson 5cbfc70e30 Refactored general code for HSS / VSS in to base class
Fixed issue with add/remove pages where positions were not recalculated

--HG--
branch : develop_5.3
2016-12-05 10:15:48 +00:00
Simon Jackson 74ef2ca4e7 Fixed paging / smooth scrolling with the HSS / VSS
Current page now updated correctly while scrolling

--HG--
branch : develop_5.3
2016-12-04 20:06:03 +00:00
Simon Jackson c46453655e Removed old HSV picker and replaced with initial version of the new COlorPicker.
Includes some other new controls such as Box Slider and Color Slider.
Still needs some cleaning up as this is the initial check-in

--HG--
branch : develop_5.3
2016-11-25 09:27:29 +00:00
Simon Jackson c97b4f8a99 TextPic update and fix
--HG--
branch : develop_5.3
2016-11-24 17:48:51 +00:00
Simon Jackson 76e5049023 Fixed and tested HSS & VSS use with Scroll COnflict Manager.
HSS & VSS controls now play nicely together
Added new version of Gradient

--HG--
branch : develop_5.3
2016-11-15 23:48:44 +00:00
Simon Jackson 1730965a44 Added Start and End move events to the HSS & VSS controls
--HG--
branch : develop_5.3
2016-11-15 18:09:13 +00:00
Simon Jackson 2de76cf7a3 Perfromance tweaks for H & V scroll snaps.
Updated create option
Matched Size options from HSS update in to VSS

--HG--
branch : develop_5.3
2016-11-15 14:52:34 +00:00
Simon Jackson cb535507a4 Updated H & V scroll snap starting page and button navigation
Updated H & V jump function to only accept values with in page range

--HG--
branch : develop_5.3
2016-11-15 13:36:50 +00:00
Vicente Russo fa6f1dc760 Added new event that triggers only when toggle value is ON and takes the caller as parameter
--HG--
branch : extensions-toggle-new-event
2016-10-24 15:15:30 -02:00
sushanta chakraborty 18cf84b4d0 TextPic.cs Added Fix for href tag, which was not working. Added support for multiple href tag with same name.
--HG--
branch : sushanta1991/textpiccs-was-not-working-for-href-unit-1474979920532
2016-09-28 06:56:06 +00:00
sushanta chakraborty b75a03963e TextPic.cs Added Fix for href tag, which was not working.
--HG--
branch : sushanta1991/textpiccs-was-not-working-for-href-unit-1474979920532
2016-09-28 05:29:33 +00:00
sushanta chakraborty 292fb39c93 TextPic.cs was not working for href.
Unity-UI-Extensions helped me a lot thanks for creating it.

Today i was trying href tag provided with TextPic.cs, but unfortunately it was not working.

I figured out that, OnPopulateMesh() was creating hrefInfo.boxes but at the end when OnPopulateMesh() calls UpdateQuadImage(), hrefInfo.boxes.count was coming 0. This was little strange but i saw that GetOutputText() was re-creating m_HrefInfos array from scratch but it didn't include the code to add boxes, so this was the issue.

so what i did is, i commented this line m_HrefInfos.Clear(); in GetOutputText() and added few lines of code to check if m_HrefInfos elements exists than don't destroy it, just update it with new values.
This helped in resolving the issue. Now i was getting onClick event on href tag.

Thanks

--HG--
branch : sushanta1991/textpiccs-was-not-working-for-href-unit-1474979920532
2016-09-27 12:38:44 +00:00
darkside@xna-uk.net 154c9c8d31 Upgrade fix to SAUIM Test shader
Removed some experimental code that sneaked in to a commit

--HG--
branch : develop_5.3
2016-09-08 19:04:42 +01:00
Shawn Featherly 6887b20915 HorizontalScrollSnap.cs works well with AnchorMinMax.
--HG--
branch : Feddas/horizontalscrollsnapcs-works-well-with-a-1472852283807
2016-09-02 21:38:06 +00:00
playemgames f324f58076 Hack to clear out culled images to properly position them instead of reuse images.
--HG--
branch : playemgames/hack-to-clear-out-culled-images-to-prope-1470396744892
2016-08-05 11:36:19 +00:00
playemgames 4ede5c9576 Added OnValidate and UpdateQuadImage(); to OnPopulateMesh(); to position the images correctly on text input.
--HG--
branch : playemgames/added-onvalidate-and-updatequadimage-to--1469821382746
2016-07-29 19:43:04 +00:00
Simon Jackson 006ad7311f H & V Scroll snap fixes to resolve #91
--HG--
branch : develop_5.3
2016-07-21 17:25:34 +01:00
Simon Jackson ee300b4079 Some more restructuring whilst documentation updates continue.
Hopefully last breaking changes.

--HG--
branch : develop_5.3
2016-07-18 21:36:36 +01:00
Simon Jackson 6796c319a3 Documentation update
--HG--
branch : develop_5.3
2016-07-17 20:56:54 +01:00
Simon Jackson e105d9f2dd Added UI Knob
Restructured controls in to their own folder.  If we are breaking Bkcompat, might as well make it a good one

--HG--
branch : develop_5.3
2016-07-17 19:21:41 +01:00
Simon Jackson c9fb580364 Added TextPic component from #89
Added Override Highlighted option to drop down to fix #87

--HG--
branch : develop_5.3
2016-07-14 18:48:18 +01:00
Simon Jackson d0b72e5307 Project tidy up
--HG--
branch : develop_5.3
2016-07-08 11:45:58 +01:00
Simon Jackson a5b08f312b Project restructure as per issue #79
Note, will need old folder removing and new project adding in upgrade to tidy up

--HG--
branch : develop_5.3
2016-07-02 15:02:13 +01:00
Simon Jackson 4547716f3e Patched Particle System with fixes from author
Added 3 new Utility controls

--HG--
branch : develop_5.3
2016-07-02 14:50:37 +01:00