Commit graph

4420 commits

Author SHA1 Message Date
Milan Kolar
ee71d2420d add start and end frame to collection 2020-01-28 00:00:19 +01:00
Milan Kolar
6e1f4de58d fix environment filter typo 2020-01-27 23:59:36 +01:00
Ondrej Samohel
e186fcd388
Merge remote-tracking branch 'origin/develop' into feature/PYPE-634-pype-render-wrapper 2020-01-21 10:20:01 +01:00
Milan Kolar
82ac325448 Fix CG render publishing
Eallin production cherry picked and merged with current develop
2020-01-20 23:42:09 +01:00
Milan Kolar
d34be56dac Merged in master-dazzle-prod (pull request #439)
sync with current state in dazzle

Approved-by: Milan Kolar <milan@orbi.tools>
2020-01-20 22:40:51 +00:00
Milan Kolar
5980c42d43 Merge branch 'develop' into master-dazzle-prod 2020-01-20 21:03:55 +01:00
Jakub Trllo
2fb0b5472b Merged in feature/dict_indentation (pull request #397)
Feature/dict indentation

Approved-by: Milan Kolar <milan@orbi.tools>
2020-01-20 19:59:57 +00:00
Jakub Trllo
1a1c5cf541 Merged in feature/action_server_subprocess (pull request #414)
Feature/action server subprocess

Approved-by: Milan Kolar <milan@orbi.tools>
2020-01-20 19:57:27 +00:00
Jakub Trllo
f277d416b2 Merged in feature/PYPE-651_datetime_keys (pull request #441)
feature/PYPE-651_datetime_keys

Approved-by: Milan Kolar <milan@orbi.tools>
2020-01-20 19:52:07 +00:00
Jakub Jezek
4ddc5079da fix(global): if baked mov then do not integrate it if on farm 2020-01-20 18:07:24 +01:00
Jakub Ježek
4b8305aa35 Merged in feature/nuke-knobscripter (pull request #419)
feat(nuke): added knobscripter for nuke
2020-01-20 17:00:04 +00:00
iLLiCiTiT
cca738f003 reimplement sub user server 2020-01-20 17:56:52 +01:00
Jakub Jezek
f7f0fa5ed9 feat(nuke): KnobScripter added as backage not submodule 2020-01-20 17:55:18 +01:00
Jakub Jezek
9de6b0407d feat(ftrack): reversing changes on action_test 2020-01-20 17:39:42 +01:00
Jakub Jezek
33154ddad6 Merge branch 'develop' into master-dazzle-prod 2020-01-20 17:35:24 +01:00
Jakub Jezek
e52687a6b7 fix(global): brushing the code 2020-01-20 17:33:03 +01:00
iLLiCiTiT
8891f9e360 Merge branch 'develop' into feature/dict_indentation 2020-01-20 17:25:00 +01:00
Jakub Trllo
6964c0da20 Merged in hotfix/integrate_ftrack_with_avalon (pull request #437)
hotfix/integrate_ftrack_with_avalon

Approved-by: Milan Kolar <milan@orbi.tools>
2020-01-20 13:17:43 +00:00
Jakub Jezek
3ecedad03b Merge branch 'develop' into master-dazzle-prod 2020-01-20 12:03:34 +01:00
Jakub Jezek
4df0ca8e62 fix: offset if slate in collect filesequence 2020-01-17 18:23:28 +01:00
iLLiCiTiT
57d53f3397 added datetime data to burnins data 2020-01-17 18:12:25 +01:00
Jakub Jezek
bab5fb45ff fix order of collect filesequence and anatomy collect 2020-01-17 17:30:22 +01:00
iLLiCiTiT
40cae28e76 sync to avalon actions return information about not available avalon_mongo_id custom attribute(only for project) 2020-01-17 16:05:59 +01:00
iLLiCiTiT
7029588793 correct setting 2020-01-17 15:03:26 +01:00
iLLiCiTiT
846777bff0 update all avalon ent data if ftrack id was updated 2020-01-17 12:40:35 +01:00
Milan Kolar
06ed617d9b make ascii ass configurable via presets 2020-01-17 09:34:23 +01:00
Jakub Jezek
af61c41319 Merge branch 'feature/nuke-slate-prerender' into master-dazzle-prod 2020-01-16 19:25:23 +01:00
Jakub Jezek
a84ac3b2db fix(global): deadline didnt publish all data to representation 2020-01-16 19:24:09 +01:00
Jakub Jezek
c486eaf58b Merge remote-tracking branch 'origin/hotfix/integrate_ftrack_with_avalon' into master-dazzle-prod 2020-01-16 17:00:52 +01:00
Jakub Jezek
cb10d70cd8 Merge branch 'feature/nuke-slate-prerender' into master-dazzle-prod 2020-01-16 16:50:03 +01:00
Jakub Jezek
dad87fa395 fix(global): burnin didnt work if slate was not in families 2020-01-16 16:49:31 +01:00
iLLiCiTiT
83c501f26d fixed update query 2020-01-16 16:31:24 +01:00
Jakub Jezek
be031f71e2 Merge remote-tracking branch 'origin/feature/nuke-slate-prerender' into master-testing-local
# Conflicts:
#	pype/plugins/nuke/publish/submit_nuke_deadline.py
2020-01-16 15:56:55 +01:00
Jakub Jezek
0c35132839 feat(nuke): deadline submission with slate
and dependend noninteractive job
2020-01-16 15:56:02 +01:00
Jakub Jezek
675f637e8c Merge remote-tracking branch 'origin/hotfix/integrate_ftrack_with_avalon' into master-testing-local 2020-01-16 14:37:08 +01:00
iLLiCiTiT
415ec47f9d added aditional check in event sync to avalon for cases when avalon ent exists but don't have ftrackId 2020-01-16 14:31:05 +01:00
iLLiCiTiT
1f96a74bac remove added code of previous commit 2020-01-16 14:30:26 +01:00
Ondřej Samohel
704ffdfc84 Merged in feature/yeti-resolve-env-variables-in-paths (pull request #432)
resolving `${TOKEN}` variables in PATH to env variables

Approved-by: Milan Kolar <milan@orbi.tools>
2020-01-16 12:50:15 +00:00
jakub@orbi.tools
df8856cd5c Merge branch 'feature/nuke-slate-prerender' into master-testing-local 2020-01-16 13:06:53 +01:00
Jakub Jezek
aee72b9eac fix(nuke): deadline submission of slate family 2020-01-15 17:46:09 +01:00
Jakub Jezek
96a7c4a061 feat(ftrack): delivery action 2020-01-15 17:28:28 +01:00
jakub@orbi.tools
175a10f989 Merge remote-tracking branch 'origin/hotfix/integrate_ftrack_with_avalon' into master-testing-local 2020-01-15 16:55:30 +01:00
jakub@orbi.tools
9c9d000747 Merge branch 'feature/nuke-slate-prerender' into master-testing-local
# Conflicts:
#	pype/plugins/nuke/publish/submit_nuke_deadline.py
2020-01-15 16:06:16 +01:00
Jakub Jezek
3e129d7a56 feat(nuke, global): adding slate family conditions 2020-01-15 16:04:49 +01:00
iLLiCiTiT
315dfe79a4 set ftrackId and entityType on entity when integrate hierarchy ftrack creates one 2020-01-15 15:36:54 +01:00
Ondrej Samohel
408c220df8
remapping handling pushed to pype publish command 2020-01-15 15:30:00 +01:00
Jakub Jezek
b0d338fdb2 fix(global): refactoring environment collection 2020-01-15 10:57:52 +01:00
Jakub Jezek
b080f73a39 style(nuke): cleaning code 2020-01-15 10:57:15 +01:00
jakub@orbi.tools
13f08c7f1f Merge branch 'feature/nuke-slate-prerender' into master-testing-local
# Conflicts:
#	pype/plugins/global/publish/collect_filesequences.py
#	pype/plugins/global/publish/integrate_new.py
2020-01-14 19:58:03 +01:00
jakub@orbi.tools
3f1d5100e7 global fixing unc path submisison and deadline integrtion 2020-01-14 19:51:50 +01:00