Commit graph

4220 commits

Author SHA1 Message Date
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
Jakub Jezek
e6dc7c29a3 feat(): 2020-01-08 22:13:48 +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
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
a6af3ca90b fix(global): reformat didnt compare properly resolution float and int 2020-01-07 11:12:42 +01:00
Jakub Jezek
9009e99712 fix(global): passing resolution to context 2020-01-06 14:07:11 +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
Milan Kolar
cd2f17bdbf Merge branch 'hotfix/ffmpeg_path_burnin_fix' 2020-01-06 12:33:41 +01:00
Milan Kolar
275d2bae4a Merge branch 'hotfix/version_to_task_status_backwards_compatibility' 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
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
Jakub Jezek
bba0d10e91 feat(nuke): adding back plugin
renaming to only mov creation in running nuke session
2019-12-30 15:09:05 +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
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
978e05b536 get streams before super init in Burnin class is called 2019-12-12 11:27:47 +01:00
iLLiCiTiT
fdf4182155 replace FFMPEG string in command method 2019-12-12 11:27:22 +01:00
iLLiCiTiT
54c76b3b7f copied _streams method from otio adapter to be able to use ffprobe full path 2019-12-12 11:26:55 +01:00
iLLiCiTiT
eac2629fcb use FFMPEG_PATH environ to get path to ffmpeg and ffprobe 2019-12-12 11:26:12 +01:00
Milan Kolar
c024f55e9c Merge branch 'refs/heads/feature/PYPE-433-deadline-publish-with-correct-c' into release/2.4.0
# Conflicts:
#	pype/plugins/nuke/publish/extract_review_data.py
2019-12-11 23:24:34 +01:00
Jakub Ježek
033e3e4ff5 Merged in feature/PYPE-433-deadline-publish-with-correct-c (pull request #403)
Nuke to Deadline submission

Approved-by: Milan Kolar <milan@orbi.tools>
2019-12-11 22:15:04 +00:00
Jakub Trllo
7c4235c9eb Merged in feature/PYPE-606_delete_action (pull request #407)
Feature/PYPE-606 delete action

Approved-by: Milan Kolar <milan@orbi.tools>
2019-12-11 21:31:09 +00:00
Jakub Trllo
e4c4d5307f Merged in feature/standalone_pub_png_icons (pull request #412)
Feature/standalone pub png icons

Approved-by: Milan Kolar <milan@orbi.tools>
2019-12-11 21:19:53 +00:00
Ondřej Samohel
6f77e3015c Merged in hotfix/maya-look-correct-colorspace (pull request #406)
(maya) fixed correct colorspace for linearized textures during look extraction

Approved-by: Milan Kolar <milan@orbi.tools>
2019-12-11 14:37:50 +00:00
Jakub Jezek
73c7a42544 Merge remote-tracking branch 'origin/hotfix/little_nuke_fixes' into release/2.4.0 2019-12-11 13:27:46 +01:00
Jakub Jezek
06e4c713ab Merge remote-tracking branch 'origin/hotfix/nuke-create-problems' into release/2.4.0 2019-12-11 13:27:31 +01:00
Jakub Jezek
48b78c8526 Merge remote-tracking branch 'origin/hotfix/nuke_instance_back_comp' into release/2.4.0 2019-12-11 13:27:15 +01:00
iLLiCiTiT
6e2ea0c05b change session check in base event handler 2019-12-11 12:34:36 +01:00