3 Commits

Author	SHA1	Message	Date
vincent gauthier	8b51660453	Localization: Resolving conflicting Ids in LOC macros ... #jira UE-136397 #rb none #preflight 61eebe505e0414e6ec1e5a19 #ROBOMERGE-AUTHOR: vincent.gauthier #ROBOMERGE-SOURCE: CL 18708506 in //UE5/Release-5.0/... via CL 18708530 via CL 18708683 #ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v903-18687472) [CL 18708694 by vincent gauthier in ue5-main branch]	2022-01-24 10:13:12 -05:00
Jurre deBaare	77f647df00	Reconciling difference between Main and Early-Access w.r.t CL 15851594 to prevent move/edit P4 operations ... #jira none #rb none [CL 15851764 by Jurre deBaare in ue5-main branch]	2021-03-29 11:47:13 -04:00
jurre debaare	349e585908	- Introduces UInterface for UAnimDataController and moves implementation to new AnimationDataController (editor only) module ... - Export curve types entirely for use outside of Engine - Miscellaneous small fixes from UE5 Main #rb Thomas.Sarkanen #preflight 6061973e25b98e00019ea154 #ROBOMERGE-OWNER: jurre.debaare #ROBOMERGE-AUTHOR: jurre.debaare #ROBOMERGE-SOURCE: CL 15849140 in //UE5/Release-5.0-EarlyAccess/... #ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533) #ROBOMERGE-CONFLICT from-shelf [CL 15851594 by jurre debaare in ue5-main branch]	2021-03-29 11:34:31 -04:00