Paul Wisbey [Fri, 20 Mar 2015 17:22:49 +0000 (17:22 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text
Change-Id: Ie9718a263a8ab3b12209e1409754834ed986460f
Paul Wisbey [Thu, 19 Mar 2015 15:04:35 +0000 (15:04 +0000)]
Added more TextLabels
Change-Id: I4d107d2611cb03b218ea03e9b7e2d26b9b403127
Richard Huang [Thu, 19 Mar 2015 11:04:23 +0000 (11:04 +0000)]
DALi Version 1.0.34
Change-Id: Ia5d8582b8eec61517443f24e191e01662ba4a26d
Victor Cebollada [Thu, 19 Mar 2015 10:18:35 +0000 (10:18 +0000)]
Alignment option added.
Change-Id: I5f0e4ad2e2b52cd25aa8661dd95f688ac6c41a8b
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Paul Wisbey [Thu, 19 Mar 2015 10:00:22 +0000 (10:00 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
examples/text-view/text-view-example.cpp
Change-Id: I112aab85d61c49687bed286c4d6435fae35f416a
Andrew Cox [Mon, 23 Feb 2015 14:14:51 +0000 (14:14 +0000)]
Image scaling and filtering on load across all applicable demos
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Change-Id: I7629356cb2678ee8eda85eff0cbef6a530ab7a17
Paul Wisbey [Tue, 17 Mar 2015 16:17:53 +0000 (16:17 +0000)]
Minor TextField demo tweaks
Change-Id: I092baac3133471d94aa62109548a745a74b037e0
Yoonsang Lee [Fri, 6 Mar 2015 08:52:49 +0000 (17:52 +0900)]
Actor's Transformation API Cleanup
Update for following changes in dali-core:
Actor::MoveBy -> TranslateBy
Actor::ColorBy -> <removed>
Actor::OpacityBy -> <removed>
Actor::SetRotation -> SetOrientation
Actor::GetCurrentRotation -> GetCurrentOrientation
Actor::GetCurrentWorldRotation -> GetCurrentWorldOrientation
Actor::SetInheritRotation -> SetInheritOrientation
Actor::IsRotationInherited -> IsOrientationInherited
Actor::Property::ROTATION -> Actor::Property::ORIENTATION
Actor::Property::WORLD_ROTATION -> Actor::Property::WORLD_ORIENTATION
Actor::Property::INHERIT_ROTATION -> Actor::Property::INHERIT_ORIENTATION
Change-Id: I0e883d5588e2f18beba32d64a2407253fe1fb286
Paul Wisbey [Mon, 16 Mar 2015 18:06:41 +0000 (18:06 +0000)]
Added TextField demo to XML
Change-Id: I2fb46cadadd81d5c30212f8db4d91386c3281a5d
Richard Underhill [Mon, 16 Mar 2015 10:45:17 +0000 (10:45 +0000)]
Text renderer not using default backend in emoji example
Change-Id: I9fb727955e339e123f5ca92fbc15a7d2d1479939
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Paul Wisbey [Fri, 13 Mar 2015 11:25:16 +0000 (11:25 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text
Change-Id: Id953da32620c4a3c57519cf9f5ecd74eb765a430
taeyoon [Fri, 13 Mar 2015 09:18:45 +0000 (18:18 +0900)]
Change "SLP" to "Tizen"
Change-Id: I300bf3260b3dfec153583e5b4c0c1ee6ee1eebea
Adeel Kazmi [Thu, 12 Mar 2015 11:56:41 +0000 (04:56 -0700)]
Merge "DALi Version 1.0.33" into tizen
Nick Holland [Thu, 12 Mar 2015 09:23:20 +0000 (09:23 +0000)]
DALi Version 1.0.33
Change-Id: Ifa5f15cfd57ee71294bc52af0d7b394ff6a5d64a
Richard Underhill [Wed, 11 Mar 2015 11:24:16 +0000 (11:24 +0000)]
Emojis Example
Change-Id: I1d3e62c1ad548c1c81b4c8dab2246c22a68249aa
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Xiangyin Ma [Wed, 11 Mar 2015 15:13:57 +0000 (15:13 +0000)]
Use Atlas in ItemView Demo
Change-Id: I703035788451cb057a7834199136cc70d22c87e4
Kimmo Hoikka [Wed, 11 Mar 2015 12:30:31 +0000 (05:30 -0700)]
Merge "Show DALi version info when the logo is tapped" into tizen
Adeel Kazmi [Wed, 11 Mar 2015 10:09:19 +0000 (10:09 +0000)]
Show DALi version info when the logo is tapped
Change-Id: I310242f574e549ff412248a56db8e747a4981c43
Victor Cebollada [Fri, 6 Mar 2015 16:44:12 +0000 (16:44 +0000)]
Fix for text-label.example and text-label-multilanguage.example
* In both demos: set the size of the text-label control,
otherwise the size negotiation sets the natural size.
* In the multilanguage demo: change the parent origin and anchor point of the labels.
Change-Id: I38ccd60fff826e293ee83f4aae88ab615feab1cf
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Xiangyin Ma [Tue, 3 Mar 2015 19:23:10 +0000 (19:23 +0000)]
Added Atlas Example
Change-Id: Ib25db927ec8f9e53247d0b980e30404738f894d2
Paul Wisbey [Fri, 6 Mar 2015 16:25:34 +0000 (16:25 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
examples/item-view/item-view-example.cpp
examples/path-animation/path-animation.cpp
Change-Id: I6a266274f476748bf34a97652964f501f44fe00c
Paul Wisbey [Fri, 6 Mar 2015 15:01:40 +0000 (15:01 +0000)]
Clamp size in TextLabel demo
Change-Id: I9e07392c5c27a61fb91b25ae03fc2ee5b3b8c0a8
Tom Robinson [Mon, 2 Mar 2015 17:11:59 +0000 (17:11 +0000)]
Property refactor in dali-toolkit: Demo changes for compiling
Change-Id: I18d69dba01824ffaa1cd3a4c6b9ead3a38981bc7
Adeel Kazmi [Thu, 5 Mar 2015 18:09:34 +0000 (10:09 -0800)]
Merge "Readme file with wrong repo name" into tizen
Adeel Kazmi [Thu, 5 Mar 2015 18:03:47 +0000 (10:03 -0800)]
Merge "Path animation enhancement for easier control" into tizen
Francisco Santos [Thu, 5 Mar 2015 16:58:15 +0000 (16:58 +0000)]
Readme file with wrong repo name
Change-Id: Ifc10ec7cc64924a5426c4353ac503f9f50ac6dfb
Paul Wisbey [Thu, 5 Mar 2015 10:02:53 +0000 (10:02 +0000)]
TextLabel property fixes
Change-Id: I680700e541ac44ef0695250ba4083f7770361a3e
Ferran Sole [Wed, 4 Mar 2015 12:42:44 +0000 (12:42 +0000)]
Path animation enhancement for easier control
Change-Id: If1cef63c5c63a2c4278406856e5701ef1abbcf82
Tom Robinson [Thu, 5 Mar 2015 11:28:49 +0000 (11:28 +0000)]
Property enum name changes in dali-core: Demo changes for compiling
Change-Id: I359790799ebf64ac5fd4e988e569dada337dd9f8
Paul Wisbey [Wed, 4 Mar 2015 18:53:01 +0000 (18:53 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
build/tizen/examples/CMakeLists.txt
demo/dali-demo.cpp
examples/buttons/buttons-example.cpp
examples/item-view/item-view-example.cpp
examples/text-view/text-view-example.cpp
Change-Id: I8816d065edca8e2a3fd37cdcedda4b02735f5007
Adeel Kazmi [Wed, 4 Mar 2015 17:29:21 +0000 (17:29 +0000)]
Updates after TapGestureDetector API Change
Change-Id: Ice128b44aeeccf51e9ac55af9deb3a00fd270aab
Adeel Kazmi [Wed, 4 Mar 2015 16:49:14 +0000 (08:49 -0800)]
Merge "DALi Version 1.0.32" into tizen
Lee Morgan [Wed, 4 Mar 2015 16:11:09 +0000 (16:11 +0000)]
DALi Version 1.0.32
Change-Id: I779d17d2e54b520d3a53a3913606e569d74cc01e
Adeel Kazmi [Wed, 4 Mar 2015 11:17:48 +0000 (03:17 -0800)]
Merge "Added path animation demo" into tizen
Paul Wisbey [Tue, 3 Mar 2015 18:41:55 +0000 (18:41 +0000)]
Improved layout in text-field example
Change-Id: If864584881cf663d5a6ddfdf940fc94c21c4a9bf
Paul Wisbey [Tue, 3 Mar 2015 10:49:51 +0000 (10:49 +0000)]
Tweaks to label example
Change-Id: Ifd9ab356030fc8235e6518b7bfb059697444d14b
Adeel Kazmi [Tue, 3 Mar 2015 09:14:21 +0000 (09:14 +0000)]
Remove dependency on boost
Change-Id: I820263d4ae6973dd0a28bffb278de3b422c804ce
Ferran Sole [Mon, 2 Mar 2015 15:38:27 +0000 (15:38 +0000)]
Added path animation demo
Change-Id: I4a723457a7cfaca87a20f771aa64f187ea160453
Adeel Kazmi [Tue, 3 Mar 2015 08:42:12 +0000 (00:42 -0800)]
Merge "Added quadratic bezier path rendering example. Showing stroking of quadratic bezier paths and filling of regions bounded by quadratic beziers." into tizen
Tom Robinson [Tue, 24 Feb 2015 19:36:34 +0000 (19:36 +0000)]
Property refactor in dali-core: Demo changes for compiling
Change-Id: Ie3085ce4986965da3743efc9ab6585176d0cdb23
HyunJu Shin [Mon, 2 Mar 2015 08:58:56 +0000 (00:58 -0800)]
Merge "Change a label of check box button" into tizen
Ferran Sole [Fri, 27 Feb 2015 16:15:03 +0000 (16:15 +0000)]
Added quadratic bezier path rendering example.
Showing stroking of quadratic bezier paths and filling of regions bounded
by quadratic beziers.
Change-Id: I61627c844fea2628d654423feb2b86c11e77726a
Paul Wisbey [Fri, 27 Feb 2015 14:11:06 +0000 (14:11 +0000)]
Skeleton TextField demo
Change-Id: I3ca1324727d7cc2f6c60a6c5879732cda41b8010
David Steele [Fri, 27 Feb 2015 11:08:17 +0000 (11:08 +0000)]
Removed AffectedByLighting APIs from MeshActor
Change-Id: Iaa00503aceb45e734511cf21ddee7297367d166d
Heeyong Song [Wed, 25 Feb 2015 07:11:44 +0000 (16:11 +0900)]
Change a label of check box button
Change-Id: Ic1129839662a2ac10e6e259fb735b2982d2433cd
Adeel Kazmi [Thu, 26 Feb 2015 16:28:29 +0000 (16:28 +0000)]
Reorganised folders & examples automatically built
New Structure:
build
| tizen
builder
| dali-builder.cpp
demo
| [demo source & header files]
examples
| [example-name]
| | [example source files]
packaging
| com.samsung.dali-demo.spec
resources
| images
| | [all images]
| models
| | [all models]
| scripts
| | [all scripts]
shared
| view.h
Now, each example should be in its own subdirectory within the "examples" directory. This will get
automatically built.
README also updated.
Change-Id: Idae4cedf220698a4a2d928535cff88e8bf25f82a
David Steele [Wed, 25 Feb 2015 19:07:35 +0000 (19:07 +0000)]
Removed model loading from example code
Change-Id: Ie3cd0acb8a80f1768d7334fc6965e8fb007d54f4
Signed-off-by: David Steele <david.steele@partner.samsung.com>
Paul Wisbey [Thu, 26 Feb 2015 13:52:36 +0000 (13:52 +0000)]
Minor text demo tweaks
- Respond to back key
- Start multi-language text at the top
- Scroll to integer positions only
Change-Id: I7595e86ea31f6531683fb4589db009637222ab85
Paul Wisbey [Thu, 26 Feb 2015 09:23:52 +0000 (09:23 +0000)]
Removed the DPI hacks
Change-Id: Ia1b7de17b58b811f4b74d71e17d7fb7d41bef646
Paul Wisbey [Wed, 25 Feb 2015 17:51:58 +0000 (17:51 +0000)]
Added launcher button for text-label-multi-language.example
Change-Id: Iecce4bc6b92e0ae35f84932a151f963d966676c8
Adeel Kazmi [Wed, 25 Feb 2015 16:51:28 +0000 (08:51 -0800)]
Merge "Updates following 'Rename BitmapImage as BufferImage'" into tizen
Paul Wisbey [Wed, 25 Feb 2015 16:06:38 +0000 (16:06 +0000)]
First attempt at rpm installation of .mo files
Change-Id: I1722f103987dfb592a39378e4cb5eefab4ebf5e8
Paul Wisbey [Wed, 25 Feb 2015 13:55:36 +0000 (13:55 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
build/tizen/CMakeLists.txt
build/tizen/demo/CMakeLists.txt
build/tizen/examples/CMakeLists.txt
demo/dali-table-view.cpp
examples/buttons/buttons-example.cpp
examples/shader-effect/dissolve-effect-example.cpp
examples/shadows/shadow-bone-lighting-example.cpp
packaging/com.samsung.dali-demo.spec
Change-Id: I57a2de5bfa6d0f05c02b8aba06dec9130f14a906
Kingsley Stephens [Wed, 25 Feb 2015 11:33:33 +0000 (11:33 +0000)]
DALi Version 1.0.31
Change-Id: Ida8d261ecce2ee31fff4d2e1019d6a5537cc1239
Victor Cebollada [Thu, 19 Feb 2015 08:41:39 +0000 (08:41 +0000)]
Multi-language text demo
Change-Id: Ic2d0cffa41ee6f630e3bfb7de5812a542c630d39
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Xiangyin Ma [Mon, 23 Feb 2015 17:21:03 +0000 (17:21 +0000)]
Updates following 'Rename BitmapImage as BufferImage'
Change-Id: I208e8b7f810ad7094d158346b1381de83a78dcc3
Xiangyin Ma [Fri, 20 Feb 2015 16:32:33 +0000 (16:32 +0000)]
Remove the call of ImageAttribute::SetPixelFormat
Change-Id: I2fa1c88ad1c7358c0168b8b73f5cc5a090622565
Adeel Kazmi [Tue, 24 Feb 2015 15:56:43 +0000 (07:56 -0800)]
Merge "Removed model from Shadow View demo" into tizen
David Steele [Tue, 24 Feb 2015 14:47:46 +0000 (14:47 +0000)]
Removed model from Shadow View demo
Replaced with an animating set of images that cast a moving shadow.
Change-Id: I76c61416241b542e2b5b3327a70c8e18dde3a9a2
Signed-off-by: David Steele <david.steele@partner.samsung.com>
Tom Robinson [Mon, 23 Feb 2015 11:48:39 +0000 (11:48 +0000)]
Fixed dissolve effect first image appearing smaller than viewport
Change-Id: I84af9b4b9e4c649d6faef3ae70481bf5270ddcc0
Paul Wisbey [Fri, 20 Feb 2015 10:34:30 +0000 (10:34 +0000)]
Added some basic i18n Support
The dali-demo launcher will show different languages (more localiation needed).
Example usage for Korean:
LANGUAGE=ko dali-demo
Change-Id: I03807ac6d90393564afbc81134de4c05b1bc8364
Paul Wisbey [Mon, 23 Feb 2015 11:04:39 +0000 (03:04 -0800)]
Merge "Include <cstdio> to compensate for core inclusion cleanup" into tizen
Paul Wisbey [Wed, 18 Feb 2015 13:13:58 +0000 (13:13 +0000)]
Changed build system to CMake
Change-Id: Icc2f491187f7832425d18200fad4e4ea041dfd57
Paul Wisbey [Tue, 17 Feb 2015 08:38:36 +0000 (08:38 +0000)]
Switched to CMake build system
Change-Id: I2a2d265e2d03eff6d36d9108006cbb8a97c70ba7
Andrew Cox [Thu, 19 Feb 2015 00:18:24 +0000 (00:18 +0000)]
Include <cstdio> to compensate for core inclusion cleanup
Follows core patch: https://review.tizen.org/gerrit/#/c/35596
, adaptor patch: https://review.tizen.org/gerrit/#/c/35597/
and toolkit patch: https://review.tizen.org/gerrit/#/c/35598/
Change-Id: I074c8b1b77d2da44067a0200e851291e21774f2c
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Adeel Kazmi [Wed, 18 Feb 2015 15:18:37 +0000 (07:18 -0800)]
Merge "DALi Version 1.0.30" into tizen
Ferran Sole [Wed, 18 Feb 2015 14:34:01 +0000 (14:34 +0000)]
DALi Version 1.0.30
Change-Id: Id2be0f7ec384525321569ade664337f4cd17201a
Tom Robinson [Thu, 12 Feb 2015 15:14:24 +0000 (15:14 +0000)]
Dali-demo: Replace constraints with SizeMode
Change-Id: I7a7f59aa5f557a8a57385e876fd881d87c101a28
Tom Robinson [Fri, 6 Feb 2015 14:05:45 +0000 (14:05 +0000)]
Removed some constraints from dali-table-view
Change-Id: Ia404e970624dd932da002b11365fa1c9b099091b
Xiangyin Ma [Fri, 13 Feb 2015 18:45:20 +0000 (18:45 +0000)]
update demos with ResourceImage/Image split
Change-Id: Ifdee5c061cedaf271fac15479a6e403ef161d527
Heeyong Song [Wed, 11 Feb 2015 04:19:57 +0000 (13:19 +0900)]
Button refactoring phase 1
Change-Id: I5e4b8689b21deca3fea0019d024bd2d98e52d3d8
Paul Wisbey [Mon, 16 Feb 2015 09:56:32 +0000 (09:56 +0000)]
Kludge to make size negotiation work
Change-Id: I136e9e7557c8f862298329fca44a188802dc7ecb
Paul Wisbey [Sun, 15 Feb 2015 18:36:39 +0000 (18:36 +0000)]
Fixed TextLabel color
Change-Id: I475d3d6bab0a70c25b36dec4eb7b614eed6b5a61
Paul Wisbey [Fri, 13 Feb 2015 17:11:17 +0000 (17:11 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text
Change-Id: I069b1991f503d790346f087a6512bfff123d54c9
Paul Wisbey [Tue, 27 Jan 2015 09:38:21 +0000 (09:38 +0000)]
TextLabel demo
Change-Id: I6b62f7b114ac959fcec3ab1e9381684c1fad8dff
Kimmo Hoikka [Thu, 12 Feb 2015 10:15:03 +0000 (02:15 -0800)]
Merge "Size Relative feature: cluster-example uses feature for verification" into tizen
Adeel Kazmi [Wed, 11 Feb 2015 10:13:26 +0000 (10:13 +0000)]
DALi Version 1.0.29
Change-Id: I38b89cf180cd9023e6deedbcec24f5308acd7254
Tom Robinson [Mon, 9 Feb 2015 15:57:17 +0000 (15:57 +0000)]
Size Relative feature: cluster-example uses feature for verification
Change-Id: Ifa7e11edfa0945dc114fced855261a0eee3efb0e
Paul Wisbey [Mon, 9 Feb 2015 18:29:37 +0000 (18:29 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text
Change-Id: I18093fe9a0e8e429074f36e5fff26de207940c3f
Adeel Kazmi [Mon, 9 Feb 2015 14:22:06 +0000 (14:22 +0000)]
(Magnifier) Make magnifier frame visible when panning as well
Change-Id: I81253620073aba52c6ba20802fd6c56651eb7edc
Xiangyin Ma [Fri, 6 Feb 2015 11:51:27 +0000 (11:51 +0000)]
DALi Version 1.0.28
Change-Id: If45dc9cc2a8a68fd0f3fcc8d355677684569104c
Adeel Kazmi [Thu, 5 Feb 2015 16:26:54 +0000 (08:26 -0800)]
Revert "BloomView & GaussianBlurView demo (for verification purpose only )"
This reverts commit
2e81ed4392078f0fe7497bb62e7151c84d54f707.
Change-Id: Iaec9f80b51fbfd44e29950f798b5e90b3d1d5aee
Adeel Kazmi [Thu, 5 Feb 2015 16:22:51 +0000 (08:22 -0800)]
Merge "BloomView & GaussianBlurView demo (for verification purpose only )" into tizen
taeyoon [Thu, 5 Feb 2015 12:43:57 +0000 (21:43 +0900)]
Modification of rule and manifest in spec for 3-domain smack of tizen 3.0
- enable_dali_smack_rules addition for handling rule file
Change-Id: I8f438334f94f3ff427cf63656fb589c0df57bf2a
Heeyong Song [Wed, 4 Feb 2015 03:02:42 +0000 (12:02 +0900)]
Button refactoring: rename properties
Change-Id: I20997625d5dcdd03269238bf4086159381907b11
Xiangyin Ma [Tue, 3 Feb 2015 13:38:28 +0000 (13:38 +0000)]
BloomView & GaussianBlurView demo (for verification purpose only )
Change-Id: I7279b5cb4c5b157b618fb184fac50e710463cf51
Adeel Kazmi [Mon, 2 Feb 2015 15:00:51 +0000 (15:00 +0000)]
(RefractionEffect) Ensure shader compiles with more strict compilers
Shader does not compile with latest Nvidia driver on Ubuntu as we did not set the default precision
and used an f at the end of a float in the shader. Other shader compilers are more permissive so
this was not spotted before.
Change-Id: I235b901f08a73086b8b581a8c40bb4ed517ba35d
Yoonsang Lee [Thu, 29 Jan 2015 01:43:11 +0000 (10:43 +0900)]
Change Dali demo table size calculation
- from DPI based to ratio based
Change-Id: I67bdacdfc971a818c7ac5078052be010e8d2eaac
tom.robinson [Thu, 29 Jan 2015 10:59:19 +0000 (10:59 +0000)]
DALi Version 1.0.27
Change-Id: I28c9559d774218cfd33688cf7c32b689189e961c
Paul Wisbey [Mon, 26 Jan 2015 09:34:38 +0000 (09:34 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
demo/dali-table-view.cpp
Change-Id: Ib0075b320a16327e57d7eb2375082c8c4102f8a3
Nick Holland [Thu, 22 Jan 2015 10:48:35 +0000 (10:48 +0000)]
DALi Version 1.0.26
Change-Id: If36351cb6beb0e333b7d8be562aef44934db6fef
taeyoon [Fri, 16 Jan 2015 10:15:45 +0000 (19:15 +0900)]
Removal of a 'sec_build_binary_debug_enable' part in spec file
- 'sec_build_binary_debug_enable and -DTIZEN_DEBUG_ENABLE' are not used.
Change-Id: Ic944dbf08ecd42ed1a7fe5cb5e0143a219a51f0c
Xiangyin Ma [Thu, 15 Jan 2015 13:21:00 +0000 (13:21 +0000)]
DALi Version 1.0.25
Change-Id: Ibef6c918be6f39120451296e5c2220b4a6b4b07e
Xiangyin Ma [Fri, 9 Jan 2015 18:33:42 +0000 (18:33 +0000)]
Added refraction effect demo
Change-Id: Ia9ec4763a764344f234b9d3ee3114ad9d91c7abb
Kingsley Stephens [Thu, 8 Jan 2015 14:21:43 +0000 (14:21 +0000)]
Remove ScrollViewCustomEffect from scrollview example
Change-Id: I9a960977be044f86612f45782bccc26496a08634
Lee Morgan [Thu, 8 Jan 2015 14:40:27 +0000 (14:40 +0000)]
DALi Version 1.0.24
Change-Id: If834803fe364c9304b79637478434bf83d99c496
Kingsley Stephens [Fri, 19 Dec 2014 15:10:08 +0000 (15:10 +0000)]
Change Dali Demo to use CubeEffect
Change-Id: I79a3527d729ab9b4edd84884682531a643ba5cb8
Paul Wisbey [Wed, 7 Jan 2015 10:15:57 +0000 (10:15 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
build/tizen/examples/Makefile.am
examples/builder/examples.cpp
Change-Id: Ia110f5a036291c9d3debaebd66c6fedfc8adcd8b
Kimmo Hoikka [Mon, 5 Jan 2015 17:57:53 +0000 (09:57 -0800)]
Merge "Added precision to shader variables." into tizen
Adeel Kazmi [Wed, 24 Dec 2014 10:44:01 +0000 (10:44 +0000)]
DALi Version 1.0.23
Change-Id: Ie854244c03f79ba7ab3df162dc9cdef601fdbd3e
projects / platform / core / uifw / dali-demo.git / log