Victor Cebollada [Fri, 25 Nov 2016 07:08:53 +0000 (07:08 +0000)]
[dali_1.2.16] Merge branch 'devel/master'
Change-Id: Ic91b7ad6783570986e202b20c11104cc379de612
Victor Cebollada [Fri, 25 Nov 2016 07:07:05 +0000 (07:07 +0000)]
DALi Version 1.2.16
Change-Id: Iaa6a15d66618d2726646425964ef608ebcec144f
adam.b [Thu, 24 Nov 2016 16:23:11 +0000 (16:23 +0000)]
Fixed svace errors and disabled indicator
Change-Id: I0d4ea08dcb13932a8aa7ec21d0b204a2f6f2f791
Ferran Sole [Wed, 23 Nov 2016 09:31:53 +0000 (09:31 +0000)]
Changes following patch "Visuals - Avoid having 2 devel headers for visual-properties.h"
Change-Id: Ifa99fb377a65b3670da1b4b680aa441a22996bfe
Adeel Kazmi [Wed, 23 Nov 2016 16:27:27 +0000 (16:27 +0000)]
Added a custom style to the popup example
Change-Id: I60fde090b81f314c68064081effff331c3216128
Adeel Kazmi [Wed, 23 Nov 2016 11:15:58 +0000 (03:15 -0800)]
Merge "homescreen benchmark can use buttons" into devel/master
Agnelo Vaz [Tue, 22 Nov 2016 16:11:30 +0000 (16:11 +0000)]
homescreen benchmark can use buttons
Added ability for benchmark tool to use checkbox buttons by providing --use-checkbox command line argument
Change-Id: I7ac8c50a3ea594a548b447b3f3b3ec1be6da9bfd
adam.b [Thu, 3 Nov 2016 20:18:03 +0000 (20:18 +0000)]
Example of First Person 3D game with DALI
- Features 3D environment with simple lightmapping
- Multi-touch first person camera control scheme
- Uses free textures on the GPL license ( blendernation )
- Models are custom made
- Tutorial screen made using DALi toolkit controls ( text labels ).
- Uses PicoJSON parser ( https://github.com/kazuho/picojson )
Change-Id: I6e3503608cd22dc63f371132376d475c890a0474
Umar [Fri, 18 Nov 2016 10:59:26 +0000 (10:59 +0000)]
[dali_1.2.15] Merge branch 'devel/master'
Change-Id: If38951299ed9e878247ee3e38c0d5db166ccf473
Umar [Fri, 18 Nov 2016 10:58:44 +0000 (10:58 +0000)]
DALi Version 1.2.15
Change-Id: I5136c2c79089ba17749fd9f5672639228e4b8713
Adeel Kazmi [Thu, 17 Nov 2016 12:09:50 +0000 (04:09 -0800)]
Merge "Updates for Visual::SetSize removal" into devel/master
Adeel Kazmi [Wed, 16 Nov 2016 12:07:31 +0000 (12:07 +0000)]
More SVACE fixes
Change-Id: I340686abda4cca205187157feb2571c86b0878c2
David Steele [Wed, 16 Nov 2016 11:59:53 +0000 (11:59 +0000)]
Updates for Visual::SetSize removal
Change-Id: I51ffb1db8e8140c67b4b44cf4bb3343a8c23e622
Signed-off-by: David Steele <david.steele@samsung.com>
Adeel Kazmi [Tue, 15 Nov 2016 15:35:34 +0000 (15:35 +0000)]
Fix various SVACE errors
Change-Id: I2dfed0e2863dfc4eecb3cb86d28968a76ba78836
Adeel Kazmi [Fri, 11 Nov 2016 18:41:20 +0000 (18:41 +0000)]
[dali_1.2.14] Merge branch 'devel/master'
Change-Id: Ibef3c8af11c67e68dcade79c10265fa3905e66fa
Adeel Kazmi [Fri, 11 Nov 2016 18:40:33 +0000 (18:40 +0000)]
DALi Version 1.2.14
Change-Id: I4202967328d317cb8e48341be78b499e3a42516d
Adeel Kazmi [Tue, 25 Oct 2016 20:36:06 +0000 (21:36 +0100)]
Added an example which shows a layout containing animating contact cards
Change-Id: Ic59f2e05275694ed1730628b9a1ac4950a759e3f
David Steele [Tue, 8 Nov 2016 20:15:12 +0000 (20:15 +0000)]
Removed unnecessary SetOnStage for visuals
Change-Id: I21c535e3cef4f68c92917e43d8b8989f27322e25
David Steele [Mon, 7 Nov 2016 13:33:11 +0000 (13:33 +0000)]
Removed use of VisualFactory::InitializeVisual
Styling currently uses InitalizeVisual rather than a CreateVisual and RegisterVisual pair.
We want to eventually remove InitializeVisual, so pre-emptively removing it's use.
Change-Id: I335afadc01060b477dd9420f30b97d3b953c37ea
Signed-off-by: David Steele <david.steele@samsung.com>
Tom Robinson [Fri, 4 Nov 2016 13:16:56 +0000 (13:16 +0000)]
[dali_1.2.13] Merge branch 'devel/master'
Change-Id: Ibbe21ea9b3b9f33053d5bbab501b98c12b5a38f7
Tom Robinson [Fri, 4 Nov 2016 13:15:30 +0000 (13:15 +0000)]
DALi Version 1.2.13
Change-Id: Ia794bccff4f2bc3580f637f3adb7272d1bacadc9
Kimmo Hoikka [Tue, 1 Nov 2016 18:45:00 +0000 (18:45 +0000)]
Remove incorrect placement actor from the RegisterVisual API
Change-Id: I0eed4a040cb86468fb649a062b6d3f2f2b13dbd1
Paul Wisbey [Tue, 1 Nov 2016 11:50:43 +0000 (04:50 -0700)]
Merge "Update json style files with the new 'fontStyle' format." into devel/master
Adeel Kazmi [Fri, 28 Oct 2016 13:21:28 +0000 (06:21 -0700)]
Merge "Fix PageFactory to take in Texture rather than Image" into devel/master
Xiangyin Ma [Fri, 28 Oct 2016 12:19:18 +0000 (13:19 +0100)]
[dali_1.2.12] Merge branch 'devel/master'
Change-Id: Icdce160338bab16c9065ef87108b8031f0df8aec
Xiangyin Ma [Fri, 28 Oct 2016 12:18:31 +0000 (13:18 +0100)]
DALi Version 1.2.12
Change-Id: I5b36330fff7f6061ab2b50fe4b769b6321a16c24
Victor Cebollada [Thu, 27 Oct 2016 07:53:34 +0000 (08:53 +0100)]
Update json style files with the new 'fontStyle' format.
* See 'Text - FONT_STYLE and INPUT_FONT_STYLE properties refactor' patch in toolkit.
Change-Id: I2d2312a6ee7acdadc72e2af1ad4875dbc450eaef
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Kimmo Hoikka [Wed, 26 Oct 2016 16:55:59 +0000 (17:55 +0100)]
Fix PageFactory to take in Texture rather than Image
- also remove use of Atlas as that is to be removed
Change-Id: I15dcf8dcda37f01e4c669eb044e3e8eb4fcc1a80
Paul Wisbey [Tue, 25 Oct 2016 10:47:40 +0000 (11:47 +0100)]
Changed README to README.md
Change-Id: I5f2679bf6c2b318aeb027b965a448385a7bb2ef0
Paul Wisbey [Fri, 21 Oct 2016 15:34:10 +0000 (08:34 -0700)]
Merge "Added missing Finnish localization for animated shape demo" into devel/master
Adeel Kazmi [Fri, 21 Oct 2016 14:14:32 +0000 (07:14 -0700)]
Merge "DALi Version 1.2.11" into devel/master
Nick Holland [Fri, 21 Oct 2016 14:10:04 +0000 (15:10 +0100)]
[dali_1.2.11] Merge branch 'devel/master'
Change-Id: I346006b79d13c0012d9a5c8fa86e524a22dc012b
Nick Holland [Fri, 21 Oct 2016 14:09:13 +0000 (15:09 +0100)]
DALi Version 1.2.11
Change-Id: I10887dcbb8e26c52118c1c21b1717a4d99216812
David Steele [Fri, 14 Oct 2016 14:30:50 +0000 (15:30 +0100)]
Added a stylable transition to styling example.
Added Enable / Disable transitions to ImageChannelControl which
can be set via the style sheet.
Added a Visibility attribute to ImageChannelControl which
forces the enable / disable transition to be executed when
the visibility changes.
Added 3 different transitions to the style sheet:
1) a cross fade
2) a longer cross fade
3) a scale change.
Change-Id: I82a1f0e4e4c89ae0bdcb1c59ce01a0a918f17afd
Signed-off-by: David Steele <david.steele@samsung.com>
Kimmo Hoikka [Tue, 18 Oct 2016 15:53:20 +0000 (16:53 +0100)]
Added missing Finnish localization for animated shape demo
Change-Id: I77885a3d1555c8b7403c3f18a4ea30061d198927
Richard Huang [Fri, 14 Oct 2016 13:17:55 +0000 (14:17 +0100)]
[dali_1.2.10] Merge branch 'devel/master'
Change-Id: Ifa98519084d36ef1121682fcdc9ca29d9c8ce8ea
Richard Huang [Fri, 14 Oct 2016 13:17:10 +0000 (14:17 +0100)]
DALi Version 1.2.10
Change-Id: I11b5fd2dc891f4e59f2f8d4231d85a9876bff2af
Agnelo Vaz [Wed, 12 Oct 2016 13:49:22 +0000 (14:49 +0100)]
Builder examples to use Navigation View
Change-Id: Ie0ef016796a0d37b3935278c2dc0977cb18c1769
Adeel Kazmi [Tue, 11 Oct 2016 18:40:17 +0000 (19:40 +0100)]
(Buttons) Ensured check box buttons fill to parent to show the entire text
Change-Id: I1f4ca14ce8ecb0edda7f296572d58a9965351444
Xiangyin Ma [Tue, 11 Oct 2016 13:27:56 +0000 (14:27 +0100)]
Delete the unused header file
Change-Id: Ib15910e572c4a23a49a3a7df805adea5911a32f3
Adeel Kazmi [Mon, 10 Oct 2016 10:45:33 +0000 (03:45 -0700)]
Merge "Replaced gradient image with gradient visual in renderer-stencil.example" into devel/master
Kimmo Hoikka [Fri, 7 Oct 2016 16:40:37 +0000 (09:40 -0700)]
Merge "Size negotiation Example only exits if BACK/ESC is unhandled" into devel/master
Tom Robinson [Fri, 7 Oct 2016 11:21:35 +0000 (12:21 +0100)]
Replaced gradient image with gradient visual in renderer-stencil.example
Change-Id: I395ff7e9f0adf649294ebb913990fdda83ae9fb2
Adeel Kazmi [Fri, 7 Oct 2016 15:38:41 +0000 (08:38 -0700)]
Merge "DALi Version 1.2.9" into devel/master
Ferran Sole [Fri, 7 Oct 2016 15:34:07 +0000 (16:34 +0100)]
[dali_1.2.9] Merge branch 'devel/master'
Change-Id: I22f7ca621b2329dc94c445a3330a646bc6d585c5
Ferran Sole [Fri, 7 Oct 2016 15:33:33 +0000 (16:33 +0100)]
DALi Version 1.2.9
Change-Id: I9044f8fcdd0a238d6fe0624cee679c3d6214d814
taeyoon [Fri, 7 Oct 2016 04:39:37 +0000 (21:39 -0700)]
Merge "Remove custom shader from video view example and change video file sample" into devel/master
Adeel Kazmi [Thu, 6 Oct 2016 18:36:53 +0000 (19:36 +0100)]
Size negotiation Example only exits if BACK/ESC is unhandled
Change-Id: Ia11d6ba26ef654ca6c531a169223bc27b4d86e58
Adeel Kazmi [Wed, 5 Oct 2016 18:40:03 +0000 (11:40 -0700)]
Merge "Added animated shapes demo" into devel/master
Tom Robinson [Mon, 3 Oct 2016 10:59:56 +0000 (11:59 +0100)]
Remove GetRendererAt() from dali-demo
Change-Id: Iee240e86e116bf8fb93b07fa5296bbfaac8d77fa
adam.b [Fri, 30 Sep 2016 14:12:46 +0000 (15:12 +0100)]
[dali_1.2.8] Merge branch 'devel/master'
Change-Id: I826ef82f07f246258b07c9479f00aaf6200c8c7a
adam.b [Fri, 30 Sep 2016 14:12:00 +0000 (15:12 +0100)]
DALi Version 1.2.8
Change-Id: Id8da8fd00d5b4562d26f0c19b5c49d7439228c0f
taeyoon [Thu, 22 Sep 2016 06:06:48 +0000 (15:06 +0900)]
Remove custom shader from video view example and change video file sample
Later, custom shader part will be added
video sample file should be changed because of license issue
Change-Id: Ib42cc40bfebb4f16785269e20e7106c829532671
Tom Robinson [Fri, 16 Sep 2016 13:50:11 +0000 (14:50 +0100)]
Fixed dali-demo keyboard focus and updated appearance
Change-Id: I771ca7bb8b22d26efabccc35db8aca2956689516
David Steele [Fri, 23 Sep 2016 12:58:14 +0000 (13:58 +0100)]
[dali_1.2.7] Merge branch 'devel/master'
Change-Id: I9efc857ec2d1602ab762a9951b0a2f3bb7154977
David Steele [Fri, 23 Sep 2016 12:57:29 +0000 (13:57 +0100)]
DALi Version 1.2.7
Change-Id: I3f78b67fd96fe0b60387f032861b261406907f4f
Andrew Poor [Mon, 19 Sep 2016 16:11:11 +0000 (17:11 +0100)]
Primitive shape title and slider granularity.
Change-Id: Id03410e559c061573522e2ff405442eca5f6c6e4
David Steele [Mon, 19 Sep 2016 14:54:09 +0000 (07:54 -0700)]
Merge "Minor demo improvements." into devel/master
Andrew Poor [Fri, 16 Sep 2016 10:34:03 +0000 (11:34 +0100)]
Minor demo improvements.
*The primitive shapes demo has had the buttons scaled down slightly to fit on two lines.
*The text editor demo has had a label added to the color change button, which has itself received a border to highlight the less-visible colours.
Change-Id: I16a69bd381ef0c8c980c0c3681cc47117b2d2786
Adeel Kazmi [Fri, 16 Sep 2016 17:22:12 +0000 (18:22 +0100)]
Changes after PageTurnView moved to Devel API
Change-Id: I3c576c3efe4efb2e765c96ae69ddfa5cae1b6ebd
Adeel Kazmi [Fri, 16 Sep 2016 17:02:57 +0000 (10:02 -0700)]
Merge "Changed the shadow/lights example defaults" into devel/master
David Steele [Thu, 15 Sep 2016 11:58:03 +0000 (12:58 +0100)]
Changed the shadow/lights example defaults
Updated the defaults on the shadow / light example to first
move the light, rather than panning the scene.
Updated the intial orientations to look better.
Change-Id: I8eceb5f536a75fef5e6881987452efb53af6e544
Signed-off-by: David Steele <david.steele@samsung.com>
Agnelo Vaz [Fri, 16 Sep 2016 09:56:45 +0000 (10:56 +0100)]
[dali_1.2.6] Merge branch 'devel/master'
Change-Id: I2048a8be63b0845eb5de5d60434f6d7ec152f548
Agnelo Vaz [Fri, 16 Sep 2016 09:56:11 +0000 (10:56 +0100)]
DALi Version 1.2.6
Change-Id: Ibf9587279b25297ec02853a13e2e911ffff20f14
Kimmo Hoikka [Thu, 15 Sep 2016 15:49:56 +0000 (16:49 +0100)]
Added Finnish translation for DALi demo
Change-Id: I9fc04077340b04e98f80543cb4ba601ff9b835e7
Adeel Kazmi [Thu, 15 Sep 2016 12:32:56 +0000 (13:32 +0100)]
Updates after removal of experimental API
Change-Id: Iab968536d94de562cce7fe04940a6a327eeae803
Ferran Sole [Mon, 12 Sep 2016 09:44:02 +0000 (10:44 +0100)]
Added animated shapes demo
Change-Id: I7c8915f27798bb7651abb0e0890769a801c012cc
Tom Robinson [Mon, 12 Sep 2016 18:47:34 +0000 (19:47 +0100)]
Added bubble effect back in dali-demo (+visual changes)
Change-Id: I1a32d8ce89ea465f4eefee9ce117d0c46b621f79
Xiangyin Ma [Fri, 9 Sep 2016 13:03:25 +0000 (14:03 +0100)]
[dali_1.2.5] Merge branch 'devel/master'
Change-Id: I124203ec4115d626695b7b11212eed346c3eaf2b
Xiangyin Ma [Fri, 9 Sep 2016 13:02:48 +0000 (14:02 +0100)]
DALi Version 1.2.5
Change-Id: I0b89bc59de6fd12a6e082f201947344175cf05e2
Paul Wisbey [Thu, 8 Sep 2016 18:12:53 +0000 (11:12 -0700)]
Merge "Clipping API feature in Actor" into devel/master
shiva.jm [Tue, 2 Aug 2016 05:54:52 +0000 (11:24 +0530)]
Add Progress Bar Control Demo Application
Change-Id: I9a725b76acc387f114478eb5f0a626e211b285e6
Signed-off-by: shiva.jm <shiva.jm@samsung.com>
Adeel Kazmi [Thu, 8 Sep 2016 17:09:15 +0000 (10:09 -0700)]
Merge "Port the sparkle effect demo" into devel/master
Paul Wisbey [Mon, 5 Sep 2016 09:44:53 +0000 (10:44 +0100)]
Port the sparkle effect demo
(Based on original demo by Xiangyin Ma)
Change-Id: I9ac5d9b9c4cb18a21d0a12fae0225af5527e405e
Tom Robinson [Fri, 18 Mar 2016 17:28:06 +0000 (17:28 +0000)]
Clipping API feature in Actor
A multiple-branch clipping specific demo will be done in a separate patch.
Change-Id: Ie4c776dab8afecd44a278f199752ac3030210098
Kimmo Hoikka [Thu, 8 Sep 2016 13:26:26 +0000 (06:26 -0700)]
Merge "Combine StencilMode and WriteToColorBuffer to RenderMode" into devel/master
Tom Robinson [Wed, 7 Sep 2016 18:31:24 +0000 (19:31 +0100)]
Combine StencilMode and WriteToColorBuffer to RenderMode
Change-Id: I423fa10241eaf3a617f47490aa5484ed54c68594
Andrew Poor [Thu, 1 Sep 2016 12:01:44 +0000 (13:01 +0100)]
Removed 3D layer dependency of Model3dView and Mesh Visual.
In addition, the use of the deprecated TouchedSignal has been replaced.
Change-Id: Ia2d6999f2d1a86f39dfe4018478d7051746eb108
Victor Cebollada [Fri, 2 Sep 2016 14:02:56 +0000 (15:02 +0100)]
[dali_1.2.4] Merge branch 'devel/master'
Change-Id: Idfe0ebf0e9c5de4f4d42ba1ae22fa0df21167dd4
Victor Cebollada [Fri, 2 Sep 2016 14:02:05 +0000 (15:02 +0100)]
DALi Version 1.2.4
Change-Id: I55e08beef18bd0e9e86f436db05fbad8a156bc77
Adeel Kazmi [Tue, 30 Aug 2016 18:43:15 +0000 (11:43 -0700)]
Merge "Fixed up styling following toolkit string comparison" into devel/master
Adeel Kazmi [Tue, 30 Aug 2016 17:13:48 +0000 (10:13 -0700)]
Merge "Rename color property of primitive visual to mixColor." into devel/master
Andrew Poor [Tue, 30 Aug 2016 14:41:19 +0000 (15:41 +0100)]
Rename color property of primitive visual to mixColor.
Change-Id: Ifc6d48bd19b6d316db721cf60cf8e29a394d283b
Tom Robinson [Tue, 30 Aug 2016 12:55:09 +0000 (13:55 +0100)]
Remove bubble-effect from dali demo main screen
Change-Id: I73429729dab7d5df1291c95e5cff03bcfdb87218
Umar [Fri, 26 Aug 2016 09:28:38 +0000 (10:28 +0100)]
[dali_1.2.3] Merge branch 'devel/master'
Change-Id: I5c3cbc42af7295e62852a1d6984df1837d7c2c9c
Umar [Fri, 26 Aug 2016 09:27:39 +0000 (10:27 +0100)]
DALi Version 1.2.3
Change-Id: I72c54936005492b1789a4ad654ed268d34f68519
David Steele [Wed, 17 Aug 2016 18:32:36 +0000 (19:32 +0100)]
Fixed up styling following toolkit string comparison
Fixed style paths in build system for images
Changed style names in style sheets to use CamelCase for readability.
Change-Id: I094af8d27e7a8af23555a63e7b76df3e9e1993ec
Signed-off-by: David Steele <david.steele@samsung.com>
David Steele [Wed, 24 Aug 2016 14:23:14 +0000 (15:23 +0100)]
Fixing resource path for desktop builds
Change-Id: I5bdebc181f8a67b525e672ab702c78b32112a914
David Steele [Tue, 23 Aug 2016 16:58:14 +0000 (17:58 +0100)]
Updating .gitignore
Change-Id: I6a964e40128aa019189819fdb2a569f9b2b0dd3d
Ferran Sole [Fri, 19 Aug 2016 10:00:17 +0000 (11:00 +0100)]
[dali_1.2.2] Merge branch 'devel/master'
Change-Id: I8982dceee284d864344c379961665b52f3980bfc
Ferran Sole [Fri, 19 Aug 2016 09:59:01 +0000 (10:59 +0100)]
DALi Version 1.2.2
Change-Id: I6a63d63aea02b56de0f36abe62b2398145a7661d
Agnelo Vaz [Mon, 1 Aug 2016 16:25:04 +0000 (17:25 +0100)]
Platform specific resource locations for dali demos
"res" directory houses resources like images, models and videos.
Change-Id: I7af9c4b1cf3aac06feb06113104c7f8fbc48867d
Paul Wisbey [Tue, 16 Aug 2016 16:03:28 +0000 (09:03 -0700)]
Merge "Use the input style changed signal to update the gui." into devel/master
Adeel Kazmi [Tue, 16 Aug 2016 15:54:53 +0000 (08:54 -0700)]
Merge "Animated control background color of text label" into devel/master
David Steele [Tue, 16 Aug 2016 12:46:19 +0000 (13:46 +0100)]
Animated control background color of text label
Change-Id: I9126b77e2b711604d78af73ba549e978746f9b14
Andrew Poor [Thu, 11 Aug 2016 10:53:34 +0000 (11:53 +0100)]
Mesh visual buttons change.
Change-Id: I32ed8eb68cd099fc329a93fc6c370a4caada32a0
Seoyeon Kim [Fri, 12 Aug 2016 08:42:15 +0000 (17:42 +0900)]
Translate the dali-demo titile in Korean
Change-Id: I265e610f934b4d3515429c55461d42f654d94b81
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Victor Cebollada [Wed, 27 Jul 2016 07:09:15 +0000 (08:09 +0100)]
Use the input style changed signal to update the gui.
Change-Id: Idc1940ad0e27ec5a20641912d982b3d5865fbc20
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Nick Holland [Fri, 12 Aug 2016 10:41:44 +0000 (11:41 +0100)]
[dali_1.2.1] Merge branch 'devel/master'
Change-Id: I88921df2ca55707305dc7aa616106566b5a67d6d
Nick Holland [Fri, 12 Aug 2016 10:41:11 +0000 (11:41 +0100)]
DALi Version 1.2.1
Change-Id: I3a93d7b534c95579f4b8a5d45be398595fc5de6b