dongsug.song [Wed, 14 Jun 2023 01:26:26 +0000 (10:26 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: Id0f8a687fb4463e7b8b60677c09e146fde12963a
Adeel Kazmi [Fri, 9 Jun 2023 16:14:52 +0000 (16:14 +0000)]
Merge "Remove Particle System from dali-examples, add to XML file" into devel/master
Adeel Kazmi [Fri, 9 Jun 2023 15:03:02 +0000 (16:03 +0100)]
Updated the instructions to create a new example
Change-Id: Iba04cb075409468a08639eabd5945901647470af
Adeel Kazmi [Fri, 9 Jun 2023 13:41:03 +0000 (14:41 +0100)]
Remove Particle System from dali-examples, add to XML file
Change-Id: Ia67ce219fd40aed4133f8dfc6b33efce58383b9d
David Steele [Fri, 9 Jun 2023 09:50:48 +0000 (10:50 +0100)]
[dali_2.2.30] Merge branch 'devel/master'
Change-Id: I3ac922dfc72cf9055f27a63595b801004047c165
David Steele [Fri, 9 Jun 2023 09:50:20 +0000 (10:50 +0100)]
DALi Version 2.2.30
Change-Id: I9576f0d5cad3898a24fbb568b8275d4d066051b9
Taehyub Kim [Thu, 8 Jun 2023 04:30:09 +0000 (13:30 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: If889e854ed6f908cabf89f78713a6ac4d0a3032a
Adeel Kazmi [Wed, 7 Jun 2023 17:25:52 +0000 (18:25 +0100)]
(Particles System) Added a README & removed buttons, cleaned up UI
Change-Id: I0ccedc569e841dbb9b18fa1f583ec3998a6a59a0
Adam Bialogonski [Mon, 5 Jun 2023 15:14:45 +0000 (16:14 +0100)]
Particle System demo fixes
- fixed analysis hub errors
- fixed partial update issue
Change-Id: I860b0c4641c7d0ae9ff17a73f20bf400515b71c6
Adam Bialogonski [Fri, 2 Jun 2023 17:09:24 +0000 (18:09 +0100)]
Particle System Demo
Change-Id: Ib5cc186c001952c8f2f74c2371575a08d94bb607
David Steele [Fri, 2 Jun 2023 11:01:25 +0000 (11:01 +0000)]
Merge "Use dali-scene3d.h instead of partial includes" into devel/master
Richard Huang [Fri, 2 Jun 2023 10:37:58 +0000 (11:37 +0100)]
[dali_2.2.29] Merge branch 'devel/master'
Change-Id: I6e46b4506d711e4fba200359c4ced54a00faf0a6
Richard Huang [Fri, 2 Jun 2023 10:37:11 +0000 (11:37 +0100)]
DALi Version 2.2.29
Change-Id: Id6a07baca3aa2c536f9d6b7c5d29895a88ff34c5
Eunki, Hong [Thu, 1 Jun 2023 01:12:04 +0000 (10:12 +0900)]
Use dali-scene3d.h instead of partial includes
Build test + app useage test for scene3d app
Change-Id: I565cc2b56403289ad53980baa497a6d7c5f4412c
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>
Jiyun Yang [Wed, 31 May 2023 04:47:50 +0000 (13:47 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: I93090c5f31039057d075bf6b3b9ce236b5ec4a00
Adeel Kazmi [Fri, 26 May 2023 11:40:45 +0000 (12:40 +0100)]
[dali_2.2.28] Merge branch 'devel/master'
Change-Id: I5d0e7db1e84497db2f177eb6884e1a1263ed0e71
Adeel Kazmi [Fri, 26 May 2023 11:39:58 +0000 (12:39 +0100)]
DALi Version 2.2.28
Change-Id: I6725476d87f008671d8cc99b6f577ac6d7cb953a
Seoyeon Kim [Mon, 22 May 2023 05:12:11 +0000 (14:12 +0900)]
Merge branch 'devel/master' into tizen
Adeel Kazmi [Fri, 19 May 2023 15:05:24 +0000 (16:05 +0100)]
(Sparkles) Fixed issue with partial rendering not animating
- Relied on some broken behaviour in core which was recently fixed
Change-Id: I2c999deb13a61b25c32f26de7075e024d9e47784
David Steele [Fri, 19 May 2023 14:27:10 +0000 (15:27 +0100)]
[dali_2.2.27] Merge branch 'devel/master'
Change-Id: I78e89c6d4b88214823880800ed38ec195e430d7d
David Steele [Fri, 19 May 2023 14:26:43 +0000 (15:26 +0100)]
DALi Version 2.2.27
Change-Id: I16a76f05247caaff0f12e601acb6e119532cae3d
Richard Huang [Fri, 12 May 2023 09:48:56 +0000 (10:48 +0100)]
[dali_2.2.26] Merge branch 'devel/master'
Change-Id: I0cac467d55f833b0fc4100178e854af9d050407a
Richard Huang [Fri, 12 May 2023 09:47:58 +0000 (10:47 +0100)]
DALi Version 2.2.26
Change-Id: I97382c58bdaa524ba1da2c7ae74fafd971e7e104
Adam Bialogonski [Fri, 5 May 2023 10:21:38 +0000 (11:21 +0100)]
[dali_2.2.25] Merge branch 'devel/master'
Change-Id: Id762a0479e90264d7d36e544f6b0f114c2057ace
Adam Bialogonski [Fri, 5 May 2023 10:20:50 +0000 (11:20 +0100)]
DALi Version 2.2.25
Change-Id: I96ce24dec088eb2524b6cfd2310d707988a8ecbe
Daekwang Ryu [Tue, 2 May 2023 05:49:52 +0000 (14:49 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: I880e4e4a8c68371d93c928b3c0d7a75bcc7623de
Richard Huang [Fri, 28 Apr 2023 10:09:19 +0000 (11:09 +0100)]
[dali_2.2.24] Merge branch 'devel/master'
Change-Id: I6765fac97be937cf7984ffcc319993d637158114
Richard Huang [Fri, 28 Apr 2023 10:08:20 +0000 (11:08 +0100)]
DALi Version 2.2.24
Change-Id: I7cc0fefdd269444dc31d9258946f8a9e0c16ded7
joogab.yun [Wed, 26 Apr 2023 05:39:21 +0000 (14:39 +0900)]
Merge branch 'devel/master' into tizen
Adeel Kazmi [Thu, 20 Apr 2023 13:09:13 +0000 (14:09 +0100)]
[dali_2.2.23] Merge branch 'devel/master'
Change-Id: I9a201038b5cf4ae98cfdd04a1c8c9dab38c359f7
Adeel Kazmi [Thu, 20 Apr 2023 13:08:25 +0000 (14:08 +0100)]
DALi Version 2.2.23
Change-Id: Iedb5571bff6a4b07f180ebd999638c6ed715fb49
Chihun Jeong [Wed, 19 Apr 2023 05:52:10 +0000 (14:52 +0900)]
Merge branch 'devel/master' into tizen
seungho baek [Tue, 18 Apr 2023 11:46:35 +0000 (20:46 +0900)]
Fix skinning issue
Change-Id: I2de5addc54cb948e653c63106e34f095e0b43376
Signed-off-by: seungho baek <sbsh.baek@samsung.com>
Adam Bialogonski [Fri, 14 Apr 2023 09:26:28 +0000 (10:26 +0100)]
[dali_2.2.22] Merge branch 'devel/master'
Change-Id: I5fc158dac46208df6adf11af2661119829fa4100
Adam Bialogonski [Fri, 14 Apr 2023 09:25:39 +0000 (10:25 +0100)]
DALi Version 2.2.22
Change-Id: I942afc8244acaa7cb2ab2dfc1a5716cceef0d0c9
jykeon [Wed, 12 Apr 2023 04:04:56 +0000 (13:04 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: Ie48597d1268f0673f255a525502049355659c16b
David Steele [Thu, 6 Apr 2023 13:49:01 +0000 (14:49 +0100)]
[dali_2.2.21] Merge branch 'devel/master'
Change-Id: I74a4f78bc39735ab9280f22048d39dfab09a6e10
David Steele [Thu, 6 Apr 2023 13:48:02 +0000 (14:48 +0100)]
DALi Version 2.2.21
Change-Id: I5996af979433c040146d574496edecda0c9d8b93
Hosang Kim [Wed, 5 Apr 2023 06:36:04 +0000 (15:36 +0900)]
Merge branch 'devel/master' into tizen
Adam Bialogonski [Fri, 31 Mar 2023 09:20:52 +0000 (10:20 +0100)]
[dali_2.2.20] Merge branch 'devel/master'
Change-Id: Id554f3f982f79cea77298569d24c13d062a61944
Adam Bialogonski [Fri, 31 Mar 2023 09:20:04 +0000 (10:20 +0100)]
DALi Version 2.2.20
Change-Id: I90f506907360e7084af1063f74a31371eccc54a8
Woochan Lee [Tue, 28 Mar 2023 05:39:19 +0000 (14:39 +0900)]
Merge branch 'devel/master' into tizen
Adeel Kazmi [Fri, 24 Mar 2023 10:55:41 +0000 (10:55 +0000)]
[dali_2.2.19] Merge branch 'devel/master'
Change-Id: Ic14c09f49704e3b8c4f019ea8b5bc10ee3347b4a
Adeel Kazmi [Fri, 24 Mar 2023 10:54:52 +0000 (10:54 +0000)]
DALi Version 2.2.19
Change-Id: Ied45c5244a27f0abe64485db4b4612f9465330ce
Wonsik Jung [Mon, 20 Mar 2023 07:21:43 +0000 (16:21 +0900)]
Merge branch 'devel/master' into tizen
David Steele [Fri, 17 Mar 2023 12:44:09 +0000 (12:44 +0000)]
[dali_2.2.18] Merge branch 'devel/master'
Change-Id: I4a73d877a443a0c03217a8af69683c88d17ff8b5
David Steele [Fri, 17 Mar 2023 12:43:41 +0000 (12:43 +0000)]
DALi Version 2.2.18
Change-Id: I7323efdc0364834eb2882a7494f91034993baeaf
sunghyun kim [Mon, 13 Mar 2023 07:25:14 +0000 (16:25 +0900)]
Merge branch 'devel/master' into tizen
Adeel Kazmi [Fri, 10 Mar 2023 10:30:42 +0000 (10:30 +0000)]
[dali_2.2.17] Merge branch 'devel/master'
Change-Id: I5a24e35b5d0dc25c0d75128248d5725ae1d48276
Adeel Kazmi [Fri, 10 Mar 2023 10:29:54 +0000 (10:29 +0000)]
DALi Version 2.2.17
Change-Id: I223ec3f8f5d7573ab77177aed9bf2d8711c228b3
seungho baek [Mon, 6 Mar 2023 09:58:54 +0000 (18:58 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: Ic70cbea2e3205f2556674cea9072b5467a09722f
seungho baek [Mon, 6 Mar 2023 04:27:04 +0000 (13:27 +0900)]
Add glb in scene3d-model-example
Change-Id: I68225fe93327a3d15767b4b58122c2c2e1b9efe1
Signed-off-by: seungho baek <sbsh.baek@samsung.com>
seungho baek [Thu, 23 Feb 2023 01:51:40 +0000 (10:51 +0900)]
Change to use ModelLoader instead of Gltf2Loader and DliLoader
Change-Id: Ib9a64eef388799d4534d86f95b20735bc03a7fdd
Adam Bialogonski [Fri, 3 Mar 2023 10:26:52 +0000 (10:26 +0000)]
[dali_2.2.16] Merge branch 'devel/master'
Change-Id: I86e5e43feab3a9f4d3153c2d0aafe90689947d28
Adam Bialogonski [Fri, 3 Mar 2023 10:26:03 +0000 (10:26 +0000)]
DALi Version 2.2.16
Change-Id: I2b7bf2611d299e3649ef1aaf6ac702c1e5b74531
David Steele [Fri, 24 Feb 2023 12:53:52 +0000 (12:53 +0000)]
Merge "Inherit result demo" into devel/master
Richard Huang [Fri, 24 Feb 2023 12:25:19 +0000 (12:25 +0000)]
[dali_2.2.15] Merge branch 'devel/master'
Change-Id: I8b9c25d5cd6be321dfd4165a3b06ae9c4bcadcaa
Richard Huang [Fri, 24 Feb 2023 12:24:31 +0000 (12:24 +0000)]
DALi Version 2.2.15
Change-Id: I73d9dc8c377172c2dfac3aeecebdcc32a481f9d1
Eunki Hong [Sat, 4 Feb 2023 17:33:22 +0000 (02:33 +0900)]
Inherit result demo
Test for Inherit properties behavior.
Change-Id: Idb78040e4a049720d66524bbf1b4031b95a94959
Signed-off-by: Eunki Hong <eunkiki.hong@samsung.com>
Eunki, Hong [Thu, 23 Feb 2023 14:18:46 +0000 (23:18 +0900)]
Add BUILD_EXAMPLE_NAME option explain for README.md
Change-Id: I9cc144ca6ee0c83056c311a418424b1ddd3da65a
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>
Eunki, Hong [Tue, 21 Feb 2023 09:42:04 +0000 (18:42 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: I7087d488ca840eeeed3107fcb87153467bd4cec0
Eunki, Hong [Wed, 22 Jun 2022 08:40:37 +0000 (17:40 +0900)]
Build specific sample only
How to use :
(Tizen)
gbs build -A i586 --include-all --define "build_example_name color-visual"
(Ubuntu)
cmake -DCMAKE_INSTALL_PREFIX=$DESKTOP_PREFIX -DBUILD_EXAMPLE_NAME=color-visual .
Change-Id: I919af4adadcee6475672a2cd4bf92bebdc9b71c8
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>
David Steele [Fri, 17 Feb 2023 13:52:17 +0000 (13:52 +0000)]
[dali_2.2.14] Merge branch 'devel/master'
Change-Id: Id10f2109510d6ecc7cffad3ec74e5c4c74f2064f
David Steele [Fri, 17 Feb 2023 13:51:50 +0000 (13:51 +0000)]
DALi Version 2.2.14
Change-Id: I491432d753f0ccd07b7f2d0a8d573a1431fa5e01
Heeyong Song [Mon, 13 Feb 2023 06:54:12 +0000 (15:54 +0900)]
Merge branch 'devel/master' into tizen
Adeel Kazmi [Fri, 10 Feb 2023 14:16:45 +0000 (14:16 +0000)]
[dali_2.2.13] Merge branch 'devel/master'
Change-Id: I481690a2fd96dc1676ce01890f6d6d334e6d4868
Adeel Kazmi [Fri, 10 Feb 2023 14:15:56 +0000 (14:15 +0000)]
DALi Version 2.2.13
Change-Id: I66caa5725da914c988f81563eadd536b4cf67fc6
EverLEEst(SangHyeon Lee) [Wed, 8 Feb 2023 07:56:30 +0000 (16:56 +0900)]
Merge branch 'devel/master' into tizen
Adam Bialogonski [Fri, 3 Feb 2023 12:42:35 +0000 (12:42 +0000)]
[dali_2.2.12] Merge branch 'devel/master'
Change-Id: I62ac8ae946924afa8b75769c88fade879b5c003d
Adam Bialogonski [Fri, 3 Feb 2023 12:41:45 +0000 (12:41 +0000)]
DALi Version 2.2.12
Change-Id: I4f57e0b7d4b364287fafb1176e2e77e928c7008d
Jaehyun Cho [Wed, 1 Feb 2023 05:14:08 +0000 (14:14 +0900)]
Merge branch 'devel/master' into tizen
Eunki Hong [Mon, 30 Jan 2023 02:26:53 +0000 (02:26 +0000)]
Merge "Cleanup .gitignore file" into devel/master
Richard Huang [Fri, 27 Jan 2023 12:20:39 +0000 (12:20 +0000)]
[dali_2.2.11] Merge branch 'devel/master'
Change-Id: I3fadb7ad5dc4209a94ce4cb1b5369158835f4384
Richard Huang [Fri, 27 Jan 2023 12:19:34 +0000 (12:19 +0000)]
DALi Version 2.2.11
Change-Id: If2c87f971cc876a8c1f4be35ec2186e15efb2b0d
Eunki Hong [Wed, 25 Jan 2023 15:51:56 +0000 (00:51 +0900)]
Cleanup .gitignore file
Collect, merge and clean up .gitignore file for all dali repos
Change-Id: I1aabd07e5295bc40f0579ab626ddc19fb53f35d0
Signed-off-by: Eunki Hong <eunkiki.hong@samsung.com>
Taehyub Kim [Wed, 25 Jan 2023 05:53:42 +0000 (14:53 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: I287bc059ab30f4d07c2adef7c9fc78b3416bfc54
seungho baek [Tue, 3 Jan 2023 08:15:25 +0000 (17:15 +0900)]
Modify to use LoadEnvironmentMap to load skybox env map
Change-Id: Icbcf0ccdb046064f883b1e9514c285f491b68f0f
Signed-off-by: seungho baek <sbsh.baek@samsung.com>
Eunki Hong [Mon, 23 Jan 2023 14:54:00 +0000 (23:54 +0900)]
Fix implement typo error for PerfViewCreation
Change-Id: I817f1456a01b89f4991449a9427354c3ccabd84e
Signed-off-by: Eunki Hong <eunkiki.hong@samsung.com>
Adeel Kazmi [Fri, 20 Jan 2023 21:05:04 +0000 (21:05 +0000)]
Merge "Adding back/touch to quit in direct-rendering demo" into devel/master
David Steele [Fri, 20 Jan 2023 14:25:25 +0000 (14:25 +0000)]
Adding back/touch to quit in direct-rendering demo
Change-Id: I8432ac95eb5ea56bee110c13137ee4da2f90827f
David Steele [Fri, 20 Jan 2023 13:10:39 +0000 (13:10 +0000)]
[dali_2.2.10] Merge branch 'devel/master'
Change-Id: I0110d60a16460b0b0e6dbb02b29f3cbcaabe52aa
David Steele [Fri, 20 Jan 2023 13:10:11 +0000 (13:10 +0000)]
DALi Version 2.2.10
Change-Id: I15b6e315e36898f3397e8e19be42b6631013aa44
David Steele [Tue, 17 Jan 2023 12:00:36 +0000 (12:00 +0000)]
Merge "Remove jpg warning log" into devel/master
dongsug.song [Tue, 17 Jan 2023 07:14:32 +0000 (16:14 +0900)]
Merge remote-tracking branch 'origin/devel/master' into tizen
Change-Id: Icda144e87d1272e161a27126bec65c3feb5f2fbc
Eunki, Hong [Mon, 16 Jan 2023 07:31:18 +0000 (16:31 +0900)]
Remove jpg warning log
Corrupt JPEG data: 24 extraneous bytes before marker 0x??
Change-Id: If801b7466f9d9a0c16c47c59fefc0ccfa4af7711
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>
Eunki, Hong [Mon, 16 Jan 2023 07:18:17 +0000 (16:18 +0900)]
Remove png warning log
libpng warning: iCCP: known incorrent sRGB profile
Change-Id: Iac234e01b47bcee767b54f5cca8df002da668ea3
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>
David Steele [Fri, 13 Jan 2023 14:32:25 +0000 (14:32 +0000)]
Merge "Add direct-rendering to the XML file so that it can launch on target" into devel/master
Adeel Kazmi [Fri, 13 Jan 2023 09:57:07 +0000 (09:57 +0000)]
[dali_2.2.9] Merge branch 'devel/master'
Change-Id: I246ead63091cb7a9ad421a6e75a1742611f4193d
Adeel Kazmi [Fri, 13 Jan 2023 09:56:20 +0000 (09:56 +0000)]
DALi Version 2.2.9
Change-Id: I36c41a404d582dad0370e66483451dded6130673
Adeel Kazmi [Fri, 13 Jan 2023 09:37:07 +0000 (09:37 +0000)]
Add direct-rendering to the XML file so that it can launch on target
Change-Id: I59c8316e5b5849a91977992bb6b663876baee340
Seoyeon Kim [Tue, 10 Jan 2023 06:03:26 +0000 (15:03 +0900)]
Merge branch 'devel/master' into tizen
seungho baek [Tue, 3 Jan 2023 07:58:47 +0000 (16:58 +0900)]
Fix to use async resource load in scene3d-model example
Change-Id: Ifddd21530c822731b18de25db6cd19aae4f10819
Signed-off-by: seungho baek <sbsh.baek@samsung.com>
Adam Bialogonski [Fri, 6 Jan 2023 10:51:01 +0000 (10:51 +0000)]
[dali_2.2.8] Merge branch 'devel/master'
Change-Id: Icf6ee3b80c13ede9b0d4f0b32d571bc7159d4da4
Adam Bialogonski [Fri, 6 Jan 2023 10:50:11 +0000 (10:50 +0000)]
DALi Version 2.2.8
Change-Id: I322f47bff1636ee1e3f752a422209a577f2463eb
seungho baek [Tue, 3 Jan 2023 06:40:01 +0000 (15:40 +0900)]
Fix scene3d examples
Change-Id: I6e87d8f852b2d5f51a8a2434fc63d6122e035d31
Signed-off-by: seungho baek <sbsh.baek@samsung.com>
jykeon [Tue, 3 Jan 2023 02:52:46 +0000 (11:52 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: Id73b63e5a9a0272c3093de25929f2b4067ca3b54
seungho baek [Tue, 27 Dec 2022 07:09:23 +0000 (16:09 +0900)]
Use Layer_3D in scene3d-model example
Change-Id: I4690d2c4bcfec0c6f8f3a734e4a538014d62cbd3
Signed-off-by: seungho baek <sbsh.baek@samsung.com>
dongsug.song [Tue, 27 Dec 2022 04:36:04 +0000 (13:36 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: I91f91cd90cb76fc1a0b2bf4a01da5cdda4f15b72
Adeel Kazmi [Fri, 23 Dec 2022 11:35:50 +0000 (11:35 +0000)]
[dali_2.2.7] Merge branch 'devel/master'
Change-Id: I3072d7d94ebadbc1118b1a06e593be738b007e38
Adeel Kazmi [Fri, 23 Dec 2022 11:35:02 +0000 (11:35 +0000)]
DALi Version 2.2.7
Change-Id: I110bf62c7679b9c73d928f87148b03833922e0b9