Commit graph

4278 commits

Author SHA1 Message Date
iLLiCiTiT
de2d156fc4 base object may have pos_x and pos_y 2020-01-14 14:34:26 +01:00
iLLiCiTiT
8899ce974f added important imports 2020-01-14 14:33:59 +01:00
iLLiCiTiT
3ef67998f7 added initial alignment 2020-01-13 16:34:15 +01:00
iLLiCiTiT
43fbdbf8fe added margins 2020-01-13 12:45:46 +01:00
iLLiCiTiT
449fb26aa7 added margins and modified style 2020-01-12 23:14:40 +01:00
iLLiCiTiT
18db21c828 first successfull image inspiration 2020-01-10 19:12:03 +01:00
iLLiCiTiT
89a0dd05fd added set.json need rework 2020-01-10 19:11:50 +01:00
iLLiCiTiT
5e3f0ab337 initial commit 2020-01-10 19:11:05 +01:00
Milan Kolar
56a9146c6b Merge branch 'hotfix/sync_event_ent_type' into develop 2020-01-10 13:16:55 +01:00
Milan Kolar
383670115b Merge branch 'hotfix/ftrack_intent_set_fix' into develop 2020-01-10 13:14:37 +01:00
iLLiCiTiT
77d71d4bf3 it is tried to set intent value on ftrack entity and do not crash pyblish in integrate_ftrack_api 2020-01-10 11:43:07 +01:00
iLLiCiTiT
4bb66af201 added debug with project name to sync to avalon action 2020-01-10 11:40:53 +01:00
iLLiCiTiT
9bc2f557a3 added new entityType appointment to ignored entity types 2020-01-10 11:40:29 +01:00
Milan Kolar
9e1211b22d Merge branch 'hotfix/subprocess-env-filter' into develop 2020-01-10 10:56:08 +01:00
Milan Kolar
19fe9879c1 Merge branch 'hotfix/subprocess-env-filter' 2020-01-10 10:56:08 +01:00
Ondřej Samohel
ce64e6fa07 fixing environment filtering 2020-01-10 00:30:20 +00:00
Jakub Ježek
39b379f5b7 Merged in master-testing (pull request #428)
Master testing
2020-01-09 14:48:30 +00:00
jakub@orbi.tools
d822480ae1 Merge branch 'master-testing' of bitbucket.org:pypeclub/pype into master-testing 2020-01-09 15:07:09 +01:00
Milan Kolar
3a4a6782ab pep8 class names 2020-01-09 15:07:44 +01:00
Milan Kolar
a888891a68 Merge branch 'master' into master-testing 2020-01-09 14:45:21 +01:00
jakub@orbi.tools
565e3a9a95 Merge remote-tracking branch 'origin/hotfix/sync_with_asset_version_ca' into master-testing 2020-01-09 14:41:58 +01:00
Milan Kolar
2350790389 remove obsolete logge 2020-01-09 12:02:04 +01:00
jakub@orbi.tools
98eced7157 Merge remote-tracking branch 'origin/feature/PYPE-636-nuke-noninteractive-review-make' into master-testing 2020-01-09 11:34:37 +01:00
jakub@orbi.tools
24ba47a8e6 Merge branch 'master' into master-testing 2020-01-09 11:34:08 +01:00
Jakub Jezek
69015fb7fc fix(nuke): updating nuke.lib and review data mov 2020-01-09 11:15:57 +01:00
Jakub Jezek
64a0360ce9 fix(global): letter box not created properly 2020-01-09 11:08:35 +01:00
iLLiCiTiT
b2dfb6c95b be specific about task custom attributes to avoid asset version's cust attrs 2020-01-09 10:36:35 +01:00
Jakub Jezek
e6dc7c29a3 feat(): 2020-01-08 22:13:48 +01:00
Milan Kolar
2635a5e26e Merge branch 'hotfix/unc_remapping' into develop 2020-01-08 18:25:45 +01:00
Milan Kolar
39058ab0b7 Merge branch 'hotfix/unc_remapping' 2020-01-08 18:25:45 +01:00
Milan Kolar
ccd491d99e add remapping from mounted to network path to render publish job 2020-01-08 18:24:35 +01:00
jakub@orbi.tools
e5bf2e69df Merge remote-tracking branch 'origin/temp/intent_merge_cherrypicked' into master-testing 2020-01-08 16:21:45 +01:00
iLLiCiTiT
dde70634e1 replace backslash in hierararchy which may cause issues in burnin path 2020-01-08 16:18:36 +01:00
iLLiCiTiT
f89c1d3dbc added filled anatomy to burnin data to be able use anatomy[...][...] in burnin presets 2020-01-08 16:18:25 +01:00
iLLiCiTiT
023aec0a61 added template data to burnins data 2020-01-08 16:18:08 +01:00
jakub@orbi.tools
acd1ae66b5 Merge remote-tracking branch 'origin/temp/intent_merge_cherrypicked' into master-testing 2020-01-08 15:31:08 +01:00
iLLiCiTiT
264a7c177b set asset version custom attributes if there are any 2020-01-08 15:31:07 +01:00
iLLiCiTiT
19f2b8148c add intent value from context to custom attributes if is set 2020-01-08 15:31:00 +01:00
iLLiCiTiT
5bf0f2973d add custom attributes key to assetversion data in integrate frant instances 2020-01-08 15:30:47 +01:00
Jakub Jezek
fbb4c247f6 fix(global): fixing reformat and letter box 2020-01-08 00:38:08 +01:00
Jakub Jezek
ade2a26e84 feat(nuke): adding back baking mov from nuke 2020-01-08 00:02:14 +01:00
Jakub Jezek
67c1bfdf45 Merge branch 'master' into feature/PYPE-636-nuke-noninteractive-review-make 2020-01-07 13:30:27 +01:00
Jakub Jezek
8d18ee6390 Merge branch 'hotfix/burnin-right-side' 2020-01-07 13:13:28 +01:00
Jakub Jezek
0b0da93773 Merge branch 'hotfix/burnin-right-side' into develop 2020-01-07 13:13:27 +01:00
Jakub Jezek
26f2f882e2 fix(otio): burnin right side didnt format properly 2020-01-07 13:12:29 +01:00
Jakub Jezek
a82d82d626 Merge branch 'master' into feature/PYPE-636-nuke-noninteractive-review-make 2020-01-07 12:53:57 +01:00
Jakub Jezek
818670a9d0 Merge branch 'hotfix/PYPE-641-nk-nks-small-fixes' 2020-01-07 12:51:10 +01:00
Jakub Jezek
6616138ec3 Merge branch 'hotfix/PYPE-641-nk-nks-small-fixes' into develop 2020-01-07 12:51:09 +01:00
Jakub Jezek
a6af3ca90b fix(global): reformat didnt compare properly resolution float and int 2020-01-07 11:12:42 +01:00
Jakub Trllo
6a186024db Merged in bugfix/lighting_btns_font_size (pull request #411)
bugfix/lightbuttons_font_size

Approved-by: Milan Kolar <milan@orbi.tools>
2020-01-06 16:15:44 +00:00