Peter M. Groen / dali-demo

Change-Id: I52f3b59064ae8c1e6951132b2e3a4c38e7d4b759
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>

Change-Id: I5932f0191f358e986fcaace820fb2ecb43b9812b

Conflicts:
	demo/dali-demo.cpp
	demo/dali-table-view.cpp
	examples/builder/examples.cpp
	examples/buttons/buttons-example.cpp
	examples/item-view/item-view-example.cpp
	examples/path-animation/path-animation.cpp
	examples/text-view/text-view-example.cpp
	shared/view.h

Change-Id: I152b06854b349f0430172227f1d79ee16855fbc0

Change-Id: Ie7dcdc64bf70fea8ab68af85b729fa5a9de0b652
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>

Usage:
Will load both JSON and JavaScript file from command line
scripting.example my-scene.json my-script.js

Change-Id: I36330b8bae84a532f57989b4087843d178d03e0b

Change-Id: Iffcdd6753c39fa83e7f68ef927339374bc0061a2

Change-Id: I8609692959d95f0ee58213d9271a014ba85fb49d
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>

Change-Id: I05e4ec4191816dc247d6536d4c85b3dbe43599ef

This reverts commit a6f2bba05b6db85066145ed10d882e9514f267da.

Change-Id: I7c0993c884a61cf7d906f2da64fab0677d92774b

Change-Id: Ica4f357358704c12dd69e882efcb49c6dffd233e

Change-Id: I5f0e4ad2e2b52cd25aa8661dd95f688ac6c41a8b
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>

Conflicts:
	examples/text-view/text-view-example.cpp

Change-Id: I112aab85d61c49687bed286c4d6435fae35f416a

Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Change-Id: I7629356cb2678ee8eda85eff0cbef6a530ab7a17

Change-Id: I092baac3133471d94aa62109548a745a74b037e0

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

Change-Id: I9fb727955e339e123f5ca92fbc15a7d2d1479939
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>

Change-Id: Id953da32620c4a3c57519cf9f5ecd74eb765a430

Change-Id: I300bf3260b3dfec153583e5b4c0c1ee6ee1eebea

Change-Id: I1d3e62c1ad548c1c81b4c8dab2246c22a68249aa
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>

Change-Id: I703035788451cb057a7834199136cc70d22c87e4

* 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>

Change-Id: Ib25db927ec8f9e53247d0b980e30404738f894d2

Conflicts:
	examples/item-view/item-view-example.cpp
	examples/path-animation/path-animation.cpp

Change-Id: I6a266274f476748bf34a97652964f501f44fe00c

Change-Id: I9e07392c5c27a61fb91b25ae03fc2ee5b3b8c0a8

Change-Id: I18d69dba01824ffaa1cd3a4c6b9ead3a38981bc7

Change-Id: I680700e541ac44ef0695250ba4083f7770361a3e

Change-Id: If1cef63c5c63a2c4278406856e5701ef1abbcf82

Change-Id: I359790799ebf64ac5fd4e988e569dada337dd9f8

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

Change-Id: Ice128b44aeeccf51e9ac55af9deb3a00fd270aab

Change-Id: If864584881cf663d5a6ddfdf940fc94c21c4a9bf

Change-Id: Ifd9ab356030fc8235e6518b7bfb059697444d14b

Change-Id: I820263d4ae6973dd0a28bffb278de3b422c804ce

Change-Id: I4a723457a7cfaca87a20f771aa64f187ea160453

…tic bezier paths and filling of regions bounded by quadratic beziers." into tizen

Change-Id: Ie3085ce4986965da3743efc9ab6585176d0cdb23