Commit Graph

39 Commits

Author SHA1 Message Date
kriss gossart
0422ca7705 Skeletal Mesh - Replace the newly created GetSkeletalMesh function by GetSkeletalMeshAsset so it matches the setter SetSkeletalMeshAsset function (which itself couldn't be named SetSkeletalMesh due to the function already existing and doing something else).
#rb Josie.Yang
#preflight 62fa2afeae3edb54c979492e
#jira none

[CL 21385959 by kriss gossart in ue5-main branch]
2022-08-15 09:26:50 -04:00
jaime cifuentes
4b60c9f918 Inclusive Terminology Push
Renamed / deprecated master/slave terms at AnimationSharing
#jira UE-158501
#review @jurre.debaare
#preflight 62d143e9af68cd745b6946c6

[CL 21107806 by jaime cifuentes in ue5-main branch]
2022-07-15 06:51:45 -04:00
jaime cifuentes
7fabb99aaf Inclusive Terminology Push - Part of UE-158645, UE-158525, UE-158532
Renamed / deprecated master/slave terms at SkinnedMeshComponent and SkeletalMeshComponent (plus all the users)

#jira UE-158645, UE-158525, UE-158532
#review @thomas.sarkanen @john.vanderburg
#preflight 62ced88af324cee189e48d43
#tests Verified the properties transfer correctly after modifying them without the fix and loading the character with the component with the fix applied
#preflight 62cfc490c36afd11ef07c9ab

[CL 21088391 by jaime cifuentes in ue5-main branch]
2022-07-14 03:55:26 -04:00
charles lefebvre
6d45b2b8a1 Fix non unity build errors
#test compile cpp

#ROBOMERGE-AUTHOR: charles.lefebvre
#ROBOMERGE-SOURCE: CL 20982859 via CL 20982867 via CL 20982871
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v972-20964824)

[CL 20984620 by charles lefebvre in ue5-main branch]
2022-07-07 11:37:15 -04:00
charles lefebvre
e01cf2841b Fix includes for AnimMontage
Use UE_ENABLE_INCLUDE_ORDER_DEPRECATED_IN_5_1
#rb christopher.waters

#ROBOMERGE-AUTHOR: charles.lefebvre
#ROBOMERGE-SOURCE: CL 20975000 via CL 20975046 via CL 20978655
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v972-20964824)

[CL 20981331 by charles lefebvre in ue5-main branch]
2022-07-07 03:48:18 -04:00
Josie Yang
6b15506e58 Replace direct access to SkeletalMesh object from USkinnedMeshComponent with GetSkeletalMesh function
#rb kriss.gossart
#preflight 62aafc9ada0af39a4783930a

[CL 20686007 by Josie Yang in ue5-main branch]
2022-06-16 09:14:04 -04:00
robert manuszewski
f8a812a32f Converting hardcoded short class/enum names to pathnames ahead of ANY_PACKAGE removal
#rb trivial
#jira UE-99463
#preflight 6288fd998828ea88c8aef3d0

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 20314896 via CL 20314897 via CL 20314903 via CL 20314904
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v948-20297126)

[CL 20315214 by robert manuszewski in ue5-main branch]
2022-05-22 10:30:02 -04:00
lucas dower
3ab4f1d404 Organise anim assets into subcategories and add or fix tooltips
#jira UE-139412
#rb thomas.sarkanen
#preflight 627d322462656a7b7e31a679

[CL 20179330 by lucas dower in ue5-main branch]
2022-05-13 07:12:03 -04:00
Lauren Barnes
6248f8d412 Replacing legacy EditorStyle calls with AppStyle
#preflight 6272a74d2f6d177be3c6fdda
#rb Matt.Kuhlenschmidt

#ROBOMERGE-OWNER: Lauren.Barnes
#ROBOMERGE-AUTHOR: lauren.barnes
#ROBOMERGE-SOURCE: CL 20057269 via CL 20070159 via CL 20072035 via CL 20072203
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)
#ROBOMERGE-CONFLICT from-shelf

[CL 20105363 by Lauren Barnes in ue5-main branch]
2022-05-09 13:12:28 -04:00
Jurre deBaare
93da02c166 User is able to set a destructible mesh to a skeletal mesh asset property
#fix added DisallowedClasses metadata for UDestructibleMesh in various USkeletalMesh UProperties
#jira UE-99218
#rb Thomas.Sarkanen

[CL 16672793 by Jurre deBaare in ue5-main branch]
2021-06-15 09:23:35 -04:00
aurel cordonnier
50944fd712 Merge UE5/RES @ 16162155 to UE5/Main
This represents UE4/Main @ 16130047 and Dev-PerfTest @ 16126156

[CL 16163576 by aurel cordonnier in ue5-main branch]
2021-04-29 19:32:06 -04:00
Zousar Shaker
12d60feecc Bulk pass to address PVS warnings due to use of a TObjectPtr in the result clauses of a ternary operator.
#jira UE-107532
#jira UE-107530
#rb none

[CL 15276391 by Zousar Shaker in ue5-main branch]
2021-02-01 19:17:54 -04:00
Zousar Shaker
3b4c8fc1c5 Automated wrapped object pointer upgrade for Engine + ShooterGame + ShooterGame referenced plugins
#rb none

[CL 15224650 by Zousar Shaker in ue5-main branch]
2021-01-27 17:40:25 -04:00
Alexis Matte
73d83c6a38 To protect the skeletalmesh when using async operations like build or re-import we deprecate all public member variables of USkeletalMesh class and create the necessary getter and setter. Those member will stay public but will be move to private in a future release.
Adding a public member to USkeletalMesh class is now prohibed since it can break asynchronous operations that will be added next to this submit.

#rb danny.couture
#jira UEENT-3936
#rnx

[CL 14812920 by Alexis Matte in ue5-main branch]
2020-11-25 11:17:08 -04:00
Marcus Wassmer
3b81cf8201 Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -04:00
Jurre deBaare
ea7a43d36e Momentum: Deprecating public access to SequenceLength
+ Added SetSequenceLength
    + Moved GetPlayLength virtaul from AnimSequenceBase to AnimationAsset and deprecated GetMaxCurrentTime (only used in a single place)
#rb Martin.Wilson

[CL 14298631 by Jurre deBaare in ue5-main branch]
2020-09-11 10:31:52 -04:00
Marc Audy
7379fa99c5 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14229157
[CL 14233282 by Marc Audy in ue5-main branch]
2020-09-01 14:07:48 -04:00
brooke hubert
48113fc77e Adding EditorFramework to build.cs files
#rnx
#Jira UE-96448
#rb chris.gagnon

[CL 14114839 by brooke hubert in ue5-main branch]
2020-08-14 13:24:16 -04:00
Josh Adams
94f4be4de1 - Renamed PlatformInfo::FPlatformInfo to PlatformInfo::FTargetPlatformInfo
- Renamed FDataDrivenPlatformRegistry::FPlatformInfo to FDataDrivenPlatformInfo
- Moved some fields from PlatformInfo::FTargetPlatformInfo to FDataDrivenPlatformInfo, and cleaned them up in the process
- Fixed the DataDrivePlatformInfo.ini files to match the previous items
- Removed FVanillaPlatformEntry, and now just using FTargetPlatformInfo to manage flavors under a vanilla PlatformInfo (see PlatformInfo::GetVanillaPlatformInfoArray())
- Cleaned up TPerPlatformValue, as it was often misused (took a group and platform name, but we can get the group from the platform name) [AnimationSharingManager.cpp, *Engine.cpp, Runtime\Engine\*, ]
- Fixed FBlueprintNativeCodeGenPaths::GetDefaultCodeGenPaths() to use IniPlatformName instead of some hacky code [BlueprintNativeCodeGenManifest.cpp]
- Fixed various Turnkey bugs that recent testing exposed
- Enabled AUTOSDKS_ENABLED in both Mac and Linux on the Editor side (not that there are much set up to use it)
- Using Turnkey to get the SDK status instead of ValidatePlatforms (gives more detailed information - may want to go back to ValidatePlatforms so only UBT is needed, but change it to give more info)
- Moved OnDeviceDiscovered and Lost delegates from each platform's TargetPlatform class to a static in ITargetPlatform - there was no need for per-platform implementations
- Started working on allowing for SDK to be installed with editor running and not need to restart editor - Work in Progress! It is not usable yet.
#fyi jack.porter
#rb pete.sauerbrei

[CL 13816905 by Josh Adams in ue5-main branch]
2020-07-01 17:07:12 -04:00
jurre debaare
fe032d4d3f Fix issue causing the user being unable to create a new Animation Sharing Setup asset
#jira none
#rb trivial
#lockdown James.Golding

#ROBOMERGE-SOURCE: CL 13004257 in //UE4/Release-4.25/... via CL 13004271 via CL 13004290
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 13004304 by jurre debaare in Main branch]
2020-04-23 07:36:41 -04:00
Ryan Durand
28d3d740dd (Integrating from Dev-EngineMerge to Main)
Second batch of remaining Engine copyright updates.

#rnx
#rb none
#jira none

[CL 10871196 by Ryan Durand in Main branch]
2019-12-27 07:44:07 -05:00
jurre debaare
5aaa3a93b2 Additive animation in sharing system are not playing back correctly and fail to play when triggered in consecutive frames
#fix Make sure conditional statement does not fall through when trying to play an additive state while already in one
#fix Make sure we mark additive and slave components as ticking in the current frame whenever we setup an additive sharing instance rather than in the next frame during TickAdditiveInstances()
#misc Make debug text more useful to actually see corresponding state names as well
#rb Martin.Wilson
[REVIEW]


#ROBOMERGE-SOURCE: CL 9489676 via CL 9489677 via CL 9491760 via CL 9491790 via CL 9491818
#ROBOMERGE-BOT: (v519-9489664)

[CL 9491843 by jurre debaare in Main branch]
2019-10-09 14:59:35 -04:00
jurre debaare
a3966eb54b Error: EditCondition parsing failed: Field name "bBlendTransitions" was not found in class "AnimationSharingScalability" when viewing Use Blend Transitions in an Animation Sharing Setup
#fix Remove edit conditions as the bool has been converted to a PerPlatform property
#jira UE-76578
#rb trivial

#ROBOMERGE-SOURCE: CL 7275416 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v369-7254125)

[CL 7275419 by jurre debaare in Main branch]
2019-07-11 10:41:38 -04:00
Jurre deBaare
28d2aad171 Make sure that additive sharing skeletal mesh components follow the same path as others
#jira none
#rb Martin.Wilson

[CL 6797929 by Jurre deBaare in Dev-Anim branch]
2019-06-03 09:31:03 -04:00
marc audy
f8489b7959 Use accessors for LastRenderTime and LastRenderTimeOnScreen in preparation for them being made private
#jira
#rnx

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 6403423 via CL 6405094 via CL 6405112
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6465167 by marc audy in Dev-Anim branch]
2019-05-15 04:24:07 -04:00