Adeel Kazmi [Fri, 15 Jul 2016 15:05:48 +0000 (16:05 +0100)]
Added a Max Core Property Index so that a range can be defined in toolkit
Change-Id: I75c878357b86e509083783144cc84a7f18374e16
Tom Robinson [Thu, 28 Jul 2016 13:11:57 +0000 (14:11 +0100)]
FrameBuffer::Format changed to bit-mask Attachment: Core
Change-Id: I894a703dc8de36cc052fc958693842fc33b208f8
Ferran Sole [Wed, 27 Jul 2016 16:13:10 +0000 (17:13 +0100)]
Renamed enum Geometry::GeometryType to Geometry::Type
* Renamed GeometryType enum to Type
* Renamed Geometry::SetGeometryType and Geometry::GetGeometryType to Geometry::SetType and Geometry::GetType
Change-Id: Ifcfe881ad4d9a5fa0b6750658dbea9509a6bdc57
Tom Robinson [Tue, 26 Jul 2016 14:32:53 +0000 (15:32 +0100)]
Helper method for getting enum properties as ints and strings
Change-Id: I9a1b40988f8abaff7b6f9ac02bffbdeb6dfe2516
Ferran Sole [Wed, 27 Jul 2016 12:53:13 +0000 (13:53 +0100)]
Wrapped ShaderHints enum inside a struct
Change-Id: Ib1e23fcc942a7df8a83b86599c17c517b0c1df91
Adeel Kazmi [Wed, 27 Jul 2016 10:03:55 +0000 (03:03 -0700)]
Merge "introduce LAYER_UI to replace LAYER_2D, deprecate latter" into devel/master
Kimmo Hoikka [Mon, 25 Jul 2016 17:34:21 +0000 (18:34 +0100)]
introduce LAYER_UI to replace LAYER_2D, deprecate latter
Change-Id: I6228bf0e8f3153918fdac8759b0d45e8c41027e2
Tom Robinson [Fri, 15 Jul 2016 16:57:15 +0000 (17:57 +0100)]
Rendering API Stencil Implementation
Change-Id: I802f2d0fb3a569e5f5d7159cd73d56f47874410e
Kimmo Hoikka [Fri, 22 Jul 2016 11:56:01 +0000 (12:56 +0100)]
Remove deprecated load and release policies from scripting
Change-Id: I531494e0cb039b7eae61044006d5fc1f02ab66c8
adam.b [Fri, 22 Jul 2016 16:38:36 +0000 (17:38 +0100)]
The Render::Renderer is created when SceneGraph::Renderer is added to the update manager.
Change-Id: Ifba0242122b9d651cfcec22a858cbdcc2547a43b
Adeel Kazmi [Fri, 22 Jul 2016 16:13:25 +0000 (09:13 -0700)]
Merge "Tizen Directory Migration" into devel/master
Richard Huang [Fri, 22 Jul 2016 16:00:10 +0000 (17:00 +0100)]
DALi Version 1.1.44
Change-Id: I1f34f5310555244451f25ff041f14285c6a46c7c
dongsug.song [Wed, 20 Jul 2016 02:12:33 +0000 (11:12 +0900)]
accroding to ACR-520's review, dali's related feature and dependency (openGL ES 2.0) should be represented
Signed-off-by: dongsug song <dongsug.song@samsung.com>
Change-Id: I9bc63e2f06a18a16ccd9746ebcca5ff0f8b0faf6
David Steele [Tue, 19 Jul 2016 10:27:02 +0000 (03:27 -0700)]
Merge "Added ability to build for coverage for target" into devel/master
Adeel Kazmi [Mon, 8 Jun 2015 14:55:18 +0000 (15:55 +0100)]
Added ability to build for coverage for target
Change-Id: I20b2e7909b5250969d75aa512a47814b0b892ad0
minho.sun [Mon, 4 Jul 2016 09:21:45 +0000 (18:21 +0900)]
Tizen Directory Migration
Change absolute Directories to Tizen paths
Signed-off-by: minho.sun <minho.sun@samsung.com>
Change-Id: Ib533807d3e5c2cea679174f1c6c6fd4eb686e3d3
David Steele [Tue, 12 Jul 2016 16:51:21 +0000 (17:51 +0100)]
Patch Coverage tool
Change-Id: I238054661978a27b15704e38bda496b7fabc699d
Adeel Kazmi [Fri, 15 Jul 2016 11:28:46 +0000 (12:28 +0100)]
(Renderer) Add a property range for Renderer properties
This is required so that we can distinguish between Actor and Renderer properties in toolkit.
Change-Id: Id6d37c25b11eaa156dc6fe23ecb063d2020d85bb
Adeel Kazmi [Fri, 15 Jul 2016 11:56:02 +0000 (04:56 -0700)]
Merge "100% Coverage for Rendering API" into devel/master
Adeel Kazmi [Fri, 15 Jul 2016 11:40:17 +0000 (04:40 -0700)]
Merge "DALi Version 1.1.43" into devel/master
David Steele [Fri, 15 Jul 2016 11:26:37 +0000 (12:26 +0100)]
DALi Version 1.1.43
Change-Id: I82bcab0866b0ec6d89a2360c2d51c4a4fceba169
Tom Robinson [Fri, 15 Jul 2016 11:05:38 +0000 (12:05 +0100)]
100% Coverage for Rendering API
Change-Id: I051bf96c0f1488b1a5bb9f2d8586cd981a77d83f
Adeel Kazmi [Fri, 15 Jul 2016 09:28:27 +0000 (10:28 +0100)]
(Automated Tests) Combined dali and dali-devel
Total 1907 tests, 1 less than combined total before.
This is because UtcLinearConstrainerApply was duplicated in both dali and dali-devel.
Change-Id: I52ae9e9da91d10259db0d7cc5dd1dc2ba45ecd63
Tom Robinson [Thu, 14 Jul 2016 17:30:21 +0000 (18:30 +0100)]
Moved UTC tests for public API to dali directory
Change-Id: I553bc2553cab1f281da56e4fade7385e337dcb08
Adeel Kazmi [Thu, 14 Jul 2016 15:46:34 +0000 (16:46 +0100)]
Avoid std::string crash when NULL is returned
GetDefaultPropertyName() can return NULL.
If we try to initialise a std::string with NULL, this causes an exception.
The solution is to just check that the returned value from GetDefaultPropertyName()
and return an empty std::string if it is NULL.
Change-Id: Iecf02228cade112b2922a0fbf0e9cef73a0df13d
Adeel Kazmi [Thu, 14 Jul 2016 16:23:08 +0000 (09:23 -0700)]
Merge "Removed dead code from Actor & fixed minor bugs in GestureDetector" into devel/master
Adeel Kazmi [Thu, 14 Jul 2016 14:54:49 +0000 (15:54 +0100)]
Removed dead code from Actor & fixed minor bugs in GestureDetector
Change-Id: I7c4a1ccfc909ecd9e82824e2d132e3561e7bf15d
Tom Robinson [Wed, 13 Jul 2016 10:46:47 +0000 (11:46 +0100)]
Moved Core Rendering API from devel-api to public-api
Change-Id: I8222979f89afd60137d2b148fcadc6175a41a6fe
Ferran Sole [Wed, 13 Jul 2016 15:44:31 +0000 (16:44 +0100)]
Fixed bug in Dali::Texture
- Protected texture to make sure it doesn't call into Core after it has been destroyed
Change-Id: Ie1b6dedc1d42134f8702fd907ac2b13cb8ffdf80
Xiangyin Ma [Mon, 11 Jul 2016 16:57:23 +0000 (09:57 -0700)]
Remove Geometry::QUAD() API
Change-Id: I962d0e570f3f7be3efa7b84179533ca490fda214
Tom Robinson [Mon, 11 Jul 2016 13:02:12 +0000 (14:02 +0100)]
Moved TextureSet::SetImage() to separate devel-api module
Change-Id: I44a5be3e98c76a73b6672c079e1f1d9084113994
David Steele [Fri, 8 Jul 2016 17:22:47 +0000 (10:22 -0700)]
Merge "(Automated Tests) Added coverage for SlotDelegate" into devel/master
Adeel Kazmi [Fri, 8 Jul 2016 16:52:37 +0000 (09:52 -0700)]
Merge "DALi Version 1.1.42" into devel/master
Agnelo Vaz [Fri, 8 Jul 2016 16:43:16 +0000 (17:43 +0100)]
DALi Version 1.1.42
Change-Id: I99eb0bc65e5082246509042388c590406af19f08
Adeel Kazmi [Fri, 8 Jul 2016 14:59:55 +0000 (15:59 +0100)]
(Automated Tests) Added coverage for SlotDelegate
Change-Id: I6fbf72d44b1785b0ff7d5498ca74819a64332f86
Ferran Sole [Wed, 6 Jul 2016 14:46:23 +0000 (15:46 +0100)]
Changed Texture::Upload to return a boolean to indicate whether the update can be performed
Upload will return true if the upload operation can be performed, false otherwise
Change-Id: I94d852d65bddaa5c4b59b9b26bd84fd753c8a036
Adeel Kazmi [Wed, 6 Jul 2016 16:23:19 +0000 (17:23 +0100)]
(AutomatedTests) Stop Calling Internal APIs from public tests
Change-Id: I936e65ba7de5fa142c8ccfdf9d4ad3000be05009
David Steele [Mon, 4 Jul 2016 18:42:12 +0000 (19:42 +0100)]
Added test cases for public api.
Coverage of public API methods showed that some methods had no
test cases. Have added test cases for all relevant methods.
Reminder: No C++ method coverage can be 100% complete ( compiler
generated virtual destructors cannot always be called ).
Change-Id: Ia3dc12b5e8262ea1e20c17141378d2a2f3c91b8e
Signed-off-by: David Steele <david.steele@samsung.com>
adam.b [Fri, 1 Jul 2016 13:28:12 +0000 (14:28 +0100)]
DALi Version 1.1.41
Change-Id: I3726e601f807f636bbfe6ce06414d1765ada93ed
David Steele [Thu, 30 Jun 2016 10:41:29 +0000 (11:41 +0100)]
Updated desktop test harness for easier TC debugging
Added a new "-d" option to execute.sh to invoke the debugger
on the speficied test case.
Change-Id: I7b791ff184c0b14e21a1a1c3700c82fa6cbab748
Signed-off-by: David Steele <david.steele@samsung.com>
Kimmo Hoikka [Wed, 29 Jun 2016 16:54:46 +0000 (09:54 -0700)]
Merge "Added support for compressed texture upload to Render::NewTexture" into devel/master
Ferran Sole [Tue, 28 Jun 2016 15:46:45 +0000 (16:46 +0100)]
Added support for compressed texture upload to Render::NewTexture
Change-Id: I864026078391a5b98caaa62ffa2c2d9a0db6a919
Seoyeon Kim [Tue, 28 Jun 2016 04:41:20 +0000 (13:41 +0900)]
Fix Svace issue
- Return value of a function GetMap() has to be checked for NULL at shader-impl.cpp
Change-Id: Ib28207bcb87b073eea34887233514c31958c11f1
Adeel Kazmi [Fri, 24 Jun 2016 08:02:25 +0000 (01:02 -0700)]
Merge "DALi Version 1.1.40" into devel/master
Victor Cebollada [Fri, 24 Jun 2016 07:22:57 +0000 (08:22 +0100)]
DALi Version 1.1.40
Change-Id: Ie05785cab691fdc260eaed9bf7f8f2320cad3a7e
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Fri, 24 Jun 2016 07:22:57 +0000 (08:22 +0100)]
DALi Version 1.1.40
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Ferran Sole [Tue, 21 Jun 2016 15:10:41 +0000 (16:10 +0100)]
Fixed bug in texture-set
mHasAlpha was being overwritten in Prepare method when using Render::Textures ( TextureSets which only use Render::Textures
should not do anything in the Prepare method )
Change-Id: I21b8fba7f81d5c83b03dfa10d8fe281026b28489
David Steele [Mon, 20 Jun 2016 13:57:04 +0000 (14:57 +0100)]
Updated test harness to add map of named parameters to Gl traces.
As well as storing the parameter list as a single string, have added
(for GlAbstraction) a named parameter map. This should prevent changes
to the trace from breaking existing tests in the future, and also
provides a slightly easier to use method for searching for methods with
specific parameters.
Change-Id: Iab726d2e2bcae805fa39b48c0675ea5a96faa64d
Signed-off-by: David Steele <david.steele@samsung.com>
Paul Wisbey [Fri, 17 Jun 2016 16:39:41 +0000 (09:39 -0700)]
Merge "Implemented Upload methods in Texture to upload data from PixelData objects" into devel/master
Adeel Kazmi [Fri, 17 Jun 2016 10:42:56 +0000 (11:42 +0100)]
DALi Version 1.1.39
Change-Id: I6df60de02d4942e5bdf5db884f20480a0669173a
Ferran Sole [Wed, 15 Jun 2016 08:26:00 +0000 (09:26 +0100)]
Implemented Upload methods in Texture to upload data from PixelData objects
Change-Id: I5d451dcf4a8a28bf3561e56b4280f352392c3c65
Ferran Sole [Fri, 17 Jun 2016 08:27:42 +0000 (09:27 +0100)]
Revert bug fix in renderer
Change-Id: Ie4154b9522943df483bd68226e71ddf2b80163b4
Adeel Kazmi [Mon, 13 Jun 2016 15:32:11 +0000 (16:32 +0100)]
(Touch) Added pressure, radius & angle information
Refactored Integration and internal touch processing to use new Point rather than TouchPoint
so we can store the new parameters.
Change-Id: If35d6c4a156c19391c736b750c7673631a7a4ef0
Xiangyin Ma [Wed, 15 Jun 2016 17:27:45 +0000 (18:27 +0100)]
Extend Property::Map to support Index-Value pairs
Change-Id: I34039e8f6a41e3d41a364c668652c12cbeaba535
Ferran Sole [Mon, 13 Jun 2016 08:59:10 +0000 (09:59 +0100)]
Allow new texture to be created from native images
* Added new constructor to Textures so they can be created from a native image
Change-Id: Id040668bbd37b864fa24935452cb786b4ad79f07
David Steele [Mon, 13 Jun 2016 12:30:37 +0000 (05:30 -0700)]
Merge "(Actor) Add ability to connect to new touch signal via scripts" into devel/master
David Steele [Mon, 13 Jun 2016 10:27:55 +0000 (03:27 -0700)]
Merge "Remove unnecessary functions from Scripting, support strings in actor properties" into devel/master
Paul Wisbey [Mon, 13 Jun 2016 10:19:05 +0000 (03:19 -0700)]
Merge "Removed HasRendered() from Core RenderStatus." into devel/master
Adeel Kazmi [Mon, 13 Jun 2016 09:50:36 +0000 (10:50 +0100)]
(Actor) Add ability to connect to new touch signal via scripts
Change-Id: I59e46cc70473e729415cc16ae056b7c5de9d237b
Adeel Kazmi [Thu, 9 Jun 2016 17:24:04 +0000 (18:24 +0100)]
Remove unnecessary functions from Scripting, support strings in actor properties
- Removed unused methods from Scripting
- Parse property string to set AnchorPoint & ParentOrigin
- Modify some of the property helper macros to output DALi coding standard variables
Change-Id: Ic600ee626aec7f6355edfb792232d329d19bf074
Xiangyin Ma [Fri, 10 Jun 2016 10:47:39 +0000 (11:47 +0100)]
DALi Version 1.1.38
Change-Id: Ie3d05b6be645799770ca337dcdbedc1d1223a4dc
adam.b [Thu, 9 Jun 2016 17:59:10 +0000 (18:59 +0100)]
Removed HasRendered() from Core RenderStatus.
Change-Id: Ib45517e36e515bd9bf288a71bb1f7358e5ecaba7
Ferran Sole [Thu, 9 Jun 2016 10:25:28 +0000 (11:25 +0100)]
New Texture API clean-up
- New API to upload data to textures and to set output texture of a framebuffer
- Added test cases for Texture and FrameBuffer objects
Change-Id: I99aa20da83ab2a6c76655b331d1520cdc90c7916
Adeel Kazmi [Wed, 8 Jun 2016 12:27:12 +0000 (13:27 +0100)]
(Documentation) Remove reference to ImageView in RenderTask
Change-Id: I0671f77b8cbd5f797462b21cc2611e9a5b2714ad
Adeel Kazmi [Tue, 7 Jun 2016 11:53:24 +0000 (12:53 +0100)]
(Documentation) Remove references to Toolkit controls
Change-Id: I5a4eb87e762ba3df58b2a966de5985a53616cf25
Ferran Sole [Mon, 6 Jun 2016 08:21:59 +0000 (09:21 +0100)]
Changed SINCE tags for new APIs introduced by New Texture
- "SINCE" tags for new APIs introduced by patch "Added Texture object
and FrameBuffer object to rendering API" were incorrect
- Added test cases for apis SetFrameBuffer and GetFrameBuffer in RenderTask
Change-Id: I613e86aa18613c2988295f07de74870843232f8d
Kimmo Hoikka [Fri, 3 Jun 2016 16:11:47 +0000 (09:11 -0700)]
Merge "Change PixelData to use the handle/body pattern" into devel/master
Paul Wisbey [Fri, 3 Jun 2016 16:11:17 +0000 (09:11 -0700)]
Merge "New DepthTestMode API in Renderer" into devel/master
Tom Robinson [Wed, 1 Jun 2016 16:29:36 +0000 (17:29 +0100)]
New DepthTestMode API in Renderer
DepthTestMode in Renderer:
OFF - Renderer does not read from the depth buffer
AUTO - Renderer only reads from the depth buffer if in a 3D layer (Default)
ON - Renderer reads from the depth buffer regardless of layer type
Note: The SetDepthTestDisabled() API in Layer overrides Renderer.
If SetDepthTestDisabled( true ) is called, depth testing is NEVER done (regardless of Renderer properties).
If SetDepthTestDisabled( false ) is called, depth testing is MAY be done. This will be dependant on the Renderer properties.
Note: The default for DepthTestDisabled in Layer is now True. IE. Depth testing is disabled by default.
When the Layer behavior is changed ( Layer::SetBehavior() ), this will update Layer::SetDepthTestDisabled() with appropriate default behavior. IE:
Layer::SetBehavior( Dali::Layer::LAYER_2D ) -> Depth testing is turned off
Layer::SetBehavior( Dali::Layer::LAYER_3D ) -> Depth testing is turned on
This is to encourage optimal settings, but Layer::SetDepthTestDisabled() CAN be modified after changed layer behavior if required.
Change-Id: I874f45eca283e3960b6f6265272754e3e66d267c
Xiangyin Ma [Wed, 25 May 2016 14:22:58 +0000 (15:22 +0100)]
Change PixelData to use the handle/body pattern
Change-Id: I54d2c96b1111f90dd214ac257b82ade79cdacb9a
Paul Wisbey [Fri, 3 Jun 2016 14:20:06 +0000 (07:20 -0700)]
Merge "DALi Version 1.1.37" into devel/master
Tom Robinson [Fri, 3 Jun 2016 13:33:18 +0000 (14:33 +0100)]
DALi Version 1.1.37
Change-Id: I7513dc130ff0974fb67aff77ffbcf4cd30b424a7
Ferran Sole [Fri, 27 May 2016 08:53:58 +0000 (09:53 +0100)]
Added Texture object and FrameBuffer object to rendering API
* New Texture object which can be used in TextureSets to provide data to shaders
* Textures can be 2D or Cube maps and can have mipmaps
* Mipmaps can be generated manually or automatically by the GPU
* Added sampling modes which requires mipmaps (NEAREST_MIPMAP_NEAREST,LINEAR_MIPMAP_NEAREST,...)
* New FrameBuffer object which can use Texture as color output
* Added API to set FrameBuffer as the target for a RenderTask
Change-Id: Ia41e9cd11b3a4b4a49e5141fabf90a9cc50b1a97
Adeel Kazmi [Thu, 19 May 2016 17:18:33 +0000 (18:18 +0100)]
Added class to replace TouchEvent
Fixes following review:
Removed Internal::TouchData::GetPoint()
Cleaned up signal sending from TouchEventProcessor
Changed new Actor::TouchSignal to pass TouchData handle as const ref.
Changed new Stage::TouchedSignal to pass TouchData handle as const ref.
Changed API of TouchData to return by value where appropriate and removed
all asserts.
Changed API of TouchData to use size_t for point index and point count.
Added test cases for touch processing using touch data ( a copy and paste
of the existing test cases, plus a negative test case for the out of bounds
check in the public API for TouchData )
Change-Id: I8a58775f7a70a3bed8514439c627f261ac4f5807
Richard Huang [Fri, 27 May 2016 11:20:15 +0000 (12:20 +0100)]
DALi Version 1.1.36
Change-Id: Ic813f231541869597d4848f3fa19a816993931b0
Adeel Kazmi [Thu, 26 May 2016 07:31:40 +0000 (00:31 -0700)]
Merge "Allows debug builds to be enabled for GBS builds" into devel/master
Adeel Kazmi [Wed, 25 May 2016 10:19:48 +0000 (03:19 -0700)]
Merge "Removed unused TouchData from Integration API & TouchResampler" into devel/master
Richard Huang [Wed, 25 May 2016 09:58:09 +0000 (10:58 +0100)]
Fix comments in child property registration API
Change-Id: Ia2f955996486312b121f3ef0005e3d059829653f
Tom Robinson [Tue, 24 May 2016 10:51:18 +0000 (11:51 +0100)]
Allows debug builds to be enabled for GBS 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: Icd0eccda950ceeb21eaa50956bebc78deb6973e5
Adeel Kazmi [Tue, 24 May 2016 11:49:34 +0000 (12:49 +0100)]
Removed unused TouchData from Integration API & TouchResampler
Change-Id: Idec16fe60b9f5ec1cecbc9835e0a7aabb861c98f
Adeel Kazmi [Fri, 20 May 2016 17:25:12 +0000 (10:25 -0700)]
Merge "Type registry helper: Core change to make usable for all implementations of CustomActor" into devel/master
Tom Robinson [Mon, 16 May 2016 15:21:56 +0000 (16:21 +0100)]
Type registry helper: Core change to make usable for all implementations of CustomActor
Change-Id: I0a0313a560739b2d033b6be619637072b66900ca
Richard Huang [Fri, 20 May 2016 14:17:42 +0000 (15:17 +0100)]
Object::GetPropertyType should return Property::NONE for non-existing child properties
Change-Id: Ib1383338deaa369636fb4c2b5ae86a29d6386c97
Nick Holland [Fri, 20 May 2016 10:17:15 +0000 (11:17 +0100)]
DALi Version 1.1.35
Change-Id: I213ca1ca8377b409e35f83be72e61420d6400db6
Richard Huang [Wed, 18 May 2016 12:05:20 +0000 (13:05 +0100)]
Support for child properties registration
The object should be able to use type registry to register properties
that it (as a parent) supports in its children.
This can be done through TypeRegistry::ChildPropertyRegistration or
the macro DALI_CHILD_PROPERTY_REGISTRATION.
Change-Id: Ic83ab5bc4afeb5ed41c46a6a300bd329d2a4b443
Ferran Sole [Tue, 17 May 2016 14:21:23 +0000 (15:21 +0100)]
Fixes a bug in Transform manager
Component wasn't marked as dirty when parent changed
Change-Id: Ib8a56326fa9ad00f515af33c8d22a305b85372a2
Seoyeon Kim [Tue, 2 Feb 2016 02:17:14 +0000 (11:17 +0900)]
Update Images' public header comments
Change-Id: I4e7841a285fa9270ae85dbc8322f777ac08d574e
Seoyeon Kim [Thu, 4 Feb 2016 01:08:57 +0000 (10:08 +0900)]
Update Render-tasks, Shader-effects, and Signals' public header comments
Change-Id: I02fec09eb05a6d01d13a78e43daa1c52e673fb55
Adeel Kazmi [Mon, 16 May 2016 17:26:06 +0000 (10:26 -0700)]
Merge "Use Geometry::QUAD() in UTC" into devel/master
Kimmo Hoikka [Fri, 13 May 2016 13:25:36 +0000 (14:25 +0100)]
Removed incorrectly included vector-wrapper from property
Change-Id: Ieefc93ca94ed08403e4133569bb497296768beb3
Xiangyin Ma [Mon, 16 May 2016 16:00:22 +0000 (17:00 +0100)]
Use Geometry::QUAD() in UTC
Change-Id: I98b24f63730a7308f842cbb96dfb17964f97c68a
Adeel Kazmi [Mon, 16 May 2016 14:13:48 +0000 (07:13 -0700)]
Merge "Added static function Geometry::QUAD()" into devel/master
Kimmo Hoikka [Mon, 16 May 2016 04:44:49 +0000 (21:44 -0700)]
Merge "Prevention of Null pointer dereference" into devel/master
Xiangyin Ma [Thu, 12 May 2016 12:53:17 +0000 (13:53 +0100)]
Added static function Geometry::QUAD()
Change-Id: I4091191b45c3516adf9967aa2dbd9405a380fca2
Ferran Sole [Fri, 13 May 2016 10:54:39 +0000 (11:54 +0100)]
DALi Version 1.1.34
Change-Id: If90be85e9c3dc27a3b0573922ae7f2fa6eafefd2
Seoyeon Kim [Wed, 11 May 2016 06:49:29 +0000 (15:49 +0900)]
Prevention of Null pointer dereference
Change-Id: I79d3b9e91ac27eb7eaa4d0174997db1705e3649a
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Adeel Kazmi [Thu, 12 May 2016 18:04:51 +0000 (11:04 -0700)]
Merge "Update Math's public header comments" into devel/master
David Steele [Thu, 12 May 2016 17:54:36 +0000 (10:54 -0700)]
Merge "Allow reading Vector2/3/4 values from Property::Value with type Vector2/3/4, matching Dali::Vector default behaviour" into devel/master
Seoyeon Kim [Wed, 3 Feb 2016 05:07:46 +0000 (14:07 +0900)]
Update Math's public header comments
Change-Id: Ie1e3f44797c24dca4516a4195473ce315bec5008
Adeel Kazmi [Thu, 12 May 2016 16:36:35 +0000 (09:36 -0700)]
Merge "Moved TextureCache dispatch methods to their own class" into devel/master