Merge branch 'devel/master' into tizen
[platform/core/uifw/dali-demo.git] / resources / scripts / shader-effect-ripple.json
2021-02-01 Daekwang RyuMerge branch 'devel/master' into tizen accepted/tizen/unified/20210202.143749 submit/tizen/20210201.081731
2021-01-28 Adeel Kazmi(Builder Example) Use the shader constant provided... 83/252483/1
2020-08-10 Wonsik JungMerge branch 'devel/master' into tizen accepted/tizen/unified/20200811.050417 submit/tizen/20200810.064352
2020-08-04 Adeel KazmiMerge "Rename OnStage signals and related internal...
2020-08-04 Richard HuangRename OnStage signals and related internal changes 17/240217/2
2017-02-27 suhyung EomMerge branch 'devel/master' into tizen 46/116546/1 accepted/tizen/common/20170306.164909 accepted/tizen/ivi/20170306.103423 accepted/tizen/mobile/20170306.103133 accepted/tizen/tv/20170306.103237 accepted/tizen/unified/20170309.034501 accepted/tizen/wearable/20170306.103327 submit/tizen/20170227.051047 submit/tizen/20170306.033709 submit/tizen_unified/20170308.100410
2017-02-10 Victor Cebollada[dali_1.2.26] Merge branch 'devel/master' 73/114173/1
2017-02-06 Adeel KazmiSplit shaders in JSONs over multiple lines 72/112172/3
2016-05-04 dongsug.songMerge branch 'devel/master' into tizen 86/68386/1 accepted/tizen/common/20160509.135208 accepted/tizen/ivi/20160510.002649 accepted/tizen/mobile/20160510.002552 accepted/tizen/tv/20160510.002617 accepted/tizen/wearable/20160510.002523 submit/tizen/20160509.092357
2016-04-29 Agnelo Vaz[dali_1.1.32] Merge branch 'devel/master' 31/67931/1
2016-04-28 Adeel KazmiMerge "Updated demos following StyleManager move to...
2016-04-27 Xiangyin MaStop using ImageActor in Json files 08/66408/4
2016-02-26 dongsug.songMerge branch 'devel/master' into tizen 42/60142/2 accepted/tizen/common/20160302.194056 accepted/tizen/ivi/20160302.073538 accepted/tizen/mobile/20160302.073330 accepted/tizen/tv/20160302.073410 accepted/tizen/wearable/20160302.073514 submit/tizen/20160226.050811 submit/tizen/20160226.083322 submit/tizen/20160302.020723 submit/tizen_common/20160302.050715 submit/tizen_ivi/20160302.061840 submit/tizen_mobile/20160302.050207 submit/tizen_mobile/20160302.061559 submit/tizen_tv/20160302.063027 submit/tizen_wearable/20160302.063323
2016-02-23 dongsug.songRevert "[3.0] Ensure the use of ShaderEffect in ImageAc... 40/60140/1
2016-02-19 Agnelo Vaz[dali_1.1.22] Merge branch 'devel/master' 23/59923/1
2016-02-18 Xiangyin Ma[3.0] Ensure the use of ShaderEffect in ImageActor... 44/59744/2 accepted/tizen/ivi/20160219.012722 accepted/tizen/mobile/20160218.111046 accepted/tizen/tv/20160218.111108 accepted/tizen/wearable/20160218.111132 submit/tizen/20160218.103925 submit/tizen_common/20160218.142243
2016-02-15 Xiangyin MaEnsure the use of ShaderEffect in ImageActor is backwar... 42/59242/2
2016-01-22 Richard Huang[dali_1.1.18] Merge branch 'devel/master' 81/57781/1
2016-01-21 David SteeleChanged DALI_*_DIR to DEMO_*_DIR 46/57046/7
2016-01-15 taeyoonMerge branch 'devel/master( 1.1.16 )' into tizen 81/57081/1 accepted/tizen/common/20160208.162649 accepted/tizen/ivi/20160218.023821 accepted/tizen/mobile/20160122.080639 accepted/tizen/tv/20160122.082355 accepted/tizen/wearable/20160122.082418 submit/tizen_common/20160122.071605 submit/tizen_ivi/20160217.000000 submit/tizen_ivi/20160217.000003 submit/tizen_mobile/20160122.070055 submit/tizen_tv/20160122.071800 submit/tizen_wearable/20160122.071938
2015-12-23 Adeel Kazmi[dali_1.1.15] Merge branch 'devel/master' 30/55430/1
2015-12-11 Adeel KazmiMerge "Update the ShaderEffect script to resize the...
2015-12-11 David Steele[dali_1.1.14] Merge branch 'devel/master' 39/54139/1
2015-12-11 Xiangyin MaUpdate the ShaderEffect script to resize the geometry 45/53845/3
2015-12-07 Tom RobinsonImplement image fitting modes 59/52859/4
2015-11-06 Tom Robinson[dali_1.1.9] Merge branch 'devel/master' 13/51313/1
2015-11-03 Adeel KazmiChanges following the property & singal name changes 36/50836/4
2015-05-19 Francisco SantosMerge remote-tracking branch 'origin/tizen' into devel... 04/39604/1
2015-05-07 Lee MorganAdded JSON shader effect 30/39030/1
2015-05-01 Adeel KazmiMerge "Added JSON shader effect"
2015-05-01 Lee MorganAdded JSON shader effect 51/38951/1