Xiangyin Ma [Tue, 12 Jan 2016 15:23:12 +0000 (15:23 +0000)]
PixelArea support for ImageView
Change-Id: Ie9caace6fe18146d120f11665237fc4bec661aec
Kimmo Hoikka [Tue, 19 Jan 2016 18:30:16 +0000 (10:30 -0800)]
Merge "JavaScript binding for ItemView" into devel/master
Richard Huang [Tue, 12 Jan 2016 15:58:49 +0000 (15:58 +0000)]
Added new properties to make ScrollView more scriptable
Change-Id: I32701acb1f9ab0ce09af1c6c991713389dda4e3e
Richard Huang [Thu, 7 Jan 2016 16:05:12 +0000 (16:05 +0000)]
JavaScript binding for ItemView
Change-Id: If4ba2434a2ea7a22cacd13d431dbe54bf56540b9
Yoonsang Lee [Tue, 29 Dec 2015 07:17:29 +0000 (16:17 +0900)]
Seperate dali-adaptor & dali-adaptor-uv packages
- Remove dali-adaptor dependency from dali-toolkit.
- Add dali-adaptor-uv dependency to dali-addon because DALi JS apps always
run the libuv-based adaptor.
- Before this patch, dali-addon only checked dali-adaptor package (which was
confusingly named to 'dali') and dali-toolkit package.
- Now dali-addon checks dali-core, dali-adaptor-uv, and dali-toolkit packages to make it clearer.
Change-Id: Iaca57047a250ee863bbe6963c31168a7bdbacd68
Victor Cebollada [Mon, 11 Jan 2016 09:00:21 +0000 (09:00 +0000)]
Multiline - Create a text-editor control.
Change-Id: If2d26ec599b30fcb121d0ff720f67fc9f6b0263b
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Fri, 15 Jan 2016 15:09:07 +0000 (07:09 -0800)]
Merge "DALi Version 1.1.17" into devel/master
Nick Holland [Fri, 15 Jan 2016 14:40:40 +0000 (14:40 +0000)]
DALi Version 1.1.17
Change-Id: I185f85427bc6a236d22c38409db2fbc419328f18
Paul Wisbey [Fri, 15 Jan 2016 11:16:48 +0000 (11:16 +0000)]
Fixed regression with Actor::COLOR property in TextLabel
Change-Id: I16eb72d23354af029f5e451e60e99219456663af
Victor Cebollada [Thu, 16 Jul 2015 12:54:46 +0000 (13:54 +0100)]
Convert CR or CR+LF to LF.
Change-Id: Icd14045ddd7f74f690fcacbffe8ad33ba1f5fbd2
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Xiangyin Ma [Fri, 8 Jan 2016 15:16:52 +0000 (15:16 +0000)]
Anti-Aliasing of BorderRenderer
Change-Id: I81fd631ec6e0ff394082081065c23d3673366a2c
Paul Wisbey [Mon, 11 Jan 2016 11:58:34 +0000 (03:58 -0800)]
Merge "Markup procesor - Font." into devel/master
Victor Cebollada [Wed, 25 Nov 2015 15:17:13 +0000 (15:17 +0000)]
Markup procesor - Font.
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Change-Id: Icd3e97862b96f2631a17595136359a08fdfd2371
Adeel Kazmi [Fri, 8 Jan 2016 14:53:53 +0000 (06:53 -0800)]
Merge "DALi Version 1.1.16" into devel/master
Lee Morgan [Fri, 8 Jan 2016 14:32:48 +0000 (14:32 +0000)]
DALi Version 1.1.16
Change-Id: I93fe49ce795e2869d19d4bb693d1afadd922ebe7
Paul Wisbey [Fri, 8 Jan 2016 09:20:05 +0000 (01:20 -0800)]
Merge "TextController - Consume the key event." into devel/master
Victor Cebollada [Thu, 7 Jan 2016 10:07:37 +0000 (10:07 +0000)]
TextController - Consume the key event.
* Allows multiple text-field in the same application.
Change-Id: I2db59176f71e6a8b9a6efdcccd63d55e3d576ec9
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Seoyeon Kim [Thu, 7 Jan 2016 05:27:53 +0000 (14:27 +0900)]
Fix license issues from the protex server
- Change licence names in .spec to match SPDX identifiers
Change-Id: I34f51c3510b174bcd562690b4ef72e9d09f478a6
Adeel Kazmi [Wed, 6 Jan 2016 17:05:32 +0000 (09:05 -0800)]
Merge "Fix svace issue, DEREF_AFTER_NULL case" into devel/master
Victor Cebollada [Thu, 17 Dec 2015 09:26:09 +0000 (09:26 +0000)]
Enable markup processor in text controls.
Property added to enable and disable the markup processor.
Change-Id: I0c5e237ed235774a5cbcbbb393de7200385575d8
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
taeyoon [Wed, 30 Dec 2015 08:42:22 +0000 (17:42 +0900)]
Fix svace issue, DEREF_AFTER_NULL case
Fix DEREF_AFTER_NULL case
- Access to mEventData without checking NULL
Change-Id: Ib6093ae381e501630e9e78b7e9bb2a4147f5a2bf
David Steele [Wed, 6 Jan 2016 11:25:04 +0000 (11:25 +0000)]
Updated README for test cases
Change-Id: Idf53707b25aac1dffcd18f8a68f310ce0c7664b8
Kimmo Hoikka [Tue, 5 Jan 2016 18:33:19 +0000 (10:33 -0800)]
Merge changes I000b9684,I1a6a0f46 into devel/master
* changes:
(ImageView) Reinstated RESOURCE_URL property for source compatibility with release
Restored control-depth-index-ranges.h to released version but using devel values internally
Adeel Kazmi [Tue, 5 Jan 2016 15:08:39 +0000 (15:08 +0000)]
(ImageView) Reinstated RESOURCE_URL property for source compatibility with release
- But marked as deprecated
Change-Id: I000b9684d9e94a77d477997a3b5fdfaea7b6cacd
Adeel Kazmi [Tue, 5 Jan 2016 12:51:31 +0000 (12:51 +0000)]
Restored control-depth-index-ranges.h to released version but using devel values internally
Change-Id: I1a6a0f46c1ac24d126866df2583030e4f34e4b2d
Victor Cebollada [Tue, 5 Jan 2016 17:15:03 +0000 (17:15 +0000)]
TextField - INPUT_COLOR UTC added.
Change-Id: Ib01859c4b7e77fdb30efb050cf25a8de9c398274
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Kimmo Hoikka [Tue, 5 Jan 2016 16:41:13 +0000 (08:41 -0800)]
Merge "(Control) Re-added Background enums" into devel/master
Adeel Kazmi [Mon, 4 Jan 2016 13:04:10 +0000 (13:04 +0000)]
(Control) Re-added Background enums
- Marked as deprecated
Change-Id: I1c75374a7b76b6235ac4df7166c6ae9641d73a08
David Steele [Tue, 5 Jan 2016 12:50:14 +0000 (12:50 +0000)]
Removed automated test case style folder
Change-Id: I0cc74a0a10238fb9c0497733fc8701f37f5d9f48
Adeel Kazmi [Mon, 4 Jan 2016 11:39:10 +0000 (11:39 +0000)]
(TextField) Moved INPUT_COLOR to the end of the enums to ensure binary compatibility with released version
Change-Id: Id8eb8b12b415c49c343ac3d119d8b09a699a1386
Yoonsang Lee [Tue, 22 Dec 2015 07:50:39 +0000 (16:50 +0900)]
Add dali-addon.manifest
- Set smack label to '_'
- Without this patch, js native application wouldn't be launched (with jsnative).
Change-Id: I12bd9fbddbd646747368f4ea89899c8e354ba895
Adeel Kazmi [Wed, 23 Dec 2015 17:51:25 +0000 (17:51 +0000)]
Fixed klocwork errors
Change-Id: I8aba46010774fdecdcdee773bde988a7d1afb4e5
Adeel Kazmi [Wed, 23 Dec 2015 17:21:48 +0000 (17:21 +0000)]
DALi Version 1.1.15
Change-Id: Idd8251914076c566859fec66695ab5e82370a910
Xiangyin Ma [Fri, 18 Dec 2015 14:00:03 +0000 (14:00 +0000)]
Add Control::GetBackgroudColor() implementation
Change-Id: If6cce8812d0ff68c7ed263796ca098460c89b905
Victor Cebollada [Tue, 15 Dec 2015 11:46:59 +0000 (11:46 +0000)]
Markup procesor. Color
Change-Id: I112a2492c0b6e2f20e864015d9f14ae3ae92d762
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Wed, 25 Nov 2015 14:15:23 +0000 (14:15 +0000)]
Markup processor.
Creates a 'skeleton' of the mark-up processor.
Change-Id: Id98953bda8a22cb9ef2a38c2995c7aa757c95307
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Paul Wisbey [Wed, 16 Dec 2015 10:43:36 +0000 (02:43 -0800)]
Merge "text-decorator to use ImageView instead of ImageActors" into devel/master
Agnelo Vaz [Mon, 14 Dec 2015 20:43:35 +0000 (20:43 +0000)]
text-decorator to use ImageView instead of ImageActors
* SolidColorActor occurances replaced with CustomActors with background color set
* ImageActor planned to be deprecated
* Testcase expecting an ImageActor updated
Change-Id: Ieb821143f09637c19a0bcc2b55c0485b6b961596
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Adeel Kazmi [Tue, 15 Dec 2015 15:31:55 +0000 (07:31 -0800)]
Merge "Stop using ImageActor in GaussianBlur, Bloom & SuperBlur" into devel/master
Adeel Kazmi [Tue, 15 Dec 2015 15:15:09 +0000 (07:15 -0800)]
Merge "Change KeyboardFocusManager to always focus when SetCurrentFocus is called" into devel/master
Xiangyin Ma [Fri, 4 Dec 2015 17:26:30 +0000 (17:26 +0000)]
Stop using ImageActor in GaussianBlur, Bloom & SuperBlur
Change-Id: Id5dfa5523914f99a98c222bb02c1f0f90ffaa5da
Richard Huang [Tue, 15 Dec 2015 11:53:26 +0000 (11:53 +0000)]
Fixed typo of JavaScript API name for layer.lowerBelow
Change-Id: Ic42ae2c383f2a9d41afbcf18ce62bc52cc2e515c
Adeel Kazmi [Fri, 11 Dec 2015 18:40:26 +0000 (10:40 -0800)]
Merge "Update the custom shader effects to resize the geometry" into devel/master
Paul Wisbey [Fri, 11 Dec 2015 17:05:13 +0000 (09:05 -0800)]
Merge "Text - Add the color to the vertex info." into devel/master
Paul Wisbey [Fri, 11 Dec 2015 17:04:31 +0000 (09:04 -0800)]
Merge "Text cleaning." into devel/master
Tom Robinson [Thu, 10 Dec 2015 16:46:23 +0000 (16:46 +0000)]
Change KeyboardFocusManager to always focus when SetCurrentFocus is called
Change-Id: Ic4d0dd51f4e845be420453ebbcecd881fa4398df
Adeel Kazmi [Fri, 11 Dec 2015 15:21:44 +0000 (07:21 -0800)]
Merge "DALi Version 1.1.14" into devel/master
Adeel Kazmi [Fri, 11 Dec 2015 15:06:24 +0000 (07:06 -0800)]
Merge "Fix KeyboardFocus indicator alignment" into devel/master
David Steele [Fri, 11 Dec 2015 14:42:00 +0000 (14:42 +0000)]
DALi Version 1.1.14
Change-Id: I002b4b509cc8e835927a46b6618f5e518f87493e
Xiangyin Ma [Wed, 9 Dec 2015 17:49:13 +0000 (17:49 +0000)]
Update the custom shader effects to resize the geometry
Change-Id: Ice71ffe5b084286625772743201cc72810c9591e
Victor Cebollada [Fri, 20 Nov 2015 10:29:03 +0000 (10:29 +0000)]
Text - Add the color to the vertex info.
Change-Id: I96a16ce938ec0a160f9ba3b98a3e7f4a4af16850
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Wed, 9 Dec 2015 15:49:22 +0000 (15:49 +0000)]
Text cleaning.
* Iterators added in the text atlas renderer.
* Removes unimplemented method from the visual model.
* Typo fixed in the text controller.
* Extra white spaces removed.
* std::vector replaced by Dali::Vector in the text controller.
* Some var's type fixes in the text controller.
Change-Id: I75193fc02ea6f1f53ede8a09606167ef4506142f
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Richard Huang [Thu, 10 Dec 2015 17:05:52 +0000 (17:05 +0000)]
Changed JavaScript API name for signal connection and disconnection
Originally the code for signal connection and disconnection is:
actor.connect("touched", onTouched);
actor.disconnect("touched", onTouched);
It needs to be changed to match the style of Node.JS event handling API
and Tizen Native JavaScript API:
actor.on("touched", onTouched);
actor.off("touched", onTouched);
Change-Id: I7d90651e6014b795292d696c90cb0ab77531a165
Tom Robinson [Thu, 10 Dec 2015 16:40:28 +0000 (16:40 +0000)]
Fix KeyboardFocus indicator alignment
This issue caused the KeyboardFocus indicator to appear offset for some nested layouts. This is due to the wrong position inheritance mode being used.
Change-Id: I204c6d4b9074077a12e68eb2961d0c3ceebbdbd4
Nick Holland [Wed, 9 Dec 2015 17:42:55 +0000 (17:42 +0000)]
Support for building Node Addon for target
Includes changes to examples to have correct dali node addon path for running on device.
On device to use dali
var dali = require('dali')(options);
Change-Id: I42e77e63d805bb0dbd3700a4c3969b2b9e2d2cc4
Richard Huang [Mon, 7 Dec 2015 11:25:08 +0000 (11:25 +0000)]
Add exception for wrong signal name in JavaScript
Change-Id: Ie028b9168565492332f1b85306be587240f1b048
Xiangyin Ma [Fri, 4 Dec 2015 11:03:02 +0000 (11:03 +0000)]
DALi Version 1.1.13
Change-Id: If64296973c91bb2d62e32b9fcb9ac7c40e2a70d7
Xiangyin Ma [Tue, 1 Dec 2015 18:36:07 +0000 (18:36 +0000)]
Fix the segmentation fault error cause by ImageAtlas when application quiting
Change-Id: Idcb694b29b39c055060c26190d47a5a9eddb17c5
Xiangyin Ma [Mon, 30 Nov 2015 17:47:38 +0000 (17:47 +0000)]
remove the duplicate properties from ColorRenderer and BorderRenderer
Change-Id: I7689ae4e97882061b09f643481115f6d1d6b6f29
Richard Huang [Fri, 27 Nov 2015 15:33:26 +0000 (15:33 +0000)]
Support of creating BufferImage from pixel buffer in JavaScript
Change-Id: Ifebd75c46e45ae56aedd75708279c54c35b33fdb
Adeel Kazmi [Fri, 27 Nov 2015 10:17:17 +0000 (10:17 +0000)]
DALi Version 1.1.12
Change-Id: If5ed4c84f43c60deaf48a8a43cf514bf86dca376
Nick Holland [Thu, 26 Nov 2015 15:36:12 +0000 (15:36 +0000)]
Fix initial value for matrix property registration
Currently the full contents of imat is not set to the
viewMatrix property.
var imat = [1,0,0,0,
0,1,0,0,
0,0,1,0,
0,0,0,1];
shader.registerAnimatableProperty('viewMatrix', imat);
Change-Id: I25c76b0dc34e5238316b1bc571d8c8cc4ce8cedc
Adeel Kazmi [Wed, 25 Nov 2015 09:46:10 +0000 (09:46 +0000)]
(Image Atlas) Fix helgrind simultaneous access issue
Change-Id: I948c61ab962bd1469cafae82c7ee5c8709c722f0
Adeel Kazmi [Mon, 23 Nov 2015 10:06:46 +0000 (10:06 +0000)]
(AutomatedTests) Ensure warnings are shown as errors
Change-Id: Ib85ad8c51010017f8911d9295df0d2f8240ef81f
Adeel Kazmi [Fri, 20 Nov 2015 15:58:50 +0000 (07:58 -0800)]
Merge "Remove JavaScript binding for NativeImage, NinePatchImage, ImageActor and ShaderEffect" into devel/master
Paul Wisbey [Fri, 20 Nov 2015 13:59:40 +0000 (05:59 -0800)]
Merge "Check glyphs are laid out in text-view." into devel/master
Richard Huang [Fri, 20 Nov 2015 10:58:18 +0000 (10:58 +0000)]
DALi Version 1.1.11
Change-Id: I93cf02d11e6a55b17fb59c50838c5d06be00b60e
Victor Cebollada [Thu, 19 Nov 2015 09:14:23 +0000 (09:14 +0000)]
Check glyphs are laid out in text-view.
* Check there are glyphs laid out before performing operations
Change-Id: I508959209b405522501b47832e158042bf09d52c
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Richard Huang [Tue, 17 Nov 2015 17:36:10 +0000 (17:36 +0000)]
Remove JavaScript binding for NativeImage, NinePatchImage, ImageActor and ShaderEffect
Change-Id: Ic68322b4114459c11c4147c224ebf2eaafc055a4
Adeel Kazmi [Thu, 19 Nov 2015 15:02:30 +0000 (07:02 -0800)]
Merge "Programming guide of DebugRenderer" into devel/master
Xiangyin Ma [Wed, 18 Nov 2015 14:45:45 +0000 (14:45 +0000)]
Fix the Slider and Scrollbar issue with nine patch image
Change-Id: Ieb9843466d112205bf360649502e23f38ab8313f
Xiangyin Ma [Thu, 19 Nov 2015 11:50:30 +0000 (11:50 +0000)]
Programming guide of DebugRenderer
Change-Id: I2208e8a63321667c52943ab7826afef85c3d9c41
Adeel Kazmi [Thu, 19 Nov 2015 10:51:01 +0000 (02:51 -0800)]
Merge "Fix UTC prevent issue" into devel/master
Richard Huang [Wed, 18 Nov 2015 18:05:06 +0000 (18:05 +0000)]
Do not use image atlasing for remote image resource
Change-Id: I1fd0999d5c93aba02d378565f2ab71b7cf36dc74
Kimmo Hoikka [Wed, 18 Nov 2015 17:29:25 +0000 (09:29 -0800)]
Merge "Debug renderer" into devel/master
Tom Robinson [Wed, 18 Nov 2015 10:33:03 +0000 (10:33 +0000)]
Control not always rendering background image depending on add order
Change-Id: Ie16a55fd59278d65f8665994972cb90708a4891e
Xiangyin Ma [Tue, 10 Nov 2015 15:13:30 +0000 (15:13 +0000)]
Debug renderer
Change-Id: Id7dafc9872e5a4f1478641f60a0e2ba1bfff905f
taeyoon [Wed, 18 Nov 2015 08:12:37 +0000 (17:12 +0900)]
Fix UTC prevent issue
Change-Id: Ibbc41bd7ef9a5bbb9138bf68ffff8e8506340a3b
Paul Wisbey [Tue, 17 Nov 2015 17:36:54 +0000 (09:36 -0800)]
Merge "Adding TextField Popup behaviour to (Programming) Guide" into devel/master
Kimmo Hoikka [Tue, 17 Nov 2015 17:07:25 +0000 (09:07 -0800)]
Merge "Changed button to use ImageView instead of ImageActor and enabled custom fragment shaders for n-path renderer" into devel/master
Kimmo Hoikka [Tue, 17 Nov 2015 17:07:14 +0000 (09:07 -0800)]
Merge "(ImageRenderer)Stop the duplicated image loading when using custom shader" into devel/master
Agnelo Vaz [Mon, 16 Nov 2015 12:26:33 +0000 (12:26 +0000)]
Adding TextField Popup behaviour to (Programming) Guide
Change-Id: I370988ae201d0b3ecabb62061bf9fb57b8f78930
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Agnelo Vaz [Tue, 10 Nov 2015 17:31:20 +0000 (17:31 +0000)]
TextSelection Popup to be aware of requirement to Paste and whitespace selectable
* This shows the [PASTE][CLIPBOARD] buttons when a tap occurs in edit mode (if something to paste)
* To see [select][select all] longpress or double tap text
* Whitespace can be selected by double tap or longpress
* TextAtlasRenderer returns a renderable actor even when all text is whitespace
Change-Id: I1ac5cd1f76e554b1c9d59ef8b8f64fe741aa6855
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Chu Hoang [Fri, 13 Nov 2015 09:58:09 +0000 (09:58 +0000)]
Changed button to use ImageView instead of ImageActor and enabled custom fragment shaders for n-path renderer
Change-Id: I3edcb09f229e2b00fc14cae0a0215cf396a0ae58
Xiangyin Ma [Wed, 11 Nov 2015 18:54:38 +0000 (18:54 +0000)]
(ImageRenderer)Stop the duplicated image loading when using custom shader
Change-Id: I972730e63d40ac0305d4299fcdedbe66bf312aff
Adeel Kazmi [Mon, 16 Nov 2015 10:55:34 +0000 (10:55 +0000)]
(ImageView) Restore erroneously removed APIs & Fix SetImage behaviour
SetImage Issues fixed:
- SetImage should NOT show an error image if empty/NULL. It should show nothing as per API description.
- Changing between types (Image type to URL, property-map to Image etc.) did not work properly.
- Ensure a RelayoutRequest is done when SetImage is called so that our size is renegotiated.
Change-Id: I066130a697b7791f791b5b9b63733ec482ceaed6
Adeel Kazmi [Fri, 13 Nov 2015 16:41:02 +0000 (08:41 -0800)]
Merge "DALi Version 1.1.10" into devel/master
Adeel Kazmi [Fri, 13 Nov 2015 16:33:48 +0000 (16:33 +0000)]
DALi Version 1.1.10
Change-Id: Iff295a71e6743f45d367e087d96bfa577cbc51e1
Chu Hoang [Wed, 11 Nov 2015 15:53:00 +0000 (15:53 +0000)]
Remove NinePatchMaskEffect
Change-Id: Ib3f5c029ea7f80a559edcbc631db968cd1656bed
Chu Hoang [Thu, 12 Nov 2015 13:19:00 +0000 (13:19 +0000)]
Updated Programming guide.
Updated Control background with a section about renderers.
Updated ImageActor section.
Added ImageView section.
Updated ShaderEffects section.
Change-Id: Ib3df5abf69e789311d58b95a115caddc3b6ab63c
Kimmo Hoikka [Thu, 12 Nov 2015 18:24:33 +0000 (10:24 -0800)]
Merge "Remove instances of finding a property before RegisterProperty" into devel/master
Adeel Kazmi [Thu, 12 Nov 2015 17:18:38 +0000 (09:18 -0800)]
Merge "Added generic signal binding for toolkit controls in JavaScript" into devel/master
Adeel Kazmi [Thu, 12 Nov 2015 11:20:46 +0000 (11:20 +0000)]
Remove instances of finding a property before RegisterProperty
This is because RegisterProperty checks whether the property has been registered before, and just calls
SetProperty it it has been.
Change-Id: I20a415edd05afd6d0b8f05171ea11c94e4f5cc57
Richard Huang [Wed, 11 Nov 2015 17:30:50 +0000 (17:30 +0000)]
Added generic signal binding for toolkit controls in JavaScript
This should cover generic use cases where the signal callback only needs to
be aware of who emits the signal and do not need to return any parameter.
This will work for most of control signals without specific binding.
For example, for button, you can do:
var button = new dali.Control("PushButton");
button.name = "myButton";
button.connect("pressed", app.onButtonPressed);
button.connect("released", app.onButtonReleased);
app.onButtonPressed = function( button ) {
console.log(button.name + " Pressed!!!");
}
app.onButtonReleased = function( button ) {
console.log(button.name + " Released!!!");
}
button.disconnect("pressed", app.onButtonPressed);
button.disconnect("released", app.onButtonReleased);
Change-Id: I3144ca274cc07e68d81ba78cc606e5367ea5419b
Kimmo Hoikka [Wed, 11 Nov 2015 18:03:38 +0000 (10:03 -0800)]
Merge "Remove unnamed namespace from DissolveEffect (Klocwork Error)" into devel/master
Adeel Kazmi [Wed, 11 Nov 2015 17:24:18 +0000 (09:24 -0800)]
Merge "Fix overshoot issue - not to make an overshoot actor twice" into devel/master
Adeel Kazmi [Wed, 11 Nov 2015 15:35:47 +0000 (15:35 +0000)]
Remove unnamed namespace from DissolveEffect (Klocwork Error)
Change-Id: I750f4130f948728b748504441e570b35a23d6880
Kimmo Hoikka [Wed, 11 Nov 2015 13:46:52 +0000 (05:46 -0800)]
Merge "Fix various Klocwork errors" into devel/master
Adeel Kazmi [Wed, 11 Nov 2015 12:32:07 +0000 (12:32 +0000)]
Fix various Klocwork errors
Change-Id: I34c5e2b4471d9c22fe3596b7c5417371573d84eb
Richard Huang [Wed, 11 Nov 2015 10:50:34 +0000 (10:50 +0000)]
TextureRect uniform not registered when multiple ImageViews created with the same url before on stage
Change-Id: If42a80e0510965d1040cf229ad07d751fe3d8490