Commit graph

269 commits

Author SHA1 Message Date
Milan Kolar
5bfacad2a3 add hierarchical option for playblasts 2018-12-10 17:08:19 +01:00
Milan Kolar
1c4648d6ee Merge branch 'develop' into feature/PYPE-18-maya-publishing-playblasts 2018-12-09 18:16:56 +01:00
Jakub Trllo
d0ade3d8f0 Merged in feature/PYPE-14-ftrack-stop-timer (pull request #26)
Feature/PYPE-14 ftrack stop timer

Approved-by: Milan Kolar <milan@orbi.tools>
2018-12-09 17:09:58 +00:00
Milan Kolar
e5df6ad2b3 Merge branch 'develop' into feature/PYPE-14-ftrack-stop-timer
# Conflicts:
#	pype/ftrack/ftrack_run.py
2018-12-09 18:09:27 +01:00
Jakub Trllo
d7859c5dc0 Merged in feature/PYPE-71-event_server (pull request #25)
Feature/PYPE-71 event server

Approved-by: Milan Kolar <milan@orbi.tools>
2018-12-09 15:51:10 +00:00
Milan Kolar
6476bb632c add thumbnail extractor 2018-12-07 18:17:08 +01:00
Milan Kolar
dee6f9a7a7 add ffmpeg-python, and publish quicktime to ftrack 2018-12-07 17:38:16 +01:00
Jakub Trllo
b7f7a26bc7 restore 5 min countdown from testing 10sec 2018-12-07 16:16:49 +01:00
Jakub Trllo
990ff19cea better thread terminating 2018-12-07 16:11:17 +01:00
Jakub Trllo
0686794513 5 min countdown begin when timer is started. On mouse/keyboard move countdown resets. 30sec before countdown show message to user. After countdown inform user that timer was stopped. 2018-12-07 15:48:16 +01:00
Jakub Trllo
dc16dfe78d renamed ftrackRun 2018-12-07 10:12:04 +01:00
Jakub Trllo
1ff834e971 Merge branch 'develop' into feature/PYPE-71-event_server 2018-12-07 09:57:01 +01:00
Milan Kolar
3a38a90784 ftrackRun renamed to ftrack_run 2018-12-07 09:24:07 +01:00
Milan Kolar
d4b66146ee Merge branch 'hotfix/apps-not-launching-after-last-PR' into develop 2018-12-07 01:12:51 +01:00
Milan Kolar
3b3a379b7a fixing issue with apps not launchign at all after last merge 2018-12-07 01:12:34 +01:00
Milan Kolar
bdbd1a7189 Merge branch 'develop' into feature/PYPE-18-maya-publishing-playblasts 2018-12-06 23:38:04 +01:00
Jakub Trllo
352431c6eb Merged in feature/PYPE-54-LOCAL_ICONS (pull request #23)
preparation for 'ftrack_resources'

Approved-by: Milan Kolar <milan@orbi.tools>
2018-12-06 22:32:28 +00:00
Jakub Trllo
7fcee7e351 Merged in feature/PYPE-73-action_as_API (pull request #22)
Prepared action for event server
2018-12-06 22:31:40 +00:00
Jakub Trllo
3730f437a2 Basic implementation 2018-12-06 18:49:00 +01:00
Jakub Trllo
4d003d97d7 Merged in hotfix/apps-loads-multiple (pull request #24)
Identifier is now full app name(with version), so same app won't launch twice if two versions are available.
2018-12-06 16:56:55 +00:00
Jakub Trllo
c7f4476545 Merge branch 'develop' into feature/PYPE-14-ftrack-stop-timer 2018-12-06 16:51:21 +01:00
Jakub Trllo
e19fbea3e9 Identifier is now full app name(with version), so same app won't launch twice if two versions are available. 2018-12-06 15:20:05 +01:00
Jakub Trllo
c2d45680fd Merge branch 'feature/PYPE-73-action_as_API' into feature/PYPE-71-event_server 2018-12-06 13:17:00 +01:00
Jakub Trllo
919cdf7178 Merge branch 'develop' into feature/PYPE-71-event_server 2018-12-06 13:00:17 +01:00
Jakub Trllo
f59bcf2e44 renamed filename 2018-12-06 12:57:44 +01:00
Jakub Trllo
5904fa4c65 Revert "renamed file"
This reverts commit ea7a10f94f.
2018-12-06 12:55:05 +01:00
Jakub Trllo
ea7a10f94f renamed file 2018-12-06 12:52:58 +01:00
Jakub Trllo
64bebac394 Removed event server from Tray 2018-12-06 12:49:43 +01:00
Jakub Trllo
796388b330 ftrackRun.py renamed to ftrack_run.py 2018-12-06 11:54:52 +01:00
Jakub Trllo
0d61f2d59f Login dialog withou UI deleted 2018-12-06 11:54:04 +01:00
Jakub Trllo
5eb6c48faf Added event server class. Login dialog bugs repaired: didn't login properly through username+API; icon missing problem 2018-12-06 11:42:48 +01:00
Jakub Trllo
3fda5c32b3 Action syncToAvalon - changed identifier and label. Is visible only for role 'Pypeclub' 2018-12-06 10:13:47 +01:00
Jakub Trllo
2da8a47442 preparation for 'ftrack_resources' 2018-12-05 19:00:29 +01:00
Jakub Trllo
c5c6927e61 Merged in feature/sync_avalon_events (pull request #21)
Feature/sync avalon events

Approved-by: Milan Kolar <milan@orbi.tools>
2018-12-05 17:32:06 +00:00
Jakub Jezek
911335a097 Merged in bugfix/PYPE-29-nuke-fix-set-format (pull request #14)
Bugfix/PYPE-29 nuke fix set format

Approved-by: Milan Kolar <milan@orbi.tools>
2018-12-05 17:08:12 +00:00
Jakub Trllo
6bbb34fa34 added module pynput for listening mouse and keyboard 2018-12-05 17:59:02 +01:00
Jakub Trllo
a7ac81dcc1 Prepared action for event server 2018-12-05 16:58:39 +01:00
Jakub Trllo
d1c1c4f039 Sync to avalon event should work like action. Synchronize only projects that have checked Avalon auto-sync. 2018-12-05 16:15:11 +01:00
Jakub Jezek
f2796b12e0 if format alredy exists it will not create new 2018-12-05 15:14:46 +01:00
Jakub Jezek
bc6e0d9498 Merged in feature/PYPE-13-nuke-loadsequence (pull request #19)
Feature/PYPE-13 nuke loadsequence

Approved-by: Milan Kolar <milan@orbi.tools>
2018-12-05 12:49:07 +00:00
Jakub Jezek
0229c35a4d wip on reset_format 2018-12-05 13:47:13 +01:00
Jakub Jezek
782f09b7be Merge branch 'develop' into bugfix/PYPE-29-nuke-fix-set-format 2018-12-05 13:46:34 +01:00
Milan Kolar
e27b1ee0f8 Merge branch 'develop' into feature/PYPE-13-nuke-loadsequence
# Conflicts:
#	pype/plugins/ftrack/integrate_ftrack_instances.py
#	pype/plugins/nuke/publish/collect_writes.py
#	pype/plugins/nuke/publish/integrate_rendered_frames.py
2018-12-05 13:43:10 +01:00
Milan Kolar
4222c73f81 Merged in bugfix/PYPE-56-nuke-to-ftrack-publishing (pull request #20)
Bugfix/PYPE-56 nuke to ftrack publishing

Approved-by: Milan Kolar <milan@orbi.tools>
2018-12-05 10:16:39 +00:00
Milan Kolar
112f4ca48d add img and render to ftrack assets 2018-12-05 11:15:45 +01:00
Jakub Trllo
cbe299790e Merge branch 'develop' into feature/PYPE-16-sync_avalon_event 2018-12-05 10:43:28 +01:00
Milan Kolar
23d7bc5f0c add project code to publishes 2018-12-05 01:39:14 +01:00
Milan Kolar
33a59a52e8 changing the file gather for ftrack publishing a bit. fixes gathering of image sequences 2018-12-05 01:03:41 +01:00
Jakub Trllo
e07a8af633 Merge branch 'hotfix/project_template_fix' into develop 2018-12-04 18:54:23 +01:00
Jakub Trllo
bf30d1ef82 insert 'v' before {version:0>3} 2018-12-04 18:51:27 +01:00