Commit graph

4235 commits

Author SHA1 Message Date
iLLiCiTiT
830373f3d5 added delivery icon 2020-01-08 17:19:35 +01:00
iLLiCiTiT
75cb30fe1d inital version of delivery action in ftrack 2020-01-08 17:11:27 +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
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
Jakub Trllo
d5919053ce Merged in feature/PYPE-632_intent_integration (pull request #421)
Feature/PYPE-632 intent integration

Approved-by: Milan Kolar <milan@orbi.tools>
2020-01-06 15:10:26 +00:00
iLLiCiTiT
c71fc909ce set asset version custom attributes if there are any 2020-01-06 15:49:34 +01:00
Jakub Trllo
684dae0a96 Merged in feature/PYPE-626_template_in_burnins (pull request #417)
Feature/PYPE-626 template in burnins

Approved-by: Milan Kolar <milan@orbi.tools>
2020-01-06 14:49:20 +00:00
iLLiCiTiT
abe9334d5d add intent value from context to custom attributes if is set 2020-01-06 15:49:18 +01:00
iLLiCiTiT
25d2e135d9 add custom attributes key to assetversion data in integrate frant instances 2020-01-06 15:48:19 +01:00
Jakub Jezek
9009e99712 fix(global): passing resolution to context 2020-01-06 14:07:11 +01:00
Milan Kolar
b00566bce7 Merge remote-tracking branch 'origin/develop' into develop 2020-01-06 13:12:41 +01:00
Jakub Jezek
f9ddd368ea Merge branch 'master' into hotfix/PYPE-641-nk-nks-small-fixes 2020-01-06 12:43:56 +01:00
Jakub Jezek
68c8a253bf feat(nuke): lock range on setting frame ranges 2020-01-06 12:43:43 +01:00
Ondřej Samohel
3770fc8c42 Merged in hotfix/pype-lib-subprocess-pass-arguments (pull request #409)
(genera) fixing subprocess function to allow pass through Popen.subprocess arguments. Also adding better output for running subprocess

Approved-by: Milan Kolar <milan@orbi.tools>
2020-01-06 11:40:14 +00:00
Jakub Trllo
313b348128 Merged in bugfix/PYPE-643_seed_action_fix (pull request #420)
Bugfix/PYPE-643 seed action fix

Approved-by: Milan Kolar <milan@orbi.tools>
2020-01-06 11:37:30 +00:00
Milan Kolar
cd2f17bdbf Merge branch 'hotfix/ffmpeg_path_burnin_fix' 2020-01-06 12:33:41 +01:00
Milan Kolar
733ee06e9d Merge branch 'hotfix/ffmpeg_path_burnin_fix' into develop 2020-01-06 12:33:40 +01:00
Milan Kolar
275d2bae4a Merge branch 'hotfix/version_to_task_status_backwards_compatibility' 2020-01-06 12:20:36 +01:00
Milan Kolar
809a29156d Merge branch 'hotfix/version_to_task_status_backwards_compatibility' into develop 2020-01-06 12:20:36 +01:00
Milan Kolar
6d1b064d0b add previous behaviour as default 2020-01-06 12:19:56 +01:00
Jakub Jezek
730fbdd509 fix(global): reformat didn't return correct data 2020-01-06 00:45:22 +01:00
iLLiCiTiT
080f1f6819 check if input values of seeder are greater than 0 2020-01-05 14:26:13 +01:00
iLLiCiTiT
0024688a44 convert input values to integer and set to 0 if not successful 2020-01-05 14:25:50 +01:00
iLLiCiTiT
73e50fa03f change label to see whole label value 2020-01-05 14:24:56 +01:00
Jakub Jezek
430920d999 Merge branch 'hotfix/nk-nks-small-fixes' into hotfix/PYPE-641-nk-nks-small-fixes 2020-01-04 17:42:10 +01:00
Jakub Jezek
cd4ad045e6 fix(nks): workio on save_as if Untitled didnt do anything 2020-01-04 17:14:31 +01:00
Milan Kolar
ad1bc9a6a1 Merge remote-tracking branch 'origin/develop' into develop 2019-12-19 18:50:40 +01:00
Milan Kolar
c271c94bbe Merge branch 'hotfix/publish-filesequence' 2019-12-19 12:06:21 +01:00
Milan Kolar
8d0d53fd14 Merge branch 'hotfix/publish-filesequence' into develop 2019-12-19 12:06:21 +01:00
Jakub Jezek
07716050ec Merge branch 'hotfix/nuke_collect_instances_2' 2019-12-18 14:59:28 +01:00
Jakub Jezek
28c1c4856d Merge branch 'hotfix/nuke_collect_instances_2' into develop 2019-12-18 14:59:26 +01:00
Jakub Jezek
f06857c42e fix(nuke): didn't collect all publishable isntaces 2019-12-18 14:56:57 +01:00
Jakub Jezek
813673dd50 fix(global): comma missing gizmo family 2019-12-18 14:55:14 +01:00
iLLiCiTiT
d78166a0da replace backslash in hierararchy which may cause issues in burnin path 2019-12-16 17:49:42 +01:00
iLLiCiTiT
1286edfc25 added filled anatomy to burnin data to be able use anatomy[...][...] in burnin presets 2019-12-16 17:36:10 +01:00
iLLiCiTiT
19cf990fbd added template data to burnins data 2019-12-16 17:35:23 +01:00
Milan Kolar
0841d91eef fix which import 2019-12-16 14:13:31 +01:00
Milan Kolar
59260feeb9 Merge branch 'release/2.4.0' 2019-12-14 00:59:04 +01:00
Milan Kolar
62a7acc754 Merge branch 'release/2.4.0' into develop 2019-12-14 00:59:01 +01:00
Milan Kolar
bc9a8d9a8b Merge branch 'release/2.4.0' of bitbucket.org:pypeclub/pype into release/2.4.0 2019-12-13 21:02:25 +01:00
Jakub Trllo
1d56d8adb9 Merged in feature/ftrack_server_cleanup (pull request #413)
Feature/ftrack server cleanup

Approved-by: Milan Kolar <milan@orbi.tools>
2019-12-12 17:14:51 +00:00
Jakub Trllo
e9fe0ad3ed Merged in feature/version_to_task_refactor_release (pull request #416)
Feature/version to task refactor release

Approved-by: Milan Kolar <milan@orbi.tools>
2019-12-12 16:49:35 +00:00
Milan Kolar
6a9e898b98 Merge branch 'refs/heads/develop' into release/2.4.0
# Conflicts:
#	pype/plugins/nuke/publish/extract_review_data.py
2019-12-12 17:48:24 +01:00
iLLiCiTiT
df34ed8705 refactored verion to task event and added feature with more statuses to set 2019-12-12 17:44:40 +01:00
Jakub Jezek
5c918a054a Merge branch 'hotfix/nuke-create-problems' into develop 2019-12-12 15:17:47 +01:00
iLLiCiTiT
df4fb428f6 Merge branch 'refs/heads/develop' into bugfix/lighting_btns_font_size 2019-12-12 11:42:06 +01:00