Seoyeon Kim [Mon, 23 May 2016 10:28:02 +0000 (19:28 +0900)]
Updated demo following Slider move to the public API
Change-Id: I33bbf86c1ae35d8b55f4b5c3d8d83d27503c2ecc
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
taeyoon [Mon, 2 May 2016 04:44:19 +0000 (13:44 +0900)]
Sample for video view control
Add a sample for video view control
- Playback, custom shader
Change-Id: Ie1527d63f2cff681cac7405b0e45624028e1f095
Adeel Kazmi [Mon, 13 Jun 2016 09:52:54 +0000 (10:52 +0100)]
Use new touch signal & image-view URL specified as a string
Change-Id: Ied59238560a6e49f4ed60b437a0225cf07e425ea
Xiangyin Ma [Fri, 10 Jun 2016 10:48:29 +0000 (11:48 +0100)]
DALi Version 1.1.38
Change-Id: I95d6919dd7424729bc644f62824bbac515aebe20
Kimmo Hoikka [Fri, 3 Jun 2016 16:13:24 +0000 (09:13 -0700)]
Merge "Updata Atlas example following the PixelData change" into devel/master
Tom Robinson [Fri, 3 Jun 2016 13:33:47 +0000 (14:33 +0100)]
DALi Version 1.1.37
Change-Id: Iff23fa6ef913948b6e8deef296375c6cddde567e
Xiangyin Ma [Thu, 26 May 2016 15:54:12 +0000 (16:54 +0100)]
Updata Atlas example following the PixelData change
Change-Id: I3e37cc6dcfddc9cfc092b6b9aa68f9d4b932b71f
Paul Wisbey [Thu, 2 Jun 2016 17:03:08 +0000 (10:03 -0700)]
Merge "Simple TextEditor demo." into devel/master
Victor Cebollada [Thu, 2 Jun 2016 14:31:16 +0000 (15:31 +0100)]
Simple TextEditor demo.
Change-Id: I6d36b8cc0c9ca9ce91def537024b1fdb8ac94bf9
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Fri, 27 May 2016 16:07:19 +0000 (17:07 +0100)]
Use new TouchData API
Change-Id: Ia8cc676eeb95ec2673995026cddca8850693d04e
suhyung Eom [Tue, 31 May 2016 09:33:50 +0000 (18:33 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: I5b76cfa3207618e58c716a0543f47a69cb0d4de5
Richard Huang [Fri, 27 May 2016 11:21:18 +0000 (12:21 +0100)]
DALi Version 1.1.36
Change-Id: I58c976327fa95fc9e1273936e0545244f05261db
Xiangyin Ma [Mon, 23 May 2016 16:22:09 +0000 (17:22 +0100)]
Use sync image loading in text scrolling example
Change-Id: I1a9bd9116c491f158fd2a1bf64657a5123376407
Tom Robinson [Tue, 24 May 2016 15:03:12 +0000 (16:03 +0100)]
Allows debug builds to be enabled for GBS & Ubuntu builds
You can now enable a debug build of DALi via GBS by adding the following to your GBS build line:
--define "%enable_debug 1"
Details in README file.
Change-Id: Ie587690ac1871d17905e83b70ce251d64f88dff2
Nick Holland [Fri, 20 May 2016 10:17:50 +0000 (11:17 +0100)]
DALi Version 1.1.35
Change-Id: If8b46cadc3ef249ad52da2c0b92618717e9f0cc4
Richard Huang [Tue, 10 May 2016 15:17:19 +0000 (16:17 +0100)]
Make FlexContainer as public API
Change-Id: Id10551f78b22606e3e9002bda5f508feeaae1e47
Richard Huang [Wed, 18 May 2016 12:23:56 +0000 (13:23 +0100)]
Support for child properties registration in FlexContainer
Change-Id: I12e45bcce115a5e78ca60bf88b1183f2bdebe873
minho.sun [Wed, 18 May 2016 02:15:06 +0000 (11:15 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: I8b916a6a9e3be55c66f09930df4c9155f0695589
Adeel Kazmi [Fri, 13 May 2016 14:35:01 +0000 (07:35 -0700)]
Merge "Text Message Field example changed to a Text Scrolling demo" into devel/master
Agnelo Vaz [Tue, 10 May 2016 09:12:24 +0000 (10:12 +0100)]
Text Message Field example changed to a Text Scrolling demo
Shows text labels scrolling with large/small text and rtl and ltr text.
TextField can scroll to top of screen, demonstrates the Popup positioning when space restricted
Change-Id: I48b2f4b1510ff1b7cc0d13dcccb8ead516c2772c
Ferran Sole [Fri, 13 May 2016 10:54:59 +0000 (11:54 +0100)]
DALi Version 1.1.34
Change-Id: I7cd9fef39a259a267b577e2e877f3a324f400390
Victor Cebollada [Thu, 12 May 2016 08:28:49 +0000 (09:28 +0100)]
ItemView - Shows how to use the "stopScrolling" action.
* Do a long press on the item-view.
* The item-view will scroll towards the last item for 5 seconds
if the touch point is in the bottom half of the screen or to
the first item otherwise.
* If the long press is cancelled, the animation finishes.
Change-Id: I523bc992953d3d3a0ba3bd292598b77042955cdf
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
David Steele [Fri, 6 May 2016 14:47:35 +0000 (15:47 +0100)]
DALi Version 1.1.33
Change-Id: Idd1a1e272dadcb1719f4b7f31536e00e91276264
dongsug.song [Wed, 4 May 2016 00:09:16 +0000 (09:09 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: Ie7b8cfa4cd8adee13b52fd3bb3ad09fa39bdd1fe
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
Paul Wisbey [Fri, 22 Apr 2016 13:04:01 +0000 (14:04 +0100)]
Blending enum clean-up
We were previously using a mixture of BLEND and BLENDING in enums.
The order of the BLEND_FACTOR enums & string names was also inconsistent.
As a rule of thumb always use Blend & BLEND for namespaces & enums/constants
(not Blending or BLENDING)
Change-Id: Ia4dd6483edc56e9736436e7aa8545b40f999ba47
Agnelo Vaz [Fri, 29 Apr 2016 08:10:56 +0000 (09:10 +0100)]
DALi Version 1.1.32
Change-Id: Icda20718f0353032008902e333192863d5e7d3f5
Adeel Kazmi [Thu, 28 Apr 2016 12:42:01 +0000 (05:42 -0700)]
Merge "Updated demos following StyleManager move to the public API" into devel/master
Xiangyin Ma [Mon, 18 Apr 2016 17:48:57 +0000 (18:48 +0100)]
Stop using ImageActor in Json files
Change-Id: Ia032845f8db6dc457b940500c453930e8b588207
Adam Bialogonski [Tue, 19 Apr 2016 15:10:28 +0000 (16:10 +0100)]
line-mesh-demo using setIndexRange(). When changing mode it doesn't recreate the index buffer, but changes the range of indices to draw and the type of primitives.
added interface to modify number of used elements from the elements array.
Change-Id: If0b223e6ace3d64aae8f16af0a284a42a7c9d967
David Steele [Tue, 26 Apr 2016 14:23:07 +0000 (15:23 +0100)]
Updated demos following StyleManager move to the public API
Change-Id: I988e00a3a2d36ec6f9f9341443c500f03aa70c72
Signed-off-by: David Steele <david.steele@samsung.com>
Ferran Sole [Wed, 20 Apr 2016 15:11:56 +0000 (16:11 +0100)]
Changes following "Remove geometry scvene object"
Change-Id: I8138d652252f76ef24becc0fcfce3cef15321cad
Xiangyin Ma [Thu, 21 Apr 2016 16:15:23 +0000 (17:15 +0100)]
update following the changes of the ControlRenderer property names
Change-Id: I2aea5bcde8b3a1a4b2bebdcb9ad525ed87a9847a
Adeel Kazmi [Fri, 22 Apr 2016 09:08:06 +0000 (10:08 +0100)]
DALi Version 1.1.31
Change-Id: I8321e948b6f85990f62c98855bfde433045f432e
taeyoon [Wed, 20 Apr 2016 04:20:21 +0000 (13:20 +0900)]
Working... Add missed tag and fix launch issue
- Fix mismatch between <ui...> and </ui..>
- Add DALI_EXPORT_API
TODO> Example launch issue in dali-demo
Change-Id: I3c685d79c725e08d3798eb9e906734effd1a2fd0
Seoyeon Kim [Wed, 20 Apr 2016 05:20:36 +0000 (14:20 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: I8ea2d92322c8f9713328930cd3343c00573d21a8
Seoyeon Kim [Wed, 20 Apr 2016 05:19:01 +0000 (14:19 +0900)]
Revert "[3.0] add perf-scroll sample"
This reverts commit
683256773411415423a61e85c9abdd3efac0cc5b.
Change-Id: I7d934143d9765882c1817893a840f170f791f92b
minho.sun [Wed, 20 Apr 2016 01:32:00 +0000 (18:32 -0700)]
Merge "add perf-scroll sample" into devel/master
Kimmo Hoikka [Tue, 19 Apr 2016 16:01:29 +0000 (09:01 -0700)]
Merge "Flexbox Demo to demonstrates a proof of concept for FlexContainer UI control" into devel/master
Xiangyin Ma [Tue, 19 Apr 2016 10:30:04 +0000 (11:30 +0100)]
Fix a typo of EffectsView example
Change-Id: I5639464418baffc593106dbb95a78b39e438aaf4
minho.sun [Wed, 30 Mar 2016 03:53:31 +0000 (12:53 +0900)]
add perf-scroll sample
add perf-scroll sample for measuring performance on tizen target.
you can use two options.
--use-mesh : use "mesh" to make images.( use imageView by default )
-t30 : set duration.( In this case, duration will be 30 second )
Change-Id: Ib2caca45bed12a62e3e9d6b57fb240aa21579e0c
minho.sun [Wed, 30 Mar 2016 03:53:31 +0000 (12:53 +0900)]
[3.0] add perf-scroll sample
add perf-scroll sample for measuring performance on tizen target.
you can use two options.
--use-mesh : use "mesh" to make images.( use imageView by default )
-t30 : set duration.( In this case, duration will be 30 second )
Change-Id: Iaf6dd8dcc4d2a3481ea15c47115d7b9387319bd0
Richard Huang [Wed, 23 Mar 2016 15:33:32 +0000 (15:33 +0000)]
Flexbox Demo to demonstrates a proof of concept for FlexContainer UI control
Change-Id: I20f7a13ebc19b54ab91194b9c6b87d787f23501d
minho.sun [Thu, 21 Jan 2016 04:49:48 +0000 (13:49 +0900)]
Improve application launching speed
To improve app launching speed on Tizen (using launchpad), Use -fPIE option instead -fPIC and attach DALI_EXPORT_API in front of each example's main function.
This is the compare result between before and after patch.
(On hawkP 2.4 / using hello-dalidemo that has one pushbutton on stage)
| before Patch | After Patch |
---------------------------------------------
| hello-dalidemo | hello-dalidemo |
---------------------------------------------
| AVG MIN MAX | AVG MIN MAX |
| 1134 1060 1188 | 291 250 337 |
After patch, launching speed drops to 30% of before.
Change-Id:I51a4f673d016f9278f867167dc2ff9f407ea6e7e
Ferran Sole [Wed, 6 Apr 2016 09:42:52 +0000 (10:42 +0100)]
Rendering API clean-up
Change-Id: I66e818b2ef1744c20af0997375065e029399df84
Adam Bialogonski [Thu, 14 Apr 2016 17:26:00 +0000 (18:26 +0100)]
line mesh demo supports LINES, LINE_LOOP and LINE_STRIP modes. added radio button to select. The geometry has been switched to use interleaved format with inclusion color to make line segments more visible.
Change-Id: Ifbf9ab55afa216c388e123a521e7e9a8004b4ede
Adam Bialogonski [Fri, 15 Apr 2016 13:59:44 +0000 (14:59 +0100)]
DALi Version 1.1.30
Change-Id: I4267d398db533e98296a87ba2d68dddfca5c118f
Xiangyin Ma [Thu, 4 Feb 2016 17:30:10 +0000 (17:30 +0000)]
Added NativeImageSource example
Change-Id: Ia827bef2339bac2c9c6390d98ae27f3aeff62bc7
Xiangyin Ma [Thu, 17 Dec 2015 17:12:05 +0000 (17:12 +0000)]
Added EffectsView Demo
Change-Id: I604b3ae944c17d33a5ecaa5296966865e2eecd69
Adeel Kazmi [Tue, 12 Apr 2016 15:13:41 +0000 (08:13 -0700)]
Merge "Update PageTurnView Demo" into devel/master
Kimmo Hoikka [Mon, 11 Apr 2016 17:11:29 +0000 (10:11 -0700)]
Merge "Added SVG image to background JSON" into devel/master
Paul Wisbey [Mon, 11 Apr 2016 12:49:15 +0000 (13:49 +0100)]
Removed some dead code from line-mesh-example
Change-Id: I1858ec61c3b6f662320f74289305cea08d831c98
Adeel Kazmi [Mon, 11 Apr 2016 09:12:48 +0000 (10:12 +0100)]
Added SVG image to background JSON
Change-Id: I1fe304f892aa92108cbb07a46368eb267b97f9e0
Adeel Kazmi [Fri, 8 Apr 2016 16:26:55 +0000 (09:26 -0700)]
Merge "Using nicer gradient for background.json script and use border" into devel/master
Agnelo Vaz [Thu, 7 Apr 2016 19:34:02 +0000 (20:34 +0100)]
Using nicer gradient for background.json script and use border
5 renderers now shown in background.json script
TextLabel
Border
Color
Gradient
Image
Examples updated to use Border renderer new property names
Change-Id: I967e9f4e1ea12a1402b247a49d14ec2681272af7
Richard Huang [Fri, 20 Nov 2015 10:58:23 +0000 (10:58 +0000)]
Update PageTurnView Demo
Change-Id: I2e051bee26d462acf2487f343d39cc6f1d186842
Xiangyin Ma [Fri, 8 Apr 2016 10:24:51 +0000 (11:24 +0100)]
DALi Version 1.1.29
Change-Id: Ifaa5d94fb9b6d20e897c9ecc049a200bbe5bdce2
Adeel Kazmi [Wed, 6 Apr 2016 16:23:24 +0000 (17:23 +0100)]
(Builder Example) Ensured builder layer is shown beneath the toolbar
Previously, it was in the center of the screen so the top was cut off by the toolbar even though
we were adjusting the size.
Change-Id: I3ed43f9b9a0d61ffc6fdc6fa77cb70557424339b
Adeel Kazmi [Wed, 6 Apr 2016 09:38:54 +0000 (10:38 +0100)]
Cleaned up some & removed redundant JSON scripts, as well as background color property fixes
Change-Id: Ibc0003534afd5e07d806bcf88dd17640d29ddfad
Agnelo Vaz [Thu, 10 Mar 2016 16:53:01 +0000 (16:53 +0000)]
Reduced number of metaball in explosion demo to 6 from 12
Size of balls increased to compensate for reduced number
Change-Id: If90ff5f335bd296582af937ee6945e06a8221ceb
suhyung Eom [Tue, 5 Apr 2016 08:05:18 +0000 (17:05 +0900)]
Merge branch 'devel/master (1.1.28)' into tizen
- version up 1.1.26 to 1.1.28
Change-Id: I8ce918b32e7f2525362c2151580a6dc0e04d751e
suhyung Eom [Tue, 5 Apr 2016 07:59:39 +0000 (16:59 +0900)]
Revert "[3.0] change absolute dir to TZ_* path"
This reverts commit
7997d145b568da754377a7dcd8eb96c0cbb2a8d8.
Change-Id: I651f1df4c2af25a9f1e43e5eb4d5ec12e438deb9
suhyung Eom [Tue, 5 Apr 2016 07:57:50 +0000 (16:57 +0900)]
Revert "[3.0] Fix wrong path in spec"
This reverts commit
62d8230688564add861d39a2d3904e310ad86d50.
Change-Id: Ic373027cd6577389cd2d739a570c9373d5d981a7
suhyung Eom [Tue, 5 Apr 2016 07:55:38 +0000 (16:55 +0900)]
Revert "[3.0]add perf-scroll sample"
This reverts commit
eac11f6754453be02224b98ad46c619a725cb02d.
Change-Id: Ibd27a1d25acabe76e741aa2f2ae3b0bed4fa881a
Agnelo Vaz [Fri, 1 Apr 2016 15:04:16 +0000 (16:04 +0100)]
Gradient Renderer example property names updated
GradientRenderer property names changed in dali-toolkit so reflected here
stopOffset nolonger set in code as uses defaults
gradient json script added
Change-Id: I1412be7fe7d7abeaee847a49dfcdacba806d3efd
Heeyong Song [Mon, 4 Apr 2016 04:38:48 +0000 (21:38 -0700)]
Merge "Use TZ_path on Tizen 3.x" into devel/master
Victor Cebollada [Fri, 1 Apr 2016 08:24:37 +0000 (09:24 +0100)]
DALi Version 1.1.28
Change-Id: If4285222301f3d8f5edb0fabadbbc252cffd7ea8
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
minho.sun [Mon, 28 Mar 2016 09:35:17 +0000 (18:35 +0900)]
Use TZ_path on Tizen 3.x
Use TZ_path on Tizen 3.x .
btzplatform-config has TZ_path variable.
Attach variable table below.
variable | actual path
----------------------------------------
%TZ_SYS_BIN | /usr/bin
%TZ_SYS_RUN | /var/run
%TZ_SYS_DATA | /opt/data
%TZ_SYS_RW_APP | /opt/usr/apps
%TZ_SYS_DB | /opt/dbspace
%TZ_SYS_SHARE | /opt/share
%TZ_SYS_ETC | /opt/etc
%TZ_SYS_HOME | /home
%TZ_SYS_ROOT | /root
%TZ_SYS_RO_APP | /usr/apps
%TZ_SYS_RO_ICONS | /usr/share/icons
%TZ_SYS_RO_PACKAGES | /usr/share/pakages
%TZ_SYS_RO_UG | /usr/ug
Change-Id: I09ea4314a76a9445e1dd3c91f3fd4bd8c63dc155
dongsug.song [Thu, 24 Mar 2016 11:30:17 +0000 (20:30 +0900)]
[3.0]add perf-scroll sample
add perf-scroll sample for measuring benchmark.
you can use some options.
--use-imageview : use "imageview" to make images.
--use-mesh : use "mesh" to make images.
-t30 : set duration.(In this case, duration will be 30 second)
Change-Id: Iefa0c8e64998b25d1b778edd7a1eef80f8a04aa4
minho.sun [Mon, 28 Mar 2016 05:28:40 +0000 (14:28 +0900)]
[3.0] Fix wrong path in spec
Change smack_rule_dir
/etc/smack/accesses2.d/%TZ_SYS_RO_PACKAGES to /etc/smack/accesses2.d/
Change-Id: Ie5ec49a7a4bbee2e90d61ce5cd642a63e7f1d692
Tom Robinson [Thu, 24 Mar 2016 15:49:19 +0000 (15:49 +0000)]
DALi Version 1.1.27
Change-Id: I4a66b67ae99249a4edc7851674336a3ba60f2b88
minho.sun [Thu, 24 Mar 2016 10:17:32 +0000 (19:17 +0900)]
[3.0] change absolute dir to TZ_* path
Change absolute dir to TZ_* path
variable | actual path
----------------------------------------
%TZ_SYS_BIN | /usr/bin
%TZ_SYS_RUN | /var/run
%TZ_SYS_DATA | /opt/data
%TZ_SYS_RW_APP | /opt/usr/apps
%TZ_SYS_DB | /opt/dbspace
%TZ_SYS_SHARE | /opt/share
%TZ_SYS_ETC | /opt/etc
%TZ_SYS_HOME | /home
%TZ_SYS_ROOT | /root
%TZ_SYS_RO_APP | /usr/apps
%TZ_SYS_RO_ICONS | /usr/share/icons
%TZ_SYS_RO_PACKAGES | /usr/share/pakages
%TZ_SYS_RO_UG | /usr/ug
Change-Id: Icc0e03ee703f1ef66a04d268b9b77e137cc78959
Xiangyin Ma [Tue, 23 Feb 2016 16:58:07 +0000 (16:58 +0000)]
Render SVG with ImageView
Change-Id: I70f0ffcb30d9d353940eed5c22c631be79122d55
Paul Wisbey [Mon, 21 Mar 2016 17:29:44 +0000 (17:29 +0000)]
PropertyBuffer SetData clean-up
Change-Id: Ia4783fd5c18ccc97e81c239eadf00663d625d962
minho.sun [Mon, 21 Mar 2016 02:51:25 +0000 (11:51 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: Ifebc446e0b9318cf264a8065fdd044cb4961ab85
minho.sun [Mon, 21 Mar 2016 02:50:48 +0000 (11:50 +0900)]
Revert "[3.0] change manifest xml file to fix permission denied error when launching sample app"
This reverts commit
db3183e0aaeda82f2bf9e5f3a668dc1cd86d9310.
Change-Id: Ie81d25be4995cb573479ccfd7cc3ec2a19670b25
Richard Huang [Fri, 18 Mar 2016 13:10:13 +0000 (13:10 +0000)]
DALi Version 1.1.26
Change-Id: I9906d8f0c1cf1ce48e5f2aae6260e30bd076acd3
dongsug.song [Tue, 16 Feb 2016 10:08:05 +0000 (19:08 +0900)]
[3.0] change manifest xml file to fix permission denied error when launching sample app
Change-Id: I442d947144a3723063cbb3c6746b6132d878a1e4
suhyung Eom [Wed, 16 Mar 2016 02:04:59 +0000 (19:04 -0700)]
Merge "Add TiltSensor demo" into devel/master
Nick Holland [Fri, 11 Mar 2016 15:02:46 +0000 (15:02 +0000)]
DALi Version 1.1.25
Change-Id: I2ed2d9500bd60f3bb521ccba593ba2ca0cb144af
Ferran Sole [Thu, 18 Feb 2016 17:26:19 +0000 (17:26 +0000)]
Changes following deprecation of position inheritance modes
Change-Id: Ia04c81329062610182df63da05b58def4c3d927f
Tom Robinson [Tue, 8 Mar 2016 18:43:43 +0000 (18:43 +0000)]
Fixed dali-demo bubbles non-linear movement and stopping
Change-Id: I6788eb41a29a81f9a2f3fb1722d9ef5e416075b8
suhyung Eom [Tue, 8 Mar 2016 08:39:09 +0000 (17:39 +0900)]
Add TiltSensor demo
Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: I9e367f4140f18566526ea917da8e571403bd046c
Ferran Sole [Mon, 7 Mar 2016 09:07:57 +0000 (09:07 +0000)]
DALi Version 1.1.24
Change-Id: I968b8cb3ef02054373ff544804bd7c5735c54073
Tom Robinson [Tue, 1 Mar 2016 14:50:47 +0000 (14:50 +0000)]
Dali-demo install script and README for Emscripten examples
Change-Id: I15c5a25925ed9c8fdd60f8b0fa322fbeaf02c94a
Kimmo Hoikka [Tue, 1 Mar 2016 13:48:30 +0000 (05:48 -0800)]
Merge "Added Javascript docs live demo example" into devel/master
David Steele [Fri, 26 Feb 2016 14:01:45 +0000 (06:01 -0800)]
Merge "DALi Version 1.1.23" into devel/master
David Steele [Fri, 26 Feb 2016 13:45:40 +0000 (13:45 +0000)]
DALi Version 1.1.23
Change-Id: I120c6f2c6c616129f5f68b6afdce13138031f0c1
dongsug.song [Tue, 16 Feb 2016 10:08:05 +0000 (19:08 +0900)]
change manifest xml file to fix permission denied error when launching sample app
Change-Id: Icdf807f5d57f533712575daad708ab921151e386
Lee Morgan [Wed, 24 Feb 2016 14:48:28 +0000 (14:48 +0000)]
Added Javascript docs live demo example
Change-Id: Ifca2f2f905ba81cdf725737907790586a12a5452
dongsug.song [Tue, 23 Feb 2016 13:32:22 +0000 (22:32 +0900)]
Merge branch 'devel/master' into tizen
tizen branch 1.1.16 => 1.1.22 version updated
Change-Id: Iee78a83b217dc42fef8193215ef0771023cc2f63
Tom Robinson [Thu, 25 Feb 2016 17:03:03 +0000 (17:03 +0000)]
Build: Only copy dali-toy on Desktop build
Change-Id: I85adbc37a0474ae79918e289ddf2a6e39f7d24a6
dongsug.song [Tue, 23 Feb 2016 13:30:16 +0000 (22:30 +0900)]
Revert "[3.0] Ensure the use of ShaderEffect in ImageActor is backwards-compatible"
This reverts commit
19c4c5ee5277f60974a2937e58e2ccb501c68fa7.
Change-Id: I156a1e8e39fe84a647a3bee093cae4475c29fd96
Tom Robinson [Fri, 19 Feb 2016 17:30:49 +0000 (17:30 +0000)]
Dali-Toy Javascript demo
Change-Id: I6a663c46a6592bbb3aaa24f3a12ff5937664b262
Adeel Kazmi [Fri, 19 Feb 2016 11:16:56 +0000 (03:16 -0800)]
Merge "DALi Version 1.1.22" into devel/master
Agnelo Vaz [Fri, 19 Feb 2016 10:52:36 +0000 (10:52 +0000)]
DALi Version 1.1.22
Change-Id: I47a1123083a73f1a08bf435c38fc94a27776b582
Adeel Kazmi [Thu, 18 Feb 2016 13:12:07 +0000 (13:12 +0000)]
Updates following rendererType changes
Change-Id: I980d7723528705caa2d903c9b36c24c4b744a55e
Xiangyin Ma [Thu, 11 Feb 2016 16:37:14 +0000 (16:37 +0000)]
[3.0] Ensure the use of ShaderEffect in ImageActor is backwards-compatible
Change-Id: I699f227e72c4b3ce906a17fdb3dc940331c9ec4a
Xiangyin Ma [Thu, 11 Feb 2016 16:37:14 +0000 (16:37 +0000)]
Ensure the use of ShaderEffect in ImageActor is backwards-compatible
Change-Id: I699f227e72c4b3ce906a17fdb3dc940331c9ec4a
Adeel Kazmi [Fri, 12 Feb 2016 10:32:37 +0000 (10:32 +0000)]
DALi Version 1.1.21
Change-Id: I1ed026ec74a77180df3725ec0e930d9cdfb3d84c
Xiangyin Ma [Mon, 1 Feb 2016 13:47:34 +0000 (13:47 +0000)]
Update following the changes of Blending&Culling options
Change-Id: I390f4bd7cca141658c3a300ae742145fddf37e07