Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
180 commits
Select commit Hold shift + click to select a range
f8a02de
time line function add js, index.html
dddfff22 Sep 21, 2020
d4da996
Merge pull request #1 from innoinho/feature-timeLine
dddfff22 Sep 21, 2020
7374e9a
ADD setValue methods
eedaegil Sep 21, 2020
3eec0b7
[MOD] git ignore file
dlsgk147 Sep 22, 2020
f7404e7
[ADD] rlottie preview in vue/cli
dlsgk147 Sep 22, 2020
7385435
[Test] change submodel
arduinho Sep 24, 2020
cbfaf15
[Feat(F)] adapt_vue_CDN & background change
arduinho Sep 24, 2020
454e84c
[Test] can i change the test.sh file
arduinho Sep 24, 2020
4b6ec38
[Fix] frame-view added
arduinho Sep 24, 2020
e2196eb
ADD webviewer-init
JudyH0pps Sep 28, 2020
a4c4e02
Merge branch 'master' into custom_property
eedaegil Sep 28, 2020
5ccc763
Merge pull request #2 from innoinho/custom_property
eedaegil Sep 28, 2020
34150fa
[Feat] Get Layer List
dlsgk147 Sep 28, 2020
f94d2ab
Lottie JSON upload drag-and-drop
JudyH0pps Sep 28, 2020
440b142
Merge pull request #3 from innoinho/feature/draganddrop
JudyH0pps Sep 28, 2020
c468879
[Feat] Get Layer List, [Fix] Merge Conflict
dlsgk147 Sep 28, 2020
e26c7e7
Merge branch 'master' of https://github.com/innoinho/rlottie.github.io
dlsgk147 Sep 28, 2020
b5e9f32
[Feat(F)] reverse play button
arduinho Sep 28, 2020
f1c5cdb
ADD [Feat] get keypath tree
eedaegil Sep 28, 2020
e8893b1
Merge pull request #5 from innoinho/lee
eedaegil Sep 28, 2020
173b6db
Merge branch 'master' into Feat-Front-ReversePlay
arduinho Sep 28, 2020
932dc50
[Feat] get lottie file by url
Sep 28, 2020
13bb3b0
[Fix] add body tags
Sep 28, 2020
0335801
[Refactor] merge conflict resolve
Sep 28, 2020
e8d4672
[Refacor] modify body tag position
Sep 28, 2020
9f0fdfb
[Refactor] delete conflict message
Sep 28, 2020
ec69b26
Merge pull request #6 from innoinho/feature/getlottieByUrl
dddfff22 Sep 28, 2020
e7b58c8
Merge branch 'master' into Feat-Front-ReversePlay
arduinho Sep 28, 2020
d92dff9
Merge branch 'master' into Feat-Front-ReversePlay
arduinho Sep 28, 2020
f48008b
Merge pull request #4 from innoinho/Feat-Front-ReversePlay
arduinho Sep 28, 2020
c8f23d3
[MOD] Get Layer List: Fixed access -> Recursive access
dlsgk147 Sep 28, 2020
df139af
[MOD] Get layer list: Fixed json access -> Recursive json access
dlsgk147 Sep 28, 2020
654f381
[Fix] add missing bracket tag
Sep 28, 2020
8c9b8ab
Merge pull request #7 from innoinho/Hotfix/addBracket
dddfff22 Sep 28, 2020
d3ff942
[Fix(f)] fix cursor bug
arduinho Sep 28, 2020
e1ccfc5
[Feat(F)] spacebar controller
arduinho Sep 28, 2020
89ade35
[Feat(F)] spacebar controller
arduinho Sep 28, 2020
3951341
Merge branch 'Feat-Front-SpaceBarController' of https://github.com/in…
arduinho Sep 28, 2020
e286371
Merge pull request #8 from innoinho/Feat-Front-SpaceBarController
arduinho Sep 28, 2020
7e1ba05
[Fix(F)] FrameList bug fix
arduinho Sep 29, 2020
d69e51d
Merge pull request #9 from innoinho/Fix-Front-FrameListBugFix
arduinho Sep 29, 2020
ff245b6
[Feat(F)] fix framelist when update JSON
arduinho Sep 29, 2020
d45d97e
Merge pull request #10 from innoinho/Feat-Front-FrameList-with-Rlotte…
arduinho Sep 29, 2020
52cc372
[Fix(F)] delete vue.js CDN
arduinho Sep 29, 2020
c415a8d
Merge pull request #11 from innoinho/Fix-Front-Delete-vue.js
arduinho Sep 29, 2020
83cacc5
[Style(F)] transfer to semantic tag
arduinho Sep 29, 2020
c9f0d2f
Merge pull request #12 from innoinho/Fix-Front-layerList-fix
arduinho Sep 29, 2020
67c3efc
[fix(f)] module-name-error
arduinho Sep 30, 2020
9864efd
Merge pull request #13 from innoinho/fix-front-modulenameError
arduinho Sep 30, 2020
ae54488
[Fix(F)] inho script name error
arduinho Sep 30, 2020
4d02c66
Merge pull request #14 from innoinho/Fix-Front-scriptnameError
arduinho Sep 30, 2020
14fa556
[Fix(F)] chagne sidebar position
arduinho Sep 30, 2020
11144dd
Merge pull request #15 from innoinho/Fix-Front-changeAssidePosition
arduinho Sep 30, 2020
59b2ba4
[Fix(F)] progressbar bug fix
arduinho Sep 30, 2020
819ff8a
Merge pull request #16 from innoinho/Fix-Front-progressbar-Error
arduinho Sep 30, 2020
684f56f
[Feat(F)] control with frameList
arduinho Sep 30, 2020
1c474d5
Merge pull request #17 from innoinho/Feat-Front-controlwithFrame
arduinho Sep 30, 2020
0c5275d
[Feat(F)] RGB color change Error Fix
arduinho Sep 30, 2020
cbe906e
Merge pull request #18 from innoinho/Feat-Front-RGBcolorChangeFix
arduinho Sep 30, 2020
17e0f44
[Feat] Layer List + Customize
dlsgk147 Oct 1, 2020
ef919d5
[FIX] Merge Conflict
dlsgk147 Oct 1, 2020
0710f8f
ADD progressbar & backgroundbutton
JudyH0pps Oct 1, 2020
ab7ab42
Merge pull request #19 from innoinho/feature/player
JudyH0pps Oct 1, 2020
5b09c52
[Feat(F)] JSON file Exception Handler
arduinho Oct 1, 2020
e8dc329
Merge pull request #20 from innoinho/Feat-Front-ExceptionHandle
arduinho Oct 1, 2020
81f3c7d
ADD colorpicker
JudyH0pps Oct 1, 2020
02760ad
Merge pull request #21 from innoinho/feature/player
JudyH0pps Oct 1, 2020
8da55f2
[Feat] Add function to call cpp API
eedaegil Oct 1, 2020
4ab2320
[Feat] Add function to load cpp API list from JSON
eedaegil Oct 1, 2020
74705a8
[Feat] Add function to create API controller
eedaegil Oct 1, 2020
81e5c4a
Merge pull request #22 from innoinho/lee
eedaegil Oct 1, 2020
416af73
[Feat] Add api creator for javascript side
eedaegil Oct 2, 2020
d0eeb7a
Merge pull request #23 from innoinho/lee
eedaegil Oct 2, 2020
b9bacb9
[Fix(F)] exception controller deleted
arduinho Oct 2, 2020
8f6808f
Merge pull request #24 from innoinho/Fix-F-exceptionControllDeleted
arduinho Oct 2, 2020
0588194
[Fix(F)] spaecebar controller deleted
arduinho Oct 2, 2020
b722201
Merge pull request #25 from innoinho/Fix-Front-SpaceControllerDeleted
arduinho Oct 2, 2020
bf2397a
[Fix] modify getAllLayers Method -case: list[i].nm == null continue
Oct 2, 2020
20af512
Merge pull request #26 from innoinho/Fix-js-getAllLayers-appendChilds
dddfff22 Oct 2, 2020
430640b
[Feat(F)] Background Image Controller
arduinho Oct 2, 2020
2ef4735
Merge pull request #27 from innoinho/Feat-Front-BackGroundImageContro…
arduinho Oct 2, 2020
36c58a9
[Fix(F)] cursor pointer css file updated
arduinho Oct 2, 2020
533d99d
Merge pull request #28 from innoinho/Fix-Front-cusrorPointerCss
arduinho Oct 2, 2020
d16b607
API
JudyH0pps Oct 2, 2020
06153b0
Merge branch 'master' into feature/css
JudyH0pps Oct 2, 2020
cffdbb6
Merge pull request #29 from innoinho/feature/css
JudyH0pps Oct 2, 2020
d508ec0
[Feat(F)] background controller
arduinho Oct 2, 2020
f5ff980
Merge pull request #30 from innoinho/Feat-Front-BackgroundControl
arduinho Oct 2, 2020
7390da1
[Fix] Add missing bracket
eedaegil Oct 2, 2020
6e9f7d2
[Fix] Restore deleted template tag
eedaegil Oct 2, 2020
1c6d99c
[Feat] Add template for api controller
eedaegil Oct 2, 2020
d68ee04
[Feat] Add style for api controller
eedaegil Oct 2, 2020
2bdd31a
[Fix(F)] CSS Error fixed
arduinho Oct 2, 2020
5486973
Merge pull request #31 from innoinho/Fix-Front-CssErrorFixed
arduinho Oct 2, 2020
e0b9cf4
[Fix] Delete unused code
eedaegil Oct 2, 2020
8a54a9b
Merge pull request #32 from innoinho/lee
eedaegil Oct 2, 2020
cf20514
[Feat] Add function to create API controller
eedaegil Oct 2, 2020
4b41605
[Fix(F)] bracket error patch
arduinho Oct 2, 2020
67fe139
Merge pull request #33 from innoinho/lee
eedaegil Oct 2, 2020
f1d6199
[Fix] Replace axios with XMLHttpRequest
eedaegil Oct 2, 2020
5ad41bd
Merge pull request #34 from innoinho/lee
eedaegil Oct 2, 2020
0496c7f
[Fix] Split DOM manipulation code from module-rlottie.js into api_dom.js
eedaegil Oct 2, 2020
9ee1116
Merge pull request #35 from innoinho/lee
eedaegil Oct 2, 2020
ef00e41
[Fix] Delete unused code
eedaegil Oct 2, 2020
3f4da6d
Merge pull request #36 from innoinho/lee
eedaegil Oct 2, 2020
832b172
[Fix] Delete unused code
eedaegil Oct 2, 2020
a684201
[Feat] Add function to download changed api list
eedaegil Oct 2, 2020
ed8ebb3
Merge pull request #37 from innoinho/lee
eedaegil Oct 2, 2020
45b88d7
[Fix(F)] bug Fixed
arduinho Oct 2, 2020
ff17ba2
[FIX] Layer List Click and Copy
dlsgk147 Oct 2, 2020
3632687
[Feat] Add snackbar
eedaegil Oct 2, 2020
d490ea7
Merge pull request #38 from innoinho/lee
eedaegil Oct 2, 2020
9530ac5
[Feat(F)] background button change
arduinho Oct 3, 2020
460b435
Merge pull request #39 from innoinho/Feat-Front-backgroundUploadbutton
arduinho Oct 3, 2020
76cb7d4
CSS
JudyH0pps Oct 3, 2020
242b5bd
Merge branch 'master' into css
JudyH0pps Oct 3, 2020
847ab68
Merge pull request #40 from innoinho/css
JudyH0pps Oct 3, 2020
9c1d622
[Fix] Move initial lottie resource from cpp to javascript
eedaegil Oct 3, 2020
5b26aad
Merge pull request #41 from innoinho/lee
eedaegil Oct 3, 2020
171169a
[Feat(F)] resetbutton
arduinho Oct 3, 2020
b3df97c
Merge pull request #42 from innoinho/Feat-Front-restorebutton
arduinho Oct 3, 2020
2396fa2
[Fix] Fix typo
eedaegil Oct 3, 2020
85e084e
Merge pull request #43 from innoinho/lee
eedaegil Oct 3, 2020
f837d78
BackgroundImg size adjust
JudyH0pps Oct 3, 2020
cc12aa0
Merge pull request #44 from innoinho/feature/backgroundSize
JudyH0pps Oct 3, 2020
fdc893a
[Fix(f)] reset Fixed
arduinho Oct 3, 2020
12bfc54
[Fix] Change response validation code
eedaegil Oct 3, 2020
ed05af0
Merge pull request #45 from innoinho/Fix-Front-resetFix
arduinho Oct 3, 2020
84a0a89
Merge pull request #46 from innoinho/lee
eedaegil Oct 3, 2020
13575b6
[Fix(F)] cursor pointer to bar inputs
arduinho Oct 3, 2020
4909d9c
Merge pull request #47 from innoinho/Fix-Front-cursor-pointer
arduinho Oct 3, 2020
e2e801a
[FIX] Connect layer list and snackbar
dlsgk147 Oct 3, 2020
873a068
Merge branch 'master' of https://github.com/innoinho/rlottie.github.io
dlsgk147 Oct 3, 2020
75c9adb
snackbar css
JudyH0pps Oct 3, 2020
e4ac781
[Feat(F)] button hover effect to opacityj
arduinho Oct 3, 2020
cf604a3
Merge pull request #48 from innoinho/Feat-Front-buttonHoverEffect
arduinho Oct 3, 2020
c3d3262
[Feat(F)] api controller mousehove effect
arduinho Oct 3, 2020
7200210
Merge pull request #49 from innoinho/Feat-Front-apiControllermousehover
arduinho Oct 3, 2020
e1d89e9
[Feat(F)] lottie url upload prompt
arduinho Oct 3, 2020
663402a
Merge pull request #50 from innoinho/Feat-Front-inputPrompt
arduinho Oct 3, 2020
10dce3d
[Feat] add api-Creator button & css
Oct 3, 2020
94c8563
[merge] solve webplayerstyle.css conflict
Oct 3, 2020
55ee3d1
Merge pull request #51 from innoinho/Feat-Front-addCustomApi
dddfff22 Oct 3, 2020
04e6ee6
[Feat(F)] button to 100%
arduinho Oct 3, 2020
8841e07
[fix] solve submit function not work in apiCreator
Oct 3, 2020
1624706
Merge pull request #52 from innoinho/fix-apiCreator-DeleteDiv
dddfff22 Oct 3, 2020
0f2a750
[Fix(F)] framelist UI Fixed
arduinho Oct 3, 2020
352de01
Merge pull request #53 from innoinho/Fix-Front-FramelistUI
arduinho Oct 3, 2020
40f3aa9
[Feat(F)] frameList to up
arduinho Oct 3, 2020
7a36353
Merge pull request #54 from innoinho/Feat-Front-framelistchange
arduinho Oct 3, 2020
aa16b6b
[Fix(f)] restore positions
arduinho Oct 3, 2020
33ae8c0
[fix] button margin
Oct 3, 2020
57977e6
Merge pull request #55 from innoinho/Front-edit-button-margin
dddfff22 Oct 3, 2020
e02d779
[FEAT] Layer List + Accordion Menu
dlsgk147 Oct 3, 2020
9faecfc
[FIX] Merge Conflict
dlsgk147 Oct 3, 2020
89eb0e8
[FIX] Download API List
dlsgk147 Oct 3, 2020
32b58a5
[Feat(F)] cursor pointer to layerlist
arduinho Oct 3, 2020
ef16c57
[Fix] delete unused files & rename some files
eedaegil Oct 3, 2020
eca043b
[feat] create api by modal window
Oct 3, 2020
a33744a
[merge] fix confilct in rolttiewebplayer.html
Oct 3, 2020
08bbde7
Merge pull request #56 from innoinho/Front-ApiCreator-Modal
dddfff22 Oct 3, 2020
33a6e56
[Style(F)] Inho module merged
arduinho Oct 3, 2020
ed61b55
[FIX] merge api_dom.js module into module-rlottie.js
Oct 3, 2020
cbedaeb
[delete] delete merged file
Oct 3, 2020
ddc7143
Merge pull request #57 from innoinho/js-merge-api_dom.js
dddfff22 Oct 3, 2020
43ab044
[FIX] Combine accordion with main module
dlsgk147 Oct 3, 2020
c8c917b
[FIX] Combined accordion module with main module
dlsgk147 Oct 3, 2020
01eec4c
js folder
JudyH0pps Oct 3, 2020
2dea3a2
Merge pull request #58 from innoinho/lee
eedaegil Oct 3, 2020
c9240a7
[Fix] add null space
Oct 3, 2020
c26b7c1
Merge pull request #59 from innoinho/Frotnend-modify-latter
dddfff22 Oct 3, 2020
b29fedd
[Fix] modify wrong typo, delete this. values
Oct 3, 2020
0f57fe7
Merge pull request #60 from innoinho/js-modify-typo
dddfff22 Oct 3, 2020
336e370
[Style(F)] index.html conventionj
arduinho Oct 3, 2020
6802c5c
[Feat] add layer canvas
Oct 18, 2020
4510b12
[Fix] add getAllLayers in origin parameter
Oct 18, 2020
2b374fb
Merge pull request #61 from innoinho/Frontend-layer-view
dddfff22 Oct 18, 2020
019a2eb
[Feat/front] api list Load
arduinho Oct 18, 2020
975bc45
Merge pull request #62 from innoinho/Feat-Front-LoadAPI
arduinho Oct 18, 2020
75cd2b9
[Fix/front] delete console.log
arduinho Oct 18, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "rlottie"]
path = rlottie
url = https://github.com/Samsung/rlottie
url = https://github.com/innoinho/rlottie
254 changes: 254 additions & 0 deletions CppAPI.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,254 @@
{
"fill": [
{
"name": "setFillColor",
"argc": 4,
"argv": [
{
"id": 0,
"desc": "keyPath",
"type": "string",
"required": "true"
},
{
"id": 1,
"desc": "r",
"type": "float",
"required": "true",
"min": 0,
"max": 1
},
{
"id": 2,
"desc": "g",
"type": "float",
"required": "true",
"min": 0,
"max": 1
},
{
"id": 3,
"desc": "b",
"type": "float",
"required": "true",
"min": 0,
"max": 1
}
]
},
{
"name": "setFillOpacity",
"argc": 2,
"argv": [
{
"id": 0,
"desc": "keyPath",
"type": "string",
"required": "true"
},
{
"id": 1,
"desc": "opacity",
"type": "float",
"required": "true",
"min": 0,
"max": 100
}
]
}
],
"stroke": [
{
"name": "setStrokeColor",
"argc": 4,
"argv": [
{
"id": 0,
"desc": "keyPath",
"type": "string",
"required": "true"
},
{
"id": 1,
"desc": "r",
"type": "float",
"required": "true",
"min": 0,
"max": 1
},
{
"id": 2,
"desc": "g",
"type": "float",
"required": "true",
"min": 0,
"max": 1
},
{
"id": 3,
"desc": "b",
"type": "float",
"required": "true",
"min": 0,
"max": 1
}
]
},
{
"name": "setStrokeOpacity",
"argc": 2,
"argv": [
{
"id": 0,
"desc": "keyPath",
"type": "string",
"required": "true"
},
{
"id": 1,
"desc": "opacity",
"type": "float",
"required": "true",
"min": 0,
"max": 100
}
]
},
{
"name": "setStrokeWidth",
"argc": 2,
"argv": [
{
"id": 0,
"desc": "keyPath",
"type": "string",
"required": "true"
},
{
"id": 1,
"desc": "width",
"type": "float",
"required": "true"
}
]
}
],
"group": [
{
"name": "setTrAnchor",
"argc": 3,
"argv": [
{
"id": 0,
"desc": "keyPath",
"type": "string",
"required": "true"
},
{
"id": 1,
"desc": "x",
"type": "float",
"required": "true"
},
{
"id": 2,
"desc": "y",
"type": "float",
"required": "true"
}
]
},
{
"name": "setTrPosition",
"argc": 3,
"argv": [
{
"id": 0,
"desc": "keyPath",
"type": "string",
"required": "true"
},
{
"id": 1,
"desc": "x",
"type": "float",
"required": "true"
},
{
"id": 2,
"desc": "y",
"type": "float",
"required": "true"
}
]
},
{
"name": "setTrScale",
"argc": 3,
"argv": [
{
"id": 0,
"desc": "keyPath",
"type": "string",
"required": "true"
},
{
"id": 1,
"desc": "w",
"type": "float",
"required": "true",
"min": 0,
"max": 100
},
{
"id": 2,
"desc": "h",
"type": "float",
"required": "true",
"min": 0,
"max": 100
}
]
},
{
"name": "setTrRotation",
"argc": 2,
"argv": [
{
"id": 0,
"desc": "keyPath",
"type": "string",
"required": "true"
},
{
"id": 1,
"desc": "degree",
"type": "float",
"required": "true",
"min": 0,
"max": 360
}
]
},
{
"name": "setTrOpacity",
"argc": 2,
"argv": [
{
"id": 0,
"desc": "keyPath",
"type": "string",
"required": "true"
},
{
"id": 1,
"desc": "opacity",
"type": "float",
"required": "true",
"min": 0,
"max": 100
}
]
}
]
}
Loading