Commit Graph

617 Commits (ec388546b88a9c4df26d733864e86a0d5087e69f)

Author SHA1 Message Date
srinivas sunil e43a8dea08 Close branch srinivassunil/scrollconflictmanager-created-online-wit-1456590432246
--HG--
branch : srinivassunil/scrollconflictmanager-created-online-wit-1456590432246
2016-02-27 22:03:00 +05:30
srinivas sunil dcf73019e9 ScrollConflictManager edited online with Bitbucket
--HG--
branch : srinivassunil/scrollconflictmanager-created-online-wit-1456590432246
2016-02-27 16:31:23 +00:00
srinivas sunil 654cd416cd ScrollConflictManager created online with Bitbucket
--HG--
branch : srinivassunil/scrollconflictmanager-created-online-wit-1456590432246
2016-02-27 16:28:02 +00:00
Simon (darkside) Jackson 3b37f7805b Merge upstream re-org from 4.6
--HG--
branch : develop_5.3
2015-12-23 20:40:49 +00:00
Simon (darkside) Jackson 90cafab785 Tidy up post merge
--HG--
branch : develop_5.2
2015-12-23 20:30:08 +00:00
Simon (darkside) Jackson d187674e00 Upstream merge from develop_4.6
--HG--
branch : develop_5.2
2015-12-23 19:25:22 +00:00
Simon (darkside) Jackson b1940e85a2 Restructure of scripts to a more logical place
--HG--
branch : develop_4.6
2015-12-23 19:22:57 +00:00
Simon (darkside) Jackson e5b16809c8 Upstream Merge fixes with develop_5.2
--HG--
branch : develop_5.3
2015-12-23 15:32:27 +00:00
Simon (darkside) Jackson f72eb7268f Added initial version of the UI Vertical scroller from Mrs. YakaYocha
Complete with component and editor menu options

--HG--
branch : develop_5.3
2015-12-23 14:54:32 +00:00
Simon (darkside) Jackson 84edb62e91 Added alternate toggle control at request of Martin Sharkbomb, adds events to the toggle group for value changed
Plus a property to access the single selected toggle (although I'd recommend using the ActiveToggles IEnumerable

--HG--
branch : develop_5.3
2015-12-19 15:12:10 +00:00
Simon (darkside) Jackson 38650cc536 Update SoftMaskAlpha with new "fix"
Patched UISelectableExtension from issue #47
Added new UI Polygon control

--HG--
branch : develop_5.2
2015-12-15 22:43:35 +00:00
Davide Ciacco 077fbcbc51 added UIPolygon.cs under Primitives
--HG--
branch : develop_5.2
2015-12-14 17:15:53 +00:00
Simon (darkside) Jackson f74241cb13 Upstream merged enhancements from 4.6
Packaged new CylinderText component - Breyer
Updated to V1.0.6.1

--HG--
branch : develop_5.3
2015-12-10 22:15:39 +00:00
Simon (darkside) Jackson 91530cb030 Upstream merge of 4.6 enhancements plus 5.2 fixes
Updated to V1.0.6.1

--HG--
branch : develop_5.2
2015-12-10 22:04:32 +00:00
Simon (darkside) Jackson b3a57fb6ec Re-exoirted 4.x & 5.1 packages because I don't trust merge sometimes :D
--HG--
branch : develop_4.6
2015-12-10 21:47:52 +00:00
Simon (darkside) Jackson 1e08e36b0c Pull previous 4.6 Merge
--HG--
branch : develop_4.6
2015-12-10 21:39:57 +00:00
Simon (darkside) Jackson b20b66cb01 Updated to 1.0.6.1
back ported new CylinderText component - Breyer
Enhanced SoftAlphaMask from requests - NemoKrad

--HG--
branch : develop_4.6
2015-12-10 21:37:51 +00:00
Simon Jackson 7a8b37b35c Merged in prefrontalcortex/unity-ui-extensions/letterspacing_fix (pull request #16)
LetterSpacing fixed, CylindricalText added

--HG--
branch : develop_5.3
2015-12-10 21:15:47 +00:00
herbst 42aabe0337 removed unnecessary line, added credits
--HG--
branch : letterspacing_fix
2015-12-10 19:05:27 +01:00
herbst 6ebd7de12b fixed letter spacing for 5.2.1+ (6 verts per character instead of 4);
added cylindrical text bending

--HG--
branch : letterspacing_fix
2015-12-10 19:01:54 +01:00
Simon (darkside) Jackson 0dc0bc4e94 Merged 5.2 readme fixes upstream
Re-fixed 5.3 regression issue with onValueChanged -> onValueChange ... again

--HG--
branch : develop_5.3
2015-12-05 11:37:18 +00:00
Simon Jackson 92e83af771 README.md edited online with Bitbucket
--HG--
branch : develop_5.2
2015-12-04 16:59:02 +00:00
Simon Jackson d71ece6713 README.md edited online with Bitbucket
--HG--
branch : develop_5.2
2015-12-03 18:34:50 +00:00
Simon (darkside) Jackson 457c9280a2 Update Readme from develop_5.2
--HG--
branch : develop_5.3
2015-12-02 22:32:24 +00:00
Simon (darkside) Jackson 14cf5deb6f Readded missing download link for 5.2 base asset
--HG--
branch : develop_5.2
2015-12-02 17:21:45 +00:00
Simon (darkside) Jackson 21b25437a8 Merge upstream changes from 5.2
--HG--
branch : develop_5.3
2015-12-02 17:14:12 +00:00
Simon (darkside) Jackson fb986cefed Merge upstream changes from 4.6
--HG--
branch : develop_5.2
2015-12-02 16:58:06 +00:00
Simon (darkside) Jackson 126b5bbb4d Updated Asset Packages for 4.x/5.1
--HG--
branch : develop_4.6
2015-12-02 15:11:01 +00:00
Simon (darkside) Jackson 8e44a22044 Update ReadMe, Version and some housekeeping
--HG--
branch : develop_4.6
2015-12-02 14:36:13 +00:00
Simon (darkside) Jackson 99adb5d218 Added Soft Alpha Mask from @NemoKrad
--HG--
branch : develop_4.6
2015-12-01 23:29:01 +00:00
Simon (darkside) Jackson bfaba5d397 Moved effects to their own folder
Finished testing of UI Image Crop control

--HG--
branch : develop_4.6
2015-12-01 16:01:01 +00:00
Simon (darkside) Jackson 2377e5899a Merge with develop_5.2 readme update
--HG--
branch : develop_5.3
2015-11-24 10:06:40 +00:00
Simon Jackson d58e7f9efd README.md edited online with Bitbucket
--HG--
branch : develop_5.2
2015-11-24 10:06:08 +00:00
Simon (darkside) Jackson 2a98dd3d0a Patched onValueChanged script autoupdate back to 5.2 style.
Causes script warning in 5.3 but improves backwards compatibility for now.

--HG--
branch : develop_5.3
2015-11-24 09:53:03 +00:00
Simon (darkside) Jackson cfe6f3057a Patched Gradient to use Color32 (for more vibrant colors)
Also corrected an obvious switch where each of the gradient directions were backwards :D

--HG--
branch : develop_4.6
2015-11-06 20:27:47 +00:00
Simon (darkside) Jackson b92c675dd3 Updated to 1.0.5 from 5.2 source
--HG--
branch : develop_5.3
2015-10-29 21:47:45 +00:00
Simon (darkside) Jackson b4666aea02 Patch fixes from 4.6 support
Updated Asset package to 1.0.5
Updated ReadMe

--HG--
branch : develop_5.2
2015-10-29 21:24:51 +00:00
Simon (darkside) Jackson d89d80f968 Back-ported the Reorderable List control from 5.2
--HG--
branch : develop_4.6
2015-10-29 21:11:00 +00:00
Simon (darkside) Jackson 5bd1751993 Testing complete for Re-Orderable Lists
Added Editor Menus

--HG--
branch : develop_5.2
2015-10-29 21:01:19 +00:00
Simon (darkside) Jackson a88c7a9c1b Initial Checkin of new Re-Orderable List.
Still ToDo:
1: complete testing scenarios
2: Update Editor script to add new auto-create option

--HG--
branch : develop_5.2
2015-10-29 16:07:17 +00:00
Ziboo 953770528d Reorderable List:
- Added support for HorizontalLayout and GridLayout
- Change Property  RectTransform Content to LayoutGroup ContentLayout

--HG--
branch : develop_5.2
2015-10-29 14:12:26 +01:00
Simon Jackson dfb423b6d0 Merged in Ziboo/unity-ui-extensions/Ziboo-ReorderableList (pull request #14)
add ReorderableList

--HG--
branch : develop_5.2
2015-10-29 11:21:12 +00:00
Ziboo 36aa65f226 add ReorderableList
only vertical for now...

--HG--
branch : Ziboo-ReorderableList
2015-10-29 00:07:35 +01:00
Simon (darkside) Jackson 1c134fb272 Added UIImage Crop shader style
--HG--
branch : develop_4.6
2015-10-28 20:43:01 +00:00
Simon (darkside) Jackson 9134297ec4 Merge upstream fixes from develop_5.2
--HG--
branch : develop_5.3
2015-10-22 14:47:00 +01:00
Simon Jackson e346eef69d README.md edited online with Bitbucket
--HG--
branch : develop_5.2
2015-10-22 09:14:10 +00:00
Simon Jackson 441d910345 README.md edited online with Bitbucket
--HG--
branch : develop_5.2
2015-10-22 09:13:53 +00:00
Simon Jackson 2e14fd1fd6 Merged in xesenix/unity-ui-extensions/xesenix_upgrades (pull request #13)
Xesenix_upgrades

--HG--
branch : develop_5.2
2015-10-21 10:37:13 +01:00
Paweł Kapalla d604582279 added ability to open page by index from code
--HG--
branch : xesenix_upgrades
2015-10-17 23:06:09 +02:00
Paweł Kapalla 1bb60d72b4 fix file location
--HG--
branch : xesenix_upgrades
2015-10-17 19:15:35 +02:00