izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity
154,360 Commits 23 Branches 254 Tags
08b036dc978c1904bca0379eb643a0d1521fefee
Commit Graph

211 Commits

Author SHA1 Message Date
Marc Audy
a7f9391231 Merge UE5/Release-Engine-Staging @ 14811410 to UE5/Main 
This represents UE4/Main @ 14768117

For ReleaseObjectVersion.h
#lockdown Marcus.Wassmer

[CL 14811440 by Marc Audy in ue5-main branch]
 2020-11-24 18:42:39 -04:00
jose villarroel
3b7d2ea62e -Added Blend Profile mode selection to blend profile picker. 
-Added option to blend profile picker for blend mask creation.
-Fixed issue w/ Blend profile picker sometimes showing in non-standalone mode outside of skeleton editor.
-Fixed issue w/ reset to default w/ blend profiles.
-Added blend mask mode to layered blend per bone node
#jira UE-101586
#review-14761881 @Aaron.Cox, @John.VanDerBurg, @Thomas.Sarkanen

[CL 14798723 by jose villarroel in ue5-main branch]
 2020-11-20 15:02:56 -04:00
Mike Zyracki
232b5b5868 Sequencer: NLA fix for child bone rotations 
#jira UE-102043
#rb max.chen

[CL 14594328 by Mike Zyracki in ue5-main branch]
 2020-10-27 19:09:18 -04:00
Marc Audy
4c1bb11c29 Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662 
This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck

[CL 14551026 by Marc Audy in ue5-main branch]
 2020-10-22 19:19:16 -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
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
Marc Audy
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166 
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
 2020-08-11 01:36:57 -04:00
Michal Valient
95d19f95b1 [REVERB] Merging //UE4/Private-Reverb-Development@13832732 
#rb graham.wihlidal, rune.stubbe, brian.karis, andrew.lauritzen, jeff.farris

[CL 13834854 by Michal Valient in ue5-main branch]
 2020-07-06 18:58:26 -04:00
Marc Audy
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main) 
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
 2020-06-23 18:40:00 -04:00
chris caulfield
7e695d7310 Chaos - RBAN remove anim node solver iteration overrides 
#rb none

#ROBOMERGE-SOURCE: CL 13076180 via CL 13076183 via CL 13076187 via CL 13076189
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13076190 by chris caulfield in Main branch]
 2020-04-29 18:50:37 -04:00
chris caulfield
1737ea3cf3 Chaos - RBAN: avoid some nastiness with world-space sime when scale goes to zero 
#rb none

#ROBOMERGE-SOURCE: CL 12985866 via CL 12985867 via CL 12985871 via CL 12985874
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12985878 by chris caulfield in Main branch]
 2020-04-22 20:21:14 -04:00
mike zyracki
9833a94abd Sequencer: Need to make sure we re-Construct the Animation Sequence Nodes when entering a section since it may have been changed to a pose snapshot node. Also made sure ConstructNodes really just sets them up lightly since it's used by both SequencerInst/ControlRigInst. 
#jira UE-87806
#rb max.chen

#ROBOMERGE-SOURCE: CL 11446379 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)

[CL 11446390 by mike zyracki in 4.25-Plus branch]
 2020-02-14 13:57:22 -05:00
Stefan Boberg
55a8b15f1f Copying //UE4/Dev-Core to Main (//UE4/Main) 
#rb none

[CL 11258477 by Stefan Boberg in Main branch]
 2020-02-05 14:26:36 -05:00
Thomas Sarkanen
de2be528ca Copying //UE4/Dev-Anim to Dev-Main (//UE4/Dev-Main) 
#rb none
#lockdown nick.penwarden

[CL 11214797 by Thomas Sarkanen in Main branch]
 2020-02-04 11:06:23 -05:00
PJ Kack
3a9ca4d2f9 Merging //UE4/Main @ 11112898 to //UE4/Dev-Core (dev-core-l0178) 
#rb none

(ushell-p4-mergedown)

[CL 11113592 by PJ Kack in Dev-Core branch]
 2020-01-26 11:33:22 -05:00
chris caulfield
a050f25d77 Chaos - fix AnimNode_RigidBody_Chaos to match regular version after iterations changes. 
#rb none


#ROBOMERGE-SOURCE: CL 11091160 via CL 11091161 via CL 11091162 via CL 11091163
#ROBOMERGE-BOT: (v640-11091645)

[CL 11093023 by chris caulfield in Main branch]
 2020-01-23 10:16:11 -05:00
Lina Halper
44c1bb3292 COPY from //Dev-Anim to //Dev-Main 
#rb: none
#fyi: Laurent.Delayen, Thomas.Sarkanen

[CL 11088765 by Lina Halper in Main branch]
 2020-01-22 17:58:55 -05:00
chris caulfield
551634399c Chaos 
- expose RBAN iteration counts in PhAt, RBAN and blueprint
- hook up physics materials
- adjust default line thickness

[FYI] ori.cohen,benn.gallagher
#rb none


#ROBOMERGE-SOURCE: CL 11060506 via CL 11060509 via CL 11061546 via CL 11061564
#ROBOMERGE-BOT: (v637-11041722)

[CL 11061581 by chris caulfield in Main branch]
 2020-01-18 20:07:46 -05:00
Thomas Sarkanen
1aa82a07db Moved skeletal mesh & component traces to use the new array API 
Also removed initialization functions as they are no longer needed with channels

#rb Jurre.deBaare

[CL 11042967 by Thomas Sarkanen in Dev-Core branch]
 2020-01-17 09:27:20 -05:00
chris caulfield
5e6b30ad7f Chaos 
- remove Cholesky solver calling code
- rename Chaos collision and joint stats
- add drag handles to RBAN editing in PhAt

#rb none


#ROBOMERGE-SOURCE: CL 10995456 via CL 10995464 via CL 10995468 via CL 10995475
#ROBOMERGE-BOT: (v633-10983880)

[CL 10995481 by chris caulfield in Main branch]
 2020-01-15 13:57:18 -05:00
Ryan Durand
54168a659e Updating more copyrights to remove years. 
#rnx
#rb none
#jira none

[CL 10898929 by Ryan Durand in Main branch]
 2020-01-07 17:07:47 -05:00
ryan durand
0f0464a30e Updating copyright for Engine Runtime. 
#rnx
#rb none


#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869210 via CL 10869511 via CL 10869900
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870549 by ryan durand in Main branch]
 2019-12-26 14:45:42 -05:00
chris caulfield
5ca6ab385e Chaos - hack in Poke force in PhAt 
#rb none


#ROBOMERGE-SOURCE: CL 10837680 via CL 10841173 via CL 10843458 via CL 10843562
#ROBOMERGE-BOT: (v610-10636431)

[CL 10843725 by chris caulfield in Main branch]
 2019-12-19 23:33:50 -05:00
Robert Manuszewski
7b6f840f7f Copying //UE4/Dev-Core @ 10708550 to Dev-Main (//UE4/Dev-Main) 
#rb none

[CL 10708666 by Robert Manuszewski in Main branch]
 2019-12-13 11:07:03 -05:00
andrew ladenberger
36ebdf12a9 Added SkeletalMeshComponent option to disable rigid body anim nodes. Enables more selective rban use to save on memory and anim init time for distant meshes. 
#rb jordan.cristiano, chris.caulfield, thomas.sarkanen
[FYI] ben.woodhouse, chris.bunner


#ROBOMERGE-SOURCE: CL 9603884 via CL 9603950 via CL 9603954
#ROBOMERGE-BOT: (v526-9587114)

[CL 9604203 by andrew ladenberger in Main branch]
 2019-10-15 16:08:35 -04:00