Commit Graph

31 Commits

Author SHA1 Message Date
jurre debaare
ce610e8b23 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

#ROBOMERGE-SOURCE: CL 16672793 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v835-16672529)

[CL 16672799 by jurre debaare in ue5-release-engine-test branch]
2021-06-15 09:24:02 -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
michael noland
9756461b45 Quick pass at some plugin category clean up
- Moved various things from "Programming" and "Blueprints" to more domain-specific categories
- Merged "Media" and "Movie Players" into "Media Players"
- Merged "Automation" into "Testing"
- Merged "Widgets" and "Web" into "UI"
etc...
[FYI] brooke.hubert
#jira UE-106862

#ROBOMERGE-SOURCE: CL 15390321 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15390329 by michael noland in ue5-main branch]
2021-02-11 14:59:10 -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
jurre debaare
2b3e3e1c3d Make sure that condition for failing to set up animation sharing instances takes into account whether or not it is an additive one
#rb trivial

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: jurre.debaare
#ROBOMERGE-SOURCE: CL 5937539 via CL 5955775 via CL 5955936
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5962104 by jurre debaare in Dev-Anim branch]
2019-04-17 21:01:10 -04:00
guillaume guay
28bcf90264 Fix for crash with AnimInstanceSharing, the resource was not flagged as UPROPERTY and got deleted while we still had a native pointer to it, becoming garbage.
Should fix bugs with callstack ending with:
E4Editor-AnimationSharing.dll!UAnimSharingStateInstance::GetInstancedActors(TArray<AActor *,FDefaultAllocator> & Actors) Line 20   C++

#cr jurre.debarre, maxime.mercier
#rnx

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: guillaume.guay
#ROBOMERGE-SOURCE: CL 5935948 via CL 5936084 via CL 5936126
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5949643 by guillaume guay in Dev-Anim branch]
2019-04-17 14:01:43 -04:00
urias rooney
37ccaf50f9 Fixed extra synchronous loads in animation sharing
[FYI] bob.tellez

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: urias.rooney
#ROBOMERGE-SOURCE: CL 5635124 via CL 5635125 via CL 5635126 via CL 5639482 via CL 5640746 via CL 5640841
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5642437 by urias rooney in Dev-Anim branch]
2019-03-28 21:03:53 -04:00
jurre debaare
cbe66d0991 //UE4/Release-4.22 - Run Incremental Automated Tests Win64 - Screenshot 'AnimationSharing_Debug' test failed, Screenshots were different
#jira UE-71460
#rb trivial

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: jurre.debaare
#ROBOMERGE-SOURCE: CL 5396901 in //UE4/Release-4.22/... via CL 5396902
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5409880 by jurre debaare in Dev-Anim branch]
2019-03-15 05:25:19 -04:00
jurre debaare
e70c49e35e - Crash entering PIE when first Anim Sharing state is disabled - Assertion failed: (Index >= 0) & (Index < ArrayNum)
- Crash during PIE when two Anim Sharing states define the same state - Assertion failed: Components.IsValidIndex(PermutationIndex)
- Ensure entering PIE when Anim Sharing state has no Anim Sequence

#fix Made initialization stage for Animation Sharing more error-resistant and outright fail to set up if we encounter any errors
#jira UE-71300, UE-71303, UE-71301
#rb none

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: jurre.debaare
#ROBOMERGE-SOURCE: CL 5369493 in //UE4/Release-4.22/... via CL 5369498
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5381984 by jurre debaare in Dev-Anim branch]
2019-03-13 10:06:05 -04:00
Thomas Sarkanen
bb193db1aa Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 5356908
#rb none

[CL 5360337 by Thomas Sarkanen in Dev-Anim branch]
2019-03-11 12:18:32 -04:00
zach bethel
636b8fad9c Fixed unsigned overflow of NumRandomizedInstances for animation. Negative values are now bound to 1.
#jira UE-70229
#rb Rolando.Caloca

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: zach.bethel
#ROBOMERGE-SOURCE: CL 5094935 in //UE4/Release-4.22/... via CL 5094939
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5145189 by zach bethel in Dev-Anim branch]
2019-02-22 11:35:15 -05:00
Marc Audy
e5610adfd8 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ 4802313
#rb
#rnx
#lockdown Laurent.Delayen

[CL 4803512 by Marc Audy in Dev-Anim branch]
2019-01-24 15:32:49 -05:00