adam.b [Fri, 15 Jan 2021 11:17:30 +0000 (11:17 +0000)]
[dali_2.0.9] Merge branch 'devel/master'
Change-Id: Ideb55ca4c79d74399f97fc57127c37871ed740f1
adam.b [Fri, 15 Jan 2021 11:16:46 +0000 (11:16 +0000)]
DALi Version 2.0.9
Change-Id: I14401001f89014833093bd1dfbd14fdf78480ce6
Richard Huang [Fri, 8 Jan 2021 14:36:42 +0000 (14:36 +0000)]
[dali_2.0.8] Merge branch 'devel/master'
Change-Id: I6d9090683bf3b322d3733ef5c8911d00cca2750d
Richard Huang [Fri, 8 Jan 2021 14:35:55 +0000 (14:35 +0000)]
DALi Version 2.0.8
Change-Id: I088de7043ab1c8f1be49f90d44386014887d24b7
Adeel Kazmi [Thu, 7 Jan 2021 18:27:39 +0000 (18:27 +0000)]
Updated macOS instructions
Change-Id: Iaa0488361b4f340160d4484c61c2986e2edb3fff
Lucas Cavalcante de Sousa [Tue, 13 Oct 2020 20:43:45 +0000 (17:43 -0300)]
Add installation instructions for MacOS
Change-Id: Id26bbd3035ad1c0d39a4194fd25e568469df2d8d
Adeel Kazmi [Mon, 28 Dec 2020 19:40:21 +0000 (19:40 +0000)]
(Mac OSX Build) Use vcpkg cairo & fixed scene-loader build
Change-Id: I66647e1c7214a7987a7f2ec9eb99f3dc9429c468
Wander Lairson Costa [Tue, 8 Sep 2020 18:43:02 +0000 (15:43 -0300)]
Support building on macOS
Change-Id: Icf83a291c03bef8253d896be8a55454357554a83
György Straub [Thu, 31 Dec 2020 09:34:16 +0000 (09:34 +0000)]
Added Colour Transition example.
Demonstrates colour transition using flow maps and uv rotation / scaling.
Flow maps are greyscale images where the value of the pixels signifies the
progress of the animation, which is added to an animated value which we
use to lerp between old and new colour.
The colour of the content is used to scale the source / target colour, i.e.
white is affected most, dark is affected less.
Controls:
- Double-tap middle (33%) of screen: transition using random flow map;
- Double-tap outside the middle of screen: transition using one of the
effects (flow maps) mapped to the given segment of the screen;
Change-Id: I8767d7632f30e489f9546c0f862bcdd05bb0305a
Signed-off-by: György Straub <g.straub@partner.samsung.com>
Heeyong Song [Mon, 4 Jan 2021 14:41:35 +0000 (14:41 +0000)]
Merge "Change visual animation code" into devel/master
György Straub [Wed, 30 Dec 2020 16:40:53 +0000 (16:40 +0000)]
scene-loader.example fixes.
- main() is exported using DALI_EXPORT_API, so that Android may see it;
- refined rotation code and made the scaling factor a more meaningful
quantity;
Change-Id: I1c61f27a2bd7ce402eac34df8b393269371ca61d
Signed-off-by: György Straub <g.straub@partner.samsung.com>
Heeyong Song [Wed, 9 Dec 2020 07:45:51 +0000 (16:45 +0900)]
Change visual animation code
Change-Id: I926b26102db20d08af8fc8b7eec72e21f70fd51a
György Straub [Wed, 23 Dec 2020 15:12:18 +0000 (15:12 +0000)]
Added an example to demonstrate the usage of the Dali Scene Loader library.
Change-Id: I2cbd4814fbb3238c188a10900f98b5285da8dc98
Signed-off-by: György Straub <g.straub@partner.samsung.com>
György Straub [Thu, 24 Dec 2020 07:50:29 +0000 (07:50 +0000)]
[dali_2.0.7] Merge branch 'devel/master'
Change-Id: I6a5ae298cd16e5a6f6c514ae6c1c965b94d4f74f
György Straub [Thu, 24 Dec 2020 07:49:19 +0000 (07:49 +0000)]
DALi Version 2.0.7
Change-Id: If564a76fe38891a3b7e85931847195dd547c7a5a
adam.b [Fri, 18 Dec 2020 11:09:34 +0000 (11:09 +0000)]
[dali_2.0.6] Merge branch 'devel/master'
Change-Id: I9481ccf16439a08aa4566a98cb0508c2557e795a
adam.b [Fri, 18 Dec 2020 11:08:39 +0000 (11:08 +0000)]
DALi Version 2.0.6
Change-Id: I669dec604289f4098554a75ba16e7f613054eb4d
David Steele [Fri, 11 Dec 2020 12:11:35 +0000 (12:11 +0000)]
[dali_2.0.5] Merge branch 'devel/master'
Change-Id: I72aa493fb23382a0224b351c9a6fe6e30d649fec
David Steele [Fri, 11 Dec 2020 12:10:39 +0000 (12:10 +0000)]
DALi Version 2.0.5
Change-Id: I7f3ce49a17b8859b6b49cdb2b14829032d20de75
Adeel Kazmi [Fri, 4 Dec 2020 14:58:01 +0000 (14:58 +0000)]
[dali_2.0.4] Merge branch 'devel/master'
Change-Id: I238aab4eb3a827a54a369783cc2a27654414407c
Adeel Kazmi [Fri, 4 Dec 2020 14:57:18 +0000 (14:57 +0000)]
DALi Version 2.0.4
Change-Id: I794cc346291afefd9e2298611ac01efb813ec0a0
György Straub [Tue, 1 Dec 2020 11:46:19 +0000 (11:46 +0000)]
Added accidentally removed animated-gradient-callactive example back.
Change-Id: Ifb654883f6a0d757a2f1beff0a8a87ae62a92e16
Richard Huang [Fri, 27 Nov 2020 11:58:05 +0000 (11:58 +0000)]
[dali_2.0.3] Merge branch 'devel/master'
Change-Id: Ie85934c41e64b5a58155f4370cd2da49d0bce171
Richard Huang [Fri, 27 Nov 2020 11:57:16 +0000 (11:57 +0000)]
DALi Version 2.0.3
Change-Id: I903c3bbb3d026bad174f722cf40c679e1b699ec3
Cheng-Shiun Tsai [Tue, 17 Nov 2020 10:07:03 +0000 (10:07 +0000)]
changing writing directory for Android
/tmp doesn't exist for Android, need to use internal data directory
Change-Id: I08d8855baa97e175a2874915076d4fd22ff83d6f
György Straub [Fri, 20 Nov 2020 07:47:38 +0000 (07:47 +0000)]
[dali_2.0.2] Merge branch 'devel/master'
Change-Id: Ic51dda43a4715c2f12d5962375c5589b1cfaea01
György Straub [Fri, 20 Nov 2020 07:46:28 +0000 (07:46 +0000)]
DALi Version 2.0.2
Change-Id: I5a349af1f4f11c77ccfa8e706f79e7eb97dac17f
Adeel Kazmi [Fri, 13 Nov 2020 18:26:39 +0000 (18:26 +0000)]
Merge "Fixed SVACE defects in Particles example." into devel/master
Cheng-Shiun Tsai [Fri, 13 Nov 2020 14:54:36 +0000 (14:54 +0000)]
[dali_2.0.1] Merge branch 'devel/master'
Change-Id: I2a35e80ffd1d8e7e43fecc322179ddc4982b3628
Cheng-Shiun Tsai [Fri, 13 Nov 2020 14:53:39 +0000 (14:53 +0000)]
DALi Version 2.0.1
Change-Id: I3e3c8aad0fbafec82d6020ad81cfa3df4aef1a69
György Straub [Fri, 13 Nov 2020 10:31:42 +0000 (10:31 +0000)]
Fixed SVACE defects in Particles example.
Change-Id: Ie0c14f01aee1d63e20e20fcabaf51e6274fec1c5
Signed-off-by: György Straub <g.straub@partner.samsung.com>
Adeel Kazmi [Thu, 12 Nov 2020 23:51:25 +0000 (23:51 +0000)]
(Waves Example) Ensure all members are initialised
Change-Id: Iffc1289e6ea44c0ee87e0adc3fed8683cb3ef263
Adeel Kazmi [Mon, 9 Nov 2020 17:21:56 +0000 (17:21 +0000)]
Merge "Added Waves example." into devel/master
György Straub [Fri, 6 Nov 2020 09:56:35 +0000 (09:56 +0000)]
Fixed the rotation in primitive-shapes-example (y was inverted).
Change-Id: Ia7264cb34255dc4a912b8f781dee05eef29ac484
György Straub [Tue, 3 Nov 2020 16:17:07 +0000 (16:17 +0000)]
Added Waves example.
- tilt, or if not supported, pan, to rotate light;
- double tap to trigger color transition;
Change-Id: I7de09c65309f6b069566cf330ebf18904d36a885
Adeel Kazmi [Fri, 6 Nov 2020 09:19:09 +0000 (09:19 +0000)]
[dali_2.0.0] Merge branch 'devel/master'
Change-Id: Id0ec21aed19ae234aae8dd0e8990c6d097a9ee01
Adeel Kazmi [Fri, 6 Nov 2020 09:18:20 +0000 (09:18 +0000)]
DALi Version 2.0.0
Change-Id: I0e0cbf90f8fd14607b4f59afb266beaf9139af21
Adeel Kazmi [Thu, 5 Nov 2020 22:14:00 +0000 (22:14 +0000)]
Merge "Reduced complexity of dali-table-view" into devel/master
Adeel Kazmi [Tue, 3 Nov 2020 15:51:59 +0000 (15:51 +0000)]
Reduced complexity of dali-table-view
Change-Id: I5ecc880f2a0167ca1219700bad55107a675dc68d
György Straub [Fri, 30 Oct 2020 15:53:20 +0000 (15:53 +0000)]
Added Particles example.
- to tilt world, tilt device or if tilt isn't supported, swipe;
- tap to scatter particles;
- double click to trigger color change;
Change-Id: I8c72ea1ff7a8226b03b5e106936ca3644ef1f5b3
Wonsik Jung [Thu, 5 Nov 2020 09:55:24 +0000 (09:55 +0000)]
Merge "Modify window enum type's use-case" into devel/master
György Straub [Thu, 29 Oct 2020 14:46:24 +0000 (14:46 +0000)]
Fixed the rotation interaction in the Reflection example.
Change-Id: I336525894567d22349f883ff6d673ba0e2f8a2ff
Signed-off-by: György Straub <g.straub@partner.samsung.com>
György Straub [Wed, 28 Oct 2020 14:26:52 +0000 (14:26 +0000)]
Fixed the rotation interaction in the Primitive Shapes example.
Change-Id: If50a69da01c02fdb6047d766d5d213648b02a360
Signed-off-by: György Straub <g.straub@partner.samsung.com>
György Straub [Thu, 29 Oct 2020 16:08:35 +0000 (16:08 +0000)]
Fixed the rotation interaction in the Mesh Visual example.
Change-Id: I4d4c8df78c78281e565ec9932df43a598e68a439
Signed-off-by: György Straub <g.straub@partner.samsung.com>
György Straub [Wed, 28 Oct 2020 11:52:56 +0000 (11:52 +0000)]
Simplified the Scripted UI example.
- there is no need to pre-populate the item view; it will be populated upon activation;
- removed branching & multiple returns in FileWatcher::FileHasChanged();
Change-Id: I47a92d5f0e3d84701f1688ba083f4a6850b6d909
Signed-off-by: György Straub <g.straub@partner.samsung.com>
David Steele [Fri, 30 Oct 2020 14:47:34 +0000 (14:47 +0000)]
Merge "DALi Version 1.9.36" into devel/master
David Steele [Fri, 30 Oct 2020 14:34:26 +0000 (14:34 +0000)]
[dali_1.9.36] Merge branch 'devel/master'
Change-Id: Id36213bc6157aa75dcf24ebb9c4e6b07f874eca9
David Steele [Fri, 30 Oct 2020 14:33:41 +0000 (14:33 +0000)]
DALi Version 1.9.36
Change-Id: Ia0c3cd2a9de29b0ef43fb1976707c073a5f98713
Wonsik Jung [Mon, 26 Oct 2020 07:04:27 +0000 (16:04 +0900)]
Modify window enum type's use-case
Change-Id: I49395004f4f340942df35af15d950a9190aa8ea0
Artur Świgoń [Fri, 18 Sep 2020 10:16:37 +0000 (12:16 +0200)]
[AT-SPI] MERGING MARKER
This is the tip of the branch with AT-SPI commits to be merged into DALi.
Change-Id: I9379659f00f560433758240c32935ca9d7d898fb
Artur Świgoń [Mon, 24 Aug 2020 14:54:00 +0000 (16:54 +0200)]
[AT-SPI] Squashed implementation
Change-Id: I20d6675ab05cd9eb6344cc11e74aab37ed5f6441
Adeel Kazmi [Fri, 23 Oct 2020 12:45:19 +0000 (12:45 +0000)]
Merge "Error message when demo lib doesn't have main()" into devel/master
adam.b [Fri, 23 Oct 2020 10:46:15 +0000 (11:46 +0100)]
[dali_1.9.35] Merge branch 'devel/master'
Change-Id: Ida2905d9e801e53e366e932d230295cb00312ff9
adam.b [Fri, 23 Oct 2020 10:45:17 +0000 (11:45 +0100)]
DALi Version 1.9.35
Change-Id: Id75cd199c76d96a1f37652846d462915cb15c5b9
Adeel Kazmi [Tue, 20 Oct 2020 10:10:08 +0000 (10:10 +0000)]
Merge "Add DALI_EXPORT_API to main()" into devel/master
Cheng-Shiun Tsai [Mon, 19 Oct 2020 14:43:32 +0000 (15:43 +0100)]
Add DALI_EXPORT_API to main()
sometimes deferred-shading demo fail to launch due to main() is not found
Add DALI_EXPORT_API to ensure export of main()
Change-Id: I2fe96baa8679c2bf0edc4d9ed5bdd52a59ffc11a
Cheng-Shiun Tsai [Mon, 19 Oct 2020 14:29:49 +0000 (15:29 +0100)]
Error message when demo lib doesn't have main()
Demos like deferred-shading.example sometimes fail to launch due to
libdeferred-shading.example.so doesn't have main()
When such error happens, output error to logcat
Change-Id: Iecec465cf2436ff04a78ac78bd4c6fee0282ac3d
Adeel Kazmi [Sat, 17 Oct 2020 13:28:28 +0000 (13:28 +0000)]
Merge "Use dali-adaptor api to read files from inside apk" into devel/master
Cheng-Shiun Tsai [Thu, 15 Oct 2020 13:23:03 +0000 (14:23 +0100)]
Use dali-adaptor api to read files from inside apk
Android asset files are not extracted to file system directly,
cannot use fopen, but need to use asset specific api to read,
which is wrapped by dali-adaptor api.
Change-Id: If775e04e4e2d562755bce3eeb9f79fa279e5da70
Richard Huang [Fri, 16 Oct 2020 10:34:21 +0000 (11:34 +0100)]
[dali_1.9.34] Merge branch 'devel/master'
Change-Id: I927d9a90f043080ea1a0d8acc51a0aaa98a44573
Richard Huang [Fri, 16 Oct 2020 10:32:00 +0000 (11:32 +0100)]
DALi Version 1.9.34
Change-Id: Ib1869c5aa9f8a6aea0c6d0a8e8f6efc38944d6d6
Cheng-Shiun Tsai [Tue, 13 Oct 2020 13:00:35 +0000 (14:00 +0100)]
Load libraries directly from apk instead of file path
Android 6 or higher support loading libraies directly from apk
64bit dali demo fail to run due to specifying wrong path
By not specifying path, we can directly dlopen from apk
One less place to have bug
Change-Id: I53619979798ab2d4fbccf25a152d92e52e467d0b
Cheng-Shiun Tsai [Tue, 13 Oct 2020 11:44:08 +0000 (12:44 +0100)]
Add ERROR message in the case of serious error
output an error message through logcat
regardless release/debug build
also exit with an non-zero exit code
so that it won't fall into infinite loop
Change-Id: Ib078a7c26a0bfc855f284f3103878e0b94ea1dfa
joogab yun [Wed, 14 Oct 2020 07:00:04 +0000 (07:00 +0000)]
Merge "Dali_test: add test for enable_editing" into devel/master
György Straub [Fri, 9 Oct 2020 13:07:15 +0000 (14:07 +0100)]
[dali_1.9.33] Merge branch 'devel/master'
Change-Id: I00f1a70836367c66a5ddb9f0b45882a91ecd8682
György Straub [Fri, 9 Oct 2020 13:06:15 +0000 (14:06 +0100)]
DALi Version 1.9.33
Change-Id: Id776480aa47a753d501fc3af930b723e48a85d75
Ali Alzyod [Sun, 20 Sep 2020 14:18:21 +0000 (17:18 +0300)]
Dali_test: add test for enable_editing
Change-Id: I949b883820d4b96b0ebadf01967d62e5be889fd7
David Steele [Wed, 7 Oct 2020 14:29:46 +0000 (15:29 +0100)]
Updated android build to use C++17
demo build was adding -std=g++11 to cflags in scripts calling library.
demo app also had -std=g++11 in own C++ CMakeLists.txt _and_ in gradle.
Changed everything to use std=c++17.
Change-Id: Id46801a812c043db41514be17e8bd8da2ec97845
joogab yun [Tue, 6 Oct 2020 01:25:37 +0000 (01:25 +0000)]
Merge "Dali-tests: add support for SELECTED_TEXT_START/END" into devel/master
Cheng-Shiun Tsai [Fri, 2 Oct 2020 09:47:16 +0000 (10:47 +0100)]
[dali_1.9.32] Merge branch 'devel/master'
Change-Id: I3ba11097909e35637707f20e4703aa378e4a85fc
Cheng-Shiun Tsai [Fri, 2 Oct 2020 09:46:47 +0000 (10:46 +0100)]
DALi Version 1.9.32
Change-Id: Ib4e73ae1f04bd1a62c4373aab445d4e723b513d5
György Straub [Mon, 28 Sep 2020 13:14:48 +0000 (14:14 +0100)]
Const correctness improvements for Property::Value.
Change-Id: Ie802f27afba4069d87b52ba7256410c4f3cec4ab
Signed-off-by: György Straub <g.straub@partner.samsung.com>
ali198724 [Fri, 18 Sep 2020 06:21:36 +0000 (09:21 +0300)]
Dali-tests: add support for SELECTED_TEXT_START/END
Modify simple-text-field to support programatical selection modification
Change-Id: I173f0484113cf5e8cbc99b54ab1e0b2e83ea6c05
Adeel Kazmi [Fri, 25 Sep 2020 10:59:15 +0000 (11:59 +0100)]
[dali_1.9.31] Merge branch 'devel/master'
Change-Id: I45af0f29bd5b027da8b56ce8dd4a50b2e1000f0a
Adeel Kazmi [Fri, 25 Sep 2020 10:58:26 +0000 (11:58 +0100)]
DALi Version 1.9.31
Change-Id: I93307aa3606085549cb22a36a1844d532418a9ae
David Steele [Fri, 18 Sep 2020 10:35:49 +0000 (11:35 +0100)]
[dali_1.9.30] Merge branch 'devel/master'
Change-Id: Icfae0a5903b8554a56388cac6f0e1617f433df11
David Steele [Fri, 18 Sep 2020 10:35:18 +0000 (11:35 +0100)]
DALi Version 1.9.30
Change-Id: Iaeaef8ea642713314f271dd269c2974abb6efcfc
Adeel Kazmi [Thu, 17 Sep 2020 19:41:01 +0000 (20:41 +0100)]
Removed duplicated code by creating third-party folder
Change-Id: If45b62cd020858588491a4701fb834675caf8f2a
adam.b [Fri, 11 Sep 2020 11:57:43 +0000 (12:57 +0100)]
[dali_1.9.29] Merge branch 'devel/master'
Change-Id: I2a134a78e418feb615bfac651482e0a98781958d
adam.b [Fri, 11 Sep 2020 11:56:48 +0000 (12:56 +0100)]
DALi Version 1.9.29
Change-Id: Iae6c68478a056ef778ce33c12399eeed885db49f
David Steele [Thu, 10 Sep 2020 12:15:11 +0000 (13:15 +0100)]
Updated demos to use DALi clang-format
Change-Id: I2be80c43c2f83b2333df48210b53258e4be1acae
György Straub [Wed, 9 Sep 2020 14:49:51 +0000 (15:49 +0100)]
Fixed DGEUF-1841.
Since the text labels are supposed to be aligned to a grid, the
new target position is calculated based on this instead of getting
the position of the supposedly related text label, which might be
midway through an animation at the time.
Change-Id: Id83e89c13f2e03325966ab890aa5ca00e94fa100
Signed-off-by: György Straub <g.straub@partner.samsung.com>
Richard Huang [Fri, 4 Sep 2020 10:16:25 +0000 (11:16 +0100)]
[dali_1.9.28] Merge branch 'devel/master'
Change-Id: Ided192e678154926e82f0806d8319a71317b025f
Richard Huang [Fri, 4 Sep 2020 10:15:55 +0000 (11:15 +0100)]
DALi Version 1.9.28
Change-Id: Ibac08e501fcabc27396d3c871d4275efa5955502
Adeel Kazmi [Thu, 3 Sep 2020 13:40:30 +0000 (14:40 +0100)]
Remove use of deprecated Control flag REQUIRES_STYLE_CHANGE_SIGNALS
Change-Id: Ic99cbf5d597c659fefc44b943109f50d311445ae
Adeel Kazmi [Thu, 3 Sep 2020 11:58:53 +0000 (11:58 +0000)]
Merge "Moved Gesture::State and -::Type to gesture-enumerations.h." into devel/master
Adeel Kazmi [Wed, 2 Sep 2020 13:55:34 +0000 (14:55 +0100)]
Changes after TouchedSignal changes
Change-Id: I2969e88887c684a556c7372ca7f4e07abc3969fa
György Straub [Wed, 2 Sep 2020 13:23:26 +0000 (14:23 +0100)]
Moved Gesture::State and -::Type to gesture-enumerations.h.
Change-Id: I5d7f00f98adb1e803eca89b76da8eb3dcb3a1fe2
Signed-off-by: György Straub <g.straub@partner.samsung.com>
Joogab Yun [Tue, 23 Jun 2020 06:25:53 +0000 (15:25 +0900)]
Refactoring Gestures Class
Change-Id: Ic67c98e5bcc58d5f0ce812b043fb7ebff204d41a
György Straub [Fri, 28 Aug 2020 15:53:20 +0000 (16:53 +0100)]
Renaming of enum values for coding standards compliance.
Change-Id: I0b6ce4ed15976ad481029c689606014550e3145f
Signed-off-by: György Straub <g.straub@partner.samsung.com>
Victor Cebollada [Fri, 28 Aug 2020 10:12:42 +0000 (11:12 +0100)]
[dali_1.9.27] Merge branch 'devel/master'
Change-Id: I43ce3736d2e812ae71396ff3d995e88f04df5c6f
Victor Cebollada [Fri, 28 Aug 2020 10:11:47 +0000 (11:11 +0100)]
DALi Version 1.9.27
Change-Id: Icac39552e28af18ec712d7c5ff7b0b0db45e64dc
Adeel Kazmi [Thu, 27 Aug 2020 20:11:29 +0000 (20:11 +0000)]
Merge "Removing unused variables" into devel/master
David Steele [Thu, 27 Aug 2020 15:25:02 +0000 (16:25 +0100)]
Removing unused variables
Change-Id: I0833ba9c27677969adfd8dcc4aa617c02f75004c
György Straub [Thu, 27 Aug 2020 08:28:33 +0000 (09:28 +0100)]
Renamed KeyEvent enum values to comply with coding standards.
Change-Id: I1152c0c48795f8972f2b4ee2fc50b0c04140a322
Signed-off-by: György Straub <g.straub@partner.samsung.com>
Adeel Kazmi [Wed, 26 Aug 2020 19:47:36 +0000 (20:47 +0100)]
Changes after RotationGesture made public
Change-Id: I91b6d0e8eed7e530fad33d8e99ca77ade9e09a78
Adeel Kazmi [Tue, 25 Aug 2020 19:18:32 +0000 (20:18 +0100)]
(Animated Shapes) Restore yellow colour for top shape
Change-Id: Ifefe4a02203878d1011ee5a5948615e68ae15ba6
Adeel Kazmi [Tue, 25 Aug 2020 18:25:26 +0000 (18:25 +0000)]
Merge "Updates following rename of PropertyBuffer" into devel/master
Adeel Kazmi [Tue, 25 Aug 2020 17:24:48 +0000 (17:24 +0000)]
Merge "KeyEvent class pimpling" into devel/master
Adeel Kazmi [Tue, 25 Aug 2020 15:59:12 +0000 (15:59 +0000)]
Merge "Changed Animation API enums to uppercase." into devel/master