Commit graph

1950 commits

Author SHA1 Message Date
Roy Nieterau
c0a292155b Merge branch 'enhancement/maya_workfile_templates_refactor' into enhancement/maya_template_add_assign_look_placeholder 2024-05-01 00:37:51 +02:00
Roy Nieterau
14df54020b Resolve merge conflict, implement change from develop 2024-05-01 00:02:19 +02:00
Roy Nieterau
5e0fa8142f Merge branch 'develop' of https://github.com/ynput/ayon-core into enhancement/maya_workfile_templates_refactor
# Conflicts:
#	client/ayon_core/hosts/maya/plugins/workfile_build/load_placeholder.py
2024-05-01 00:01:32 +02:00
Jakub Trllo
df976a4ab8
Merge pull request #462 from ynput/enhancement/cache-item-location
Chore: Move cache item to lib
2024-04-30 17:17:04 +02:00
Milan Kolar
c918bea544
Merge pull request #336 from ynput/enhancement/OP-5920_abc-options-for-Pointcache-Animation-family 2024-04-30 15:40:18 +02:00
Ondřej Samohel
98a27e02fc
Merge branch 'develop' into bugfix/task_deadline 2024-04-30 14:48:47 +02:00
Ondřej Samohel
701fcb9a24
Merge branch 'develop' into bugfix/maya_placeholder_set 2024-04-30 14:45:00 +02:00
Kayla Man
9b79bf2b90
Merge branch 'develop' into bugfix/the_transform_not_being_able_to_get_positions_when_updating 2024-04-30 20:12:44 +08:00
Toke Stuart Jepsen
8dd30e33ef Update fix 2024-04-30 12:06:26 +01:00
Roy Nieterau
8e2f3235c6 Remove unused import 2024-04-30 12:58:08 +02:00
Roy Nieterau
f5d022a2d0 Merge branch 'enhancement/maya_workfile_templates_refactor' into enhancement/maya_template_add_assign_look_placeholder 2024-04-30 12:56:59 +02:00
Roy Nieterau
636eb6e740 Merge remote-tracking branch 'upstream/develop' into enhancement/maya_workfile_templates_refactor
# Conflicts:
#	client/ayon_core/hosts/maya/api/workfile_template_builder.py
#	client/ayon_core/hosts/maya/plugins/workfile_build/load_placeholder.py
2024-04-30 12:54:46 +02:00
Jakub Trllo
a13bfe1c05
Merge pull request #463 from BigRoy/bugfix/mayalookassigner_vrayproxies_import_lib
Maya: Fix VRay Proxies look assigner import
2024-04-30 10:42:19 +02:00
Jakub Trllo
8e7913fb74
Merge pull request #426 from BigRoy/enhancement/workfile_template_event_system
Workfile Templates: add event system to Workfile Template Builder
2024-04-30 10:38:31 +02:00
Roy Nieterau
c50bd1498e
Apply suggestions from code review
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2024-04-30 10:34:31 +02:00
Kayla Man
99b4c95542
Merge branch 'develop' into enhancement/AY-978_hiero-colorspace-settings-aligned-with-nuke 2024-04-30 16:21:11 +08:00
Kayla Man
5e2e99ebf7
Merge branch 'develop' into enhancement/enhancement_on_reset_frame_range_function 2024-04-30 16:19:59 +08:00
Kayla Man
e74a1d303e fix the bug encountered when getting transform for the asset when updating it 2024-04-30 16:15:17 +08:00
Kayla Man
b0b157bfa4
Merge branch 'develop' into bugfix/AY-3686_Bug-3dsmax---Manage--Set-Version-malfunctioning 2024-04-30 16:07:34 +08:00
Kayla Man
0783734f63
Merge branch 'develop' into enhancement/enhancement_on_reset_frame_range_function 2024-04-30 16:01:09 +08:00
Jakub Trllo
89020339c7
Merge pull request #425 from BigRoy/enhancement/workfile_templates_register_plugin
Workfile Templates: Implement registering and discovering of `PlaceholderPlugin`
2024-04-30 09:45:00 +02:00
Kayla Man
444b0d8fc7
Update client/ayon_core/hosts/maya/api/lib.py
Co-authored-by: Toke Jepsen <tokejepsen@gmail.com>
2024-04-30 15:38:32 +08:00
Kayla Man
4b057a416f
Merge branch 'develop' into bugfix/houdini-fails-to-start-because-missing-settings 2024-04-30 15:10:19 +08:00
Kayla Man
b5f4a843d5 add more fps value support & supports to reset fps value based on the task entity 2024-04-30 13:31:30 +08:00
Roy Nieterau
65be3fb93f
Merge branch 'develop' into enhancement/workfile_template_event_system 2024-04-30 06:50:10 +02:00
Roy Nieterau
90ece1cdf9 Refactor template_placeholder_plugin -> workfile_build_plugin 2024-04-30 06:48:50 +02:00
Roy Nieterau
07bd2e21de Resolve merge conflict 2024-04-30 06:47:08 +02:00
Roy Nieterau
4512a088e9 Merge branch 'develop' of https://github.com/ynput/ayon-core into enhancement/workfile_templates_register_plugin
# Conflicts:
#	client/ayon_core/hosts/maya/api/workfile_template_builder.py
2024-04-30 06:46:32 +02:00
Roy Nieterau
373af396dc Merge branch 'develop' of https://github.com/ynput/ayon-core into enhancement/maya_workfile_templates_refactor
# Conflicts:
#	client/ayon_core/hosts/maya/api/workfile_template_builder.py
2024-04-30 06:45:13 +02:00
MustafaJafar
40cc4d2b98 fix color_settings condition 2024-04-29 21:32:54 +03:00
Toke Stuart Jepsen
1e997ddc39 Merge branch 'develop' into enhancement/AY-978_hiero-colorspace-settings-aligned-with-nuke
# Conflicts:
#	server_addon/hiero/server/version.py
#	server_addon/nuke/server/version.py
2024-04-29 19:19:42 +01:00
MustafaJafar
7db14f47c1 imporve code logic 2024-04-29 18:13:57 +03:00
Jakub Trllo
64ff24dbf1 use 'is_valid' instead of 'is_outdated' 2024-04-29 16:45:07 +02:00
Ondřej Samohel
5e029d80a8
Merge branch 'develop' into enhancement/houdini_validate_cop_output_node 2024-04-29 16:22:21 +02:00
Jakub Trllo
907fa5de93 added default value to 'NestedCacheItem' 2024-04-29 16:08:43 +02:00
Jakub Trllo
2594fc82b0 added default value of lifetime to docstring 2024-04-29 16:07:50 +02:00
Jakub Trllo
f10d266029 add missing docstring 2024-04-29 16:07:35 +02:00
Jakub Trllo
3980f59211 fix docstring lines 2024-04-29 16:07:28 +02:00
Roy Nieterau
72028abc2c Fix import 2024-04-29 15:55:36 +02:00
Jakub Trllo
27c3a7bcaa change defautlt timeouts 2024-04-29 15:15:56 +02:00
Jakub Trllo
86bbd24a9a use cache items in anatomy 2024-04-29 15:15:46 +02:00
Kayla Man
2059ffd742 fix the malfunctioning issue in maxscene loader 2024-04-29 21:12:03 +08:00
Jakub Trllo
734ce367fa added deprecation warnings to classes on previous location 2024-04-29 15:10:09 +02:00
Jakub Trllo
8f9ae0669d import cache items from new location 2024-04-29 15:09:15 +02:00
Jakub Trllo
32c538d5c5 copied cache items from tools to lib 2024-04-29 15:09:00 +02:00
Kayla Man
fdfdafe2dc
Merge branch 'develop' into bugfix/AY-5160_Max-The-asset-isnt-added-into-AYONOP-Data-parameter-after-rename 2024-04-29 21:07:34 +08:00
Kayla Man
5018db2f08 cosmetic fix - Jakub'scomment 2024-04-29 17:54:40 +08:00
Kayla Man
4f76ff04cc
Merge branch 'develop' into bugfix/AY-5160_Max-The-asset-isnt-added-into-AYONOP-Data-parameter-after-rename 2024-04-29 14:58:27 +08:00
Toke Jepsen
02f2381f48
Merge branch 'develop' into enhancement/maya_load_published_workfile_as_template 2024-04-29 07:58:05 +01:00
Toke Stuart Jepsen
e805338080 Merge branch 'enhancement/OP-5920_abc-options-for-Pointcache-Animation-family' of github.com:ynput/ayon-core into enhancement/AY-970_abc-options-for-Pointcache-Animation-family 2024-04-27 11:30:02 +01:00