platform/core/uifw/dali-demo.git
7 years agoMerge branch 'devel/master' into tizen 82/141682/1 accepted/tizen/unified/20170809.015320 submit/tizen/20170804.104325 submit/tizen/20170804.104701
minho.sun [Tue, 1 Aug 2017 01:14:38 +0000 (10:14 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: I399c2bffd2cbfad7207c31ccc286dd3911d5113a

7 years agoMerge "DALi Version 1.2.50" into devel/master
David Steele [Fri, 28 Jul 2017 16:02:12 +0000 (16:02 +0000)]
Merge "DALi Version 1.2.50" into devel/master

7 years agoDALi Version 1.2.50 29/141229/1 dali_1.2.50
Adeel Kazmi [Fri, 28 Jul 2017 15:55:08 +0000 (16:55 +0100)]
DALi Version 1.2.50

Change-Id: Idb01763ead54404a3153e3ac46e79c156abbcf5d

7 years agoAnimate Text Color of TextLabel 08/141208/1
Agnelo Vaz [Fri, 28 Jul 2017 13:19:08 +0000 (14:19 +0100)]
Animate Text Color of TextLabel

Change-Id: If1cf3c6bd484f9b2ce64b0fba79dbef0c23cb9fb

7 years agoMerge branch 'devel/master (1.2.49)' into tizen 52/140152/1 accepted/tizen/4.0/unified/20170816.013904 accepted/tizen/4.0/unified/20170816.020249 accepted/tizen/unified/20170727.191515 submit/tizen/20170725.060315 submit/tizen/20170725.110106 submit/tizen/20170726.063443 submit/tizen/20170727.071110 submit/tizen_4.0/20170811.094300 submit/tizen_4.0/20170814.115522 submit/tizen_4.0_unified/20170814.115522
taeyoon0.lee [Mon, 24 Jul 2017 03:48:12 +0000 (12:48 +0900)]
Merge branch 'devel/master (1.2.49)' into tizen

Change-Id: Iab84a1ceaa5ca7bec289cd316d62587cc52b4429

7 years agoMerge "DALi Version 1.2.49" into devel/master
Adeel Kazmi [Fri, 21 Jul 2017 13:27:49 +0000 (13:27 +0000)]
Merge "DALi Version 1.2.49" into devel/master

7 years agoDALi Version 1.2.49 52/140052/1 dali_1.2.49
David Steele [Fri, 21 Jul 2017 13:24:52 +0000 (14:24 +0100)]
DALi Version 1.2.49

Change-Id: I15c574e04a6a3c86694bf436edee6db7ac0abc07

7 years agoUpdated alpha blend demo to handle scale/crop 31/139631/1
David Steele [Wed, 19 Jul 2017 19:52:16 +0000 (20:52 +0100)]
Updated alpha blend demo to handle scale/crop

Change-Id: I6ddbf61182eb8cb01ce5b25699e747fcab6c68b2

7 years agoUpdated alpha blend example to use better masks of different size 97/138997/1
David Steele [Fri, 14 Jul 2017 15:16:47 +0000 (16:16 +0100)]
Updated alpha blend example to use better masks of different size

Demonstrates quality improvements in adaptor patch

Change-Id: Ibf433741526f8014d2e9c345319f865f5aa9c80e
Signed-off-by: David Steele <david.steele@samsung.com>
7 years agoMerge "Updated animated-images example to also handle image arrays" into devel/master
Adeel Kazmi [Fri, 14 Jul 2017 14:41:57 +0000 (14:41 +0000)]
Merge "Updated animated-images example to also handle image arrays" into devel/master

7 years agoDALi Version 1.2.48 80/138980/1 dali_1.2.48
adam.b [Fri, 14 Jul 2017 12:29:37 +0000 (13:29 +0100)]
DALi Version 1.2.48

Change-Id: Icd4cbf8206913b34b627b81dcd021b5f2d2fb152

7 years agoUpdated animated-images example to also handle image arrays 86/138786/4
David Steele [Thu, 13 Jul 2017 15:50:00 +0000 (16:50 +0100)]
Updated animated-images example to also handle image arrays

Change-Id: I191a2181c42c882c050bb4e9ba35a54a656283a9

7 years agoImage view example updated, shows different visuals 83/137183/3
Agnelo Vaz [Tue, 4 Jul 2017 18:07:46 +0000 (19:07 +0100)]
Image view example updated, shows different visuals

Change-Id: Idb64f78cc15e46e0cca164a14733bc05d124c919

7 years agoobj-loader Tangent fix 34/136934/7
greynaga [Mon, 3 Jul 2017 16:16:04 +0000 (17:16 +0100)]
obj-loader Tangent fix

The tangent was generated by vertex, and was changed to per normal, this will work if the normal are defined per vertex.

This patch is creating good results with the current models tested, but depends on the output of the exporter.

In case the tangents are not correct, the 3D model should be re-exported or generate the normals programmatically.

Change-Id: I35cdf2ce581974ab5fbc85709442bcb3a8112b8f

7 years agoDALi Version 1.2.47 50/137750/1 dali_1.2.47
Agnelo Vaz [Fri, 7 Jul 2017 10:20:51 +0000 (11:20 +0100)]
DALi Version 1.2.47

Change-Id: Ib41fd5c191685f0d9bb52ebd827fd98fbffb0d0f

7 years agoMerge branch 'devel/master' into tizen 70/137170/1 accepted/tizen/unified/20170706.193941 submit/tizen/20170705.113121 submit/tizen/20170706.054645
Jinho, Lee [Tue, 4 Jul 2017 05:53:51 +0000 (14:53 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: I467bb25b8bb25bdaf5d69372e8815a2d9504f17c

7 years agoDALi Version 1.2.46 12/136612/1 dali_1.2.46
Adeel Kazmi [Fri, 30 Jun 2017 10:21:07 +0000 (11:21 +0100)]
DALi Version 1.2.46

Change-Id: Ibf37c1575bdee99f8dc3cb450d5548be4bf327b7

7 years agoRemoved BitmapLoader references 60/135660/1
David Steele [Fri, 23 Jun 2017 16:02:08 +0000 (17:02 +0100)]
Removed BitmapLoader references

Change-Id: I3b5ef31b0f8655a59c14fbabb1fa98c31699ff3c

7 years agoDALi Version 1.2.45 09/135609/1 dali_1.2.45
Victor Cebollada [Fri, 23 Jun 2017 09:44:18 +0000 (10:44 +0100)]
DALi Version 1.2.45

Change-Id: I241bf287ab4256031d92c5a61fde8fd292234231

7 years agoMerge "Clipping draw order fix" into devel/master
David Steele [Wed, 21 Jun 2017 12:50:50 +0000 (12:50 +0000)]
Merge "Clipping draw order fix" into devel/master

7 years agoClipping draw order fix 26/135026/1
Tom Robinson [Tue, 20 Jun 2017 10:51:55 +0000 (11:51 +0100)]
Clipping draw order fix

Change-Id: I3c5aa4922e891cf1ca194676d1bcf2e3493c5eb1

7 years agoMeitei string added to TextLabel multilanguage demo. 80/134980/3
Victor Cebollada [Tue, 20 Jun 2017 11:20:13 +0000 (12:20 +0100)]
Meitei string added to TextLabel multilanguage demo.

Change-Id: Ifa382ce7709a4697b8e753123aa9dfe5d724ed11
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoOl Chiki string added to TextLabel multilanguage demo. 21/135021/1
Victor Cebollada [Tue, 20 Jun 2017 13:40:57 +0000 (14:40 +0100)]
Ol Chiki string added to TextLabel multilanguage demo.

Change-Id: Ide572bd702a7f137b7ac3b54b7c5669e8c48fd8b
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoFix for multilanguage demo. 15/135015/3
Victor Cebollada [Tue, 20 Jun 2017 13:08:54 +0000 (14:08 +0100)]
Fix for multilanguage demo.

* Fix the order of the language's names.
  First the language name written in its language/script,
  then the language name in English.

Change-Id: Ia1d1bf846218395e31f3f076343a592185b8cc9c
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoMerge branch 'devel/master' into tizen 88/134888/1 accepted/tizen/unified/20170630.083238 submit/tizen/20170621.112620 submit/tizen/20170622.035441
Heeyong Song [Tue, 20 Jun 2017 07:53:43 +0000 (16:53 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: I282e9246428bec920ffe577cf33f0b63e930f48a

7 years agoMerge "Added resourceReadySignal to image-scaling-irregular demo" into devel/master
Paul Wisbey [Fri, 16 Jun 2017 14:03:57 +0000 (14:03 +0000)]
Merge "Added resourceReadySignal to image-scaling-irregular demo" into devel/master

7 years agoDALi Version 1.2.44 34/134434/1 dali_1.2.44
Umar [Fri, 16 Jun 2017 11:03:58 +0000 (12:03 +0100)]
DALi Version 1.2.44

Change-Id: Iaa66dc1f68e713bf44d05d892d7ade3f590f1fc7

7 years agoAdded resourceReadySignal to image-scaling-irregular demo 04/132804/3
Nick Holland [Wed, 7 Jun 2017 15:06:04 +0000 (16:06 +0100)]
Added resourceReadySignal to image-scaling-irregular demo

Demo now waits for first 10 Images to load before loading any
further images to speed up start up time.

Un-earths a bug in TextureObserver which causes a seg fault

Change-Id: Ia389bd3ca322be2dfb37170a5ea40af65dfc23f2

7 years agoPBR demo 55/133255/12
greynaga [Tue, 6 Jun 2017 10:24:25 +0000 (11:24 +0100)]
PBR demo

With separate cameras for UI & 3D scene sections
 - Double-tap to toggle between 3D models (teapot & cube)
 - Pan up/down on left side of screen to change roughness
 - Pan up/down on right side of screen to change metalness
 - Pan anywhere else to rotate scene

Change-Id: I51ec8436700c4e970221184d6875e4e9c501fafb

7 years agoMerge branch 'devel/master' into tizen 07/133607/1 accepted/tizen/unified/20170614.141239 submit/tizen/20170613.061944 submit/tizen/20170614.120205
Seoyeon Kim [Tue, 13 Jun 2017 02:12:56 +0000 (11:12 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: I12c4d05cce521dcd28fa17e25f4fa540262564ea

7 years agoAdded example of actor depth order change 93/132993/3
David Steele [Thu, 8 Jun 2017 15:47:47 +0000 (16:47 +0100)]
Added example of actor depth order change

Fixed up SVG example to ensure actor sibling order is set after
adding to the stage.

Change-Id: Ib532eba27be23afd636e34cc9776ae4fd2c5ca48

7 years agoMerge "Added example of CPU based image masking" into devel/master
Adeel Kazmi [Fri, 9 Jun 2017 12:54:04 +0000 (12:54 +0000)]
Merge "Added example of CPU based image masking" into devel/master

7 years agoDALi Version 1.2.43 87/133287/1 dali_1.2.43
Richard Huang [Fri, 9 Jun 2017 12:23:38 +0000 (13:23 +0100)]
DALi Version 1.2.43

Change-Id: Ibf7d9b70eee75dbdf78b67c5b2fa515f2f887713

7 years agoAdded example of CPU based image masking 36/132536/4
David Steele [Tue, 6 Jun 2017 18:08:01 +0000 (19:08 +0100)]
Added example of CPU based image masking

Change-Id: I908dff83e3140113ba108d660e903f75fd4e4dc1
Signed-off-by: David Steele <david.steele@samsung.com>
7 years agoMerge "Update example to show how to style TextEditor ScrollBar" into devel/master
minho.sun [Thu, 8 Jun 2017 14:31:52 +0000 (14:31 +0000)]
Merge "Update example to show how to style TextEditor ScrollBar" into devel/master

7 years agoAmharic language using the Ge'ez script added to the text-label multi-language demo. 88/129488/2
Victor Cebollada [Tue, 16 May 2017 13:46:28 +0000 (14:46 +0100)]
Amharic language using the Ge'ez script added to the text-label multi-language demo.

Change-Id: Ibcb1a7fa097ffd8fbf45fd300a318b1006909bc2
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoMerge branch 'devel/master' into tizen 61/132661/1 accepted/tizen/unified/20170608.072244 submit/tizen/20170607.061735
minho.sun [Wed, 7 Jun 2017 03:15:18 +0000 (12:15 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: I8da619e6557a2bdb0f9e9dfd276164d1bf335640

7 years agoUpdate example to show how to style TextEditor ScrollBar 90/131990/3
minho.sun [Wed, 31 May 2017 12:12:01 +0000 (21:12 +0900)]
Update example to show how to style TextEditor ScrollBar

Update example to show how to style TextEditor ScrollBar

Change-Id: I62ebf0035490dff2c26f7e7c4df095bd2bc93345
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoChanges after Visual Depth Index API changed from float to int 08/132508/1
Adeel Kazmi [Tue, 6 Jun 2017 09:59:35 +0000 (10:59 +0100)]
Changes after Visual Depth Index API changed from float to int

Change-Id: Ib83c1baedd1b5489bbb1fb94bef8c9c64b2df26f

7 years agoUsing new Devel API with depth index to register visuals 85/132485/1
Adeel Kazmi [Mon, 5 Jun 2017 15:47:20 +0000 (16:47 +0100)]
Using new Devel API with depth index to register visuals

Change-Id: I0a763c685579514190af214572c1082a64264fa5

7 years agoChanges required after Visual parent-origin & anchor-point defaults change 54/132354/2
Adeel Kazmi [Fri, 2 Jun 2017 11:10:57 +0000 (12:10 +0100)]
Changes required after Visual parent-origin & anchor-point defaults change

Change-Id: Ia9ba3566e226a73c2ccdc5716e6d64c638bbfc1b

7 years agoMerge "DALi Version 1.2.42" into devel/master
Adeel Kazmi [Fri, 2 Jun 2017 14:14:04 +0000 (14:14 +0000)]
Merge "DALi Version 1.2.42" into devel/master

7 years agoDALi Version 1.2.42 60/132360/1 dali_1.2.42
Nick Holland [Fri, 2 Jun 2017 11:56:07 +0000 (12:56 +0100)]
DALi Version 1.2.42

Change-Id: I8e1f60ce8b6ef03df50806a092e56571d81d113f

7 years ago(Text Scrolling) Change horizontal alignment and ensure auto scrolling still works 15/132015/3
Adeel Kazmi [Wed, 31 May 2017 18:11:20 +0000 (19:11 +0100)]
(Text Scrolling) Change horizontal alignment and ensure auto scrolling still works

Change-Id: I1bc61348536ddc1100b0c991fe5157a7b5c32bd7

7 years agoMerge "Fix the broken popup layout in text field example" into devel/master
Paul Wisbey [Wed, 31 May 2017 16:42:16 +0000 (16:42 +0000)]
Merge "Fix the broken popup layout in text field example" into devel/master

7 years agoSkybox rendering example 83/131683/6
Victor Cebollada [Mon, 29 May 2017 15:39:23 +0000 (16:39 +0100)]
Skybox rendering example

Change-Id: I1b2fa79708f93836069ed81a0d4c17c6aeb6094d

7 years agoFix the broken popup layout in text field example 67/131967/1
Richard Huang [Wed, 31 May 2017 10:20:11 +0000 (11:20 +0100)]
Fix the broken popup layout in text field example

Change-Id: Iae77e4024da2c0668265f50f444b95e047908425

7 years agoMerge branch 'devel/master' into tizen 82/131882/1
Jinho, Lee [Wed, 31 May 2017 02:30:55 +0000 (11:30 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: Icc197125023ac54a46648fbc6acbdd9858a9e743

7 years agoRevert "[Tizen] Fixed install error" 64/131764/1
Jinho, Lee [Tue, 30 May 2017 11:27:51 +0000 (20:27 +0900)]
Revert "[Tizen] Fixed install error"

This reverts commit 26b66dbc390c497dd7f43236b37c8b362e547a34.

Change-Id: I043b8aec230ff64ccf37456e85fbca2c60efb96a

7 years agoRevert "[Tizen] Use Handle::GetCurrentProperty instead of Devel API" 63/131763/1
Jinho, Lee [Tue, 30 May 2017 11:27:05 +0000 (20:27 +0900)]
Revert "[Tizen] Use Handle::GetCurrentProperty instead of Devel API"

This reverts commit 114be157fb6cb98020c81b541de9da824ee89371.

Change-Id: I18fd0f5beb5c7707b1077a81266a46569bba264f

7 years agoChanges required after Visual related Control APIs moved to Devel API 77/131177/2
Adeel Kazmi [Thu, 25 May 2017 17:35:53 +0000 (18:35 +0100)]
Changes required after Visual related Control APIs moved to Devel API

Change-Id: Ie1172a02636929b88e11a8c2683f6ef5092cb55a

7 years agoDALi Version 1.2.41 47/131347/1 dali_1.2.41
greynaga [Fri, 26 May 2017 12:31:13 +0000 (13:31 +0100)]
DALi Version 1.2.41

Change-Id: I31b281ebcd6363156f8ee0bc30b1b34446b61b18

7 years agoMerge "Use Handle::GetCurrentProperty instead of Devel API" into devel/master
Adeel Kazmi [Wed, 24 May 2017 10:14:20 +0000 (10:14 +0000)]
Merge "Use Handle::GetCurrentProperty instead of Devel API" into devel/master

7 years agoMerge "Improved NativeImageSource example" into devel/master
Adeel Kazmi [Mon, 22 May 2017 11:08:48 +0000 (11:08 +0000)]
Merge "Improved NativeImageSource example" into devel/master

7 years ago[Tizen] Use Handle::GetCurrentProperty instead of Devel API 89/130389/1 accepted/tizen/unified/20170523.050803 submit/tizen/20170522.141510 tizen_4.0.m1_release
minho.sun [Mon, 22 May 2017 06:22:21 +0000 (15:22 +0900)]
[Tizen] Use Handle::GetCurrentProperty instead of Devel API

DevelHandle::GetCurrentProperty is moved to public.
So, use Handle::GetCurrentProperty instead of devel.

Change-Id: Id9058646e3502b756c81a1117872cd5fd08a8d51
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoUse Handle::GetCurrentProperty instead of Devel API 61/130361/2
minho.sun [Mon, 22 May 2017 06:22:21 +0000 (15:22 +0900)]
Use Handle::GetCurrentProperty instead of Devel API

DevelHandle::GetCurrentProperty is moved to public.
So, use Handle::GetCurrentProperty instead of devel.

Change-Id: I9747e0b068ff907b8488d814f08769cf89f2e84e
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoDALi Version 1.2.40 28/130228/1 dali_1.2.40
Francisco Santos [Fri, 19 May 2017 12:43:49 +0000 (13:43 +0100)]
DALi Version 1.2.40

Change-Id: I675fcdf6232d811bf08ff2a2e0ddc692b68b322f

7 years agoImproved NativeImageSource example 76/129976/4
Paul Wisbey [Thu, 18 May 2017 15:49:08 +0000 (16:49 +0100)]
Improved NativeImageSource example

Change-Id: I6b4629923ff9d20b48a0ba0b07369bea00900bfb

7 years agoFix demo installation break 46/129946/1
Adeel Kazmi [Thu, 18 May 2017 11:59:06 +0000 (12:59 +0100)]
Fix demo installation break

Change-Id: Ie9609827834e05cb010eda842b415186f80989da

7 years ago[Tizen] Fixed install error 69/129469/1 accepted/tizen/unified/20170518.061136 accepted/tizen/unified/20170518.061203 submit/tizen/20170517.061745 submit/tizen/20170517.083100
taeyoon0.lee [Tue, 16 May 2017 12:08:04 +0000 (21:08 +0900)]
[Tizen] Fixed install error

Change-Id: If56c4d185d684e15e855f78c1a84943fca962398

7 years agoMerge branch 'devel/master (1.2.39+)' into tizen 60/129460/1
taeyoon0.lee [Tue, 16 May 2017 11:38:54 +0000 (20:38 +0900)]
Merge branch 'devel/master (1.2.39+)' into tizen

Change-Id: I1af4dd2b90784313c54af4cb4a6a4075b9ff536b

7 years agoMerge "DALi ray marching / ray tracing example" into devel/master
Adeel Kazmi [Fri, 12 May 2017 18:24:28 +0000 (18:24 +0000)]
Merge "DALi ray marching / ray tracing example" into devel/master

7 years agoMerge "Text scrolling example use scrolling stop mode(FINISH_LOOP, IMMEDIATE) and...
Adeel Kazmi [Fri, 12 May 2017 15:19:33 +0000 (15:19 +0000)]
Merge "Text scrolling example use scrolling stop mode(FINISH_LOOP, IMMEDIATE) and loop delay" into devel/master

7 years agoDALi ray marching / ray tracing example 00/127500/8
Nick Holland [Thu, 27 Apr 2017 12:23:33 +0000 (13:23 +0100)]
DALi ray marching / ray tracing example

Uses volumetric ray casting to draw a sphere with basic
per-pixel lighting inside the fragment shader.

Also modifies DALi demo make file to support shader files.

Change-Id: I0645de8481fa75abb177ca76a5611a51350fc1b7
Todo: Create a separate folder for shaders?

7 years agoDALi Version 1.2.39 45/129045/1 dali_1.2.39
David Steele [Fri, 12 May 2017 12:42:43 +0000 (13:42 +0100)]
DALi Version 1.2.39

Change-Id: Ia7981fd8b3778a9f2d069c8456e0bf36b7dc9b16

7 years agoText scrolling example use scrolling stop mode(FINISH_LOOP, IMMEDIATE) and loop delay 49/126149/12
Jinho, Lee [Thu, 20 Apr 2017 06:59:35 +0000 (15:59 +0900)]
Text scrolling example use scrolling stop mode(FINISH_LOOP, IMMEDIATE) and loop delay

Change-Id: I991ccd799fd33bcfcf9ebfd392c0b429065996cb

7 years agoRevert "[Tizen] Use old ABI temporarily" 65/128865/1 accepted/tizen/unified/20170512.023900 submit/tizen/20170512.005333 submit/tizen/20170512.014117
Heeyong Song [Fri, 12 May 2017 00:45:26 +0000 (09:45 +0900)]
Revert "[Tizen] Use old ABI temporarily"

This reverts commit c57a9ff8c7c796631c243a3e674b3821213ebaeb.

Change-Id: Ibff6eb4fd6961e22ae41fd170b449c0e903b40cc

7 years ago[Tizen] Use old ABI temporarily 99/128199/1 accepted/tizen/unified/20170510.013040 submit/tizen/20170508.091210
Heeyong Song [Mon, 8 May 2017 04:15:07 +0000 (13:15 +0900)]
[Tizen] Use old ABI temporarily

Change-Id: I6dd331af28d75448beee073b4a91a8cc8bf078af

7 years agoMerge branch 'devel/master' into tizen 98/128198/1
Heeyong Song [Mon, 8 May 2017 04:14:40 +0000 (13:14 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: I0975d086de1558c523667665c9dff82af6af1908

7 years agoRevert "[Tizen] Use old ABI temporarily" 97/128197/1
Heeyong Song [Mon, 8 May 2017 04:13:59 +0000 (13:13 +0900)]
Revert "[Tizen] Use old ABI temporarily"

This reverts commit 749bad0ac62db024ecc4c50aca7893724737f9c5.

Change-Id: I4ec349cda5b45d71f87e9639d44b5338dbbab858

7 years agoDALi Version 1.2.38 92/128092/1 dali_1.2.38
Agnelo Vaz [Fri, 5 May 2017 09:52:31 +0000 (10:52 +0100)]
DALi Version 1.2.38

Change-Id: I27a5ead04d90b4009f1f0012a217e5710cc2daa6

7 years agoRendering API example: basic light 47/127747/12
Gonzalo Reynaga [Fri, 28 Apr 2017 12:55:07 +0000 (13:55 +0100)]
Rendering API example: basic light

Change-Id: Ice5ef50aa0bde7ddac16414dfac8615d76d9ec18

7 years ago[Tizen] Use old ABI temporarily 33/127833/1 accepted/tizen/unified/20170502.165634 submit/tizen/20170502.061218
Seoyeon Kim [Tue, 2 May 2017 02:11:45 +0000 (11:11 +0900)]
[Tizen] Use old ABI temporarily

This reverts commit 0656b3f520715c76d3f064cd294343a7841cedd9.

Change-Id: I558e644b0051dcb808276be62b5960512c1490fd

7 years agoMerge branch 'devel/master' into tizen 32/127832/1
Seoyeon Kim [Tue, 2 May 2017 02:10:56 +0000 (11:10 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: Ic64edf62a115136a5bb387f0eb7c8be8c6040ad3

7 years agoRevert "[Tizen] Use old ABI temporarily" 31/127831/1
Seoyeon Kim [Tue, 2 May 2017 02:09:47 +0000 (11:09 +0900)]
Revert "[Tizen] Use old ABI temporarily"

This reverts commit af0f96ee6b16c2aa7742680cacd0cb56c7171a25.

Change-Id: I78e3695d525d2a7b52f9317ff202ac0f43a4489d

7 years agoDALi Version 1.2.37 15/127715/1 dali_1.2.37
Adeel Kazmi [Fri, 28 Apr 2017 10:33:03 +0000 (11:33 +0100)]
DALi Version 1.2.37

Change-Id: I959d02c918463b8758c0c551940ad6b7cda34e49

7 years ago[Tizen] Use old ABI temporarily 44/126844/1 accepted/tizen/unified/20170426.061758 submit/tizen/20170425.094140 submit/tizen/20170425.110915
taeyoon0.lee [Tue, 25 Apr 2017 06:46:22 +0000 (15:46 +0900)]
[Tizen] Use old ABI temporarily

This reverts commit 0a30a93832e076af078caa186ce4a42cbc324316.

Change-Id: I178c6d0b60dd4c25988b2dde9b6bef59f161df8c

7 years agoMerge branch 'devel/master (1.2.36+)' into tizen 43/126843/1
taeyoon0.lee [Tue, 25 Apr 2017 06:45:35 +0000 (15:45 +0900)]
Merge branch 'devel/master (1.2.36+)' into tizen

Change-Id: I8d542cf5fd6b5638273e917e123d25c87140b981

7 years agoRevert "[Tizen] Changed RENDERING_TYPE to renderingType for video view" 42/126842/1
taeyoon0.lee [Tue, 25 Apr 2017 06:44:57 +0000 (15:44 +0900)]
Revert "[Tizen] Changed RENDERING_TYPE to renderingType for video view"

This reverts commit fcb1eb473bf3d5bcc5dfa63d69dae31ee2c8e334.

Change-Id: Iad3f8665923f9b015f02fa68973eac40be820c9c

7 years agoRevert "[Tizen] Use old ABI temporarily" 41/126841/1
taeyoon0.lee [Tue, 25 Apr 2017 06:44:26 +0000 (15:44 +0900)]
Revert "[Tizen] Use old ABI temporarily"

This reverts commit 2bac295c04b88131ec190139470f47afed7d41c4.

Change-Id: Ie0bc9accc669040a90526750ec953bf421a966bb

7 years ago[Tizen] Use old ABI temporarily 08/126508/1 submit/tizen/20170424.093438
Heeyong Song [Mon, 24 Apr 2017 02:20:29 +0000 (11:20 +0900)]
[Tizen] Use old ABI temporarily

Change-Id: Ie4e14005f3587cfaa6828d49a9d7867b11f26b64

7 years agoMerge "Changes after Set/Get synchronous behaviour of registered animatable & custom...
David Steele [Fri, 21 Apr 2017 12:34:20 +0000 (05:34 -0700)]
Merge "Changes after Set/Get synchronous behaviour of registered animatable & custom properties" into devel/master

7 years agoMerge "DALi Version 1.2.36" into devel/master
Adeel Kazmi [Fri, 21 Apr 2017 11:38:46 +0000 (04:38 -0700)]
Merge "DALi Version 1.2.36" into devel/master

7 years agoDALi Version 1.2.36 47/126447/1 dali_1.2.36
adam.b [Fri, 21 Apr 2017 11:29:40 +0000 (12:29 +0100)]
DALi Version 1.2.36

Change-Id: I70ba243b0e818d39eb58477f15a9c169ed369997

7 years agoChanges after Set/Get synchronous behaviour of registered animatable & custom properties 70/124470/2
Adeel Kazmi [Tue, 11 Apr 2017 10:14:29 +0000 (11:14 +0100)]
Changes after Set/Get synchronous behaviour of registered animatable & custom properties

Change-Id: Icee24bd6eedfb1764513c763393bd2a9a2853341

7 years ago[Tizen] Changed RENDERING_TYPE to renderingType for video view 57/125857/1
taeyoon0.lee [Wed, 19 Apr 2017 04:36:14 +0000 (13:36 +0900)]
[Tizen] Changed RENDERING_TYPE to renderingType for video view

Change-Id: I8b12cd759774e790c8e1abfc3c65c8d3708e7d70

7 years agoChanged RENDERING_TYPE to renderingType for video view 17/125817/1
taeyoon0.lee [Wed, 19 Apr 2017 04:36:14 +0000 (13:36 +0900)]
Changed RENDERING_TYPE to renderingType for video view

Change-Id: I8b12cd759774e790c8e1abfc3c65c8d3708e7d70

7 years agoMerge branch 'devel/master' into tizen 11/125411/1 accepted/tizen/unified/20170418.072447 submit/tizen/20170417.100748
Jinho, Lee [Mon, 17 Apr 2017 07:56:42 +0000 (16:56 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: I0a9f37f406f8ffdeba1fcd594fa46211f8583844

7 years agoDALi Version 1.2.35 97/124997/1 dali_1.2.35
Umar [Thu, 13 Apr 2017 09:10:31 +0000 (10:10 +0100)]
DALi Version 1.2.35

Change-Id: Ic0964483674ddc18950f2c753507a88b32a9c710

7 years agoMerge branch 'devel/master' into tizen 35/124035/1 accepted/tizen/unified/20170410.160011 submit/tizen/20170410.071852
minho.sun [Mon, 10 Apr 2017 03:32:29 +0000 (12:32 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: I435d9578cbf191b7e79dcdb43487931a8d44a190

7 years agoMerge "DALi Version 1.2.34" into devel/master
Adeel Kazmi [Fri, 7 Apr 2017 10:58:13 +0000 (03:58 -0700)]
Merge "DALi Version 1.2.34" into devel/master

7 years agoDALi Version 1.2.34 95/123895/1 dali_1.2.34
Nick Holland [Fri, 7 Apr 2017 10:11:21 +0000 (11:11 +0100)]
DALi Version 1.2.34

Change-Id: I258733584f2da7cf20b32351ec99888cd04428b4

7 years agoRemove UnhandledKeyEventSignal from examples. 14/123714/2
minho.sun [Thu, 6 Apr 2017 16:34:58 +0000 (01:34 +0900)]
Remove UnhandledKeyEventSignal from examples.

UnhandledKeyEventSignal is removed from KeyInputFocusManager.
Stage::KeyEventSignal can work as UnhandledKeyEventSignal.

Change-Id: I264c4fdd7aafcc668ba64bf8fe5abafed5103430
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoRendering of radial progress indicator 49/123149/4
adam.b [Fri, 10 Mar 2017 11:40:09 +0000 (11:40 +0000)]
Rendering of radial progress indicator

Tutorial shows rendering of radial progress bar with
use of stencil buffer and two renderers attached
to single actor.

Change-Id: Ia1005524ec3cd27147bb2a40ddf87c7284ad7731

7 years agoTutorials added to the xml file 48/121748/3
adam.b [Tue, 28 Mar 2017 17:25:39 +0000 (18:25 +0100)]
Tutorials added to the xml file

Change-Id: I6fe21917c21063709d1516c0bcf5d83530908161

7 years agoMerge "DALi Version 1.2.33" into devel/master
Paul Wisbey [Fri, 31 Mar 2017 12:33:26 +0000 (05:33 -0700)]
Merge "DALi Version 1.2.33" into devel/master

7 years agoDALi Version 1.2.33 38/122438/1 dali_1.2.33
Richard Huang [Fri, 31 Mar 2017 09:59:03 +0000 (10:59 +0100)]
DALi Version 1.2.33

Change-Id: I45bfcc74c0169df10333b28db1f584807160467f

7 years agoMerge branch 'devel/master' into tizen 64/122364/1 accepted/tizen_common accepted/tizen_ivi accepted/tizen_mobile accepted/tizen_tv accepted/tizen_wearable accepted/tizen/common/20170403.185636 accepted/tizen/ivi/20170403.022404 accepted/tizen/mobile/20170403.021959 accepted/tizen/tv/20170403.022208 accepted/tizen/unified/20170403.022426 accepted/tizen/wearable/20170403.022318 submit/tizen/20170331.124519
dongsug.song [Fri, 31 Mar 2017 05:57:03 +0000 (14:57 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: If12fb6560b14a3d83693d4135c4e2d3530ccc55e

7 years agoTextScrolling example allows text color changes 21/122221/1
Agnelo Vaz [Thu, 30 Mar 2017 14:19:09 +0000 (15:19 +0100)]
TextScrolling example allows text color changes

Change-Id: I01f2785583486b5c26cee4ae8cfaa9ac1b40bb92

7 years agoMerge branch 'devel/master' into tizen 41/121041/1 accepted/tizen/common/20170327.143227 accepted/tizen/ivi/20170328.060434 accepted/tizen/mobile/20170328.060028 accepted/tizen/tv/20170328.060211 accepted/tizen/unified/20170328.060502 accepted/tizen/wearable/20170328.060344 submit/tizen/20170327.130356
Seoyeon Kim [Mon, 27 Mar 2017 05:59:36 +0000 (14:59 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: Iab9636d4e7113374521306d69d85e1e914f6002c