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
105,509 Commits 23 Branches 254 Tags
7b6f840f7f2ec201fff4db73cdf9de07842d2f61
Commit Graph

22 Commits

Author SHA1 Message Date
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
michael lentine
ec8aeb4cd9 Fix fields for geometry collections. 
#rb Benn.Gallagher, Ryan.Kautzman
#jira ue-84808
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: michael.lentine
#ROBOMERGE-AUTHOR: michael.lentine
#ROBOMERGE-SOURCE: CL 10479354 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v605-10478255)

[CL 10479364 by michael lentine in Main branch]
 2019-11-28 23:50:13 -05:00
Benn Gallagher
d118912346 Fixed collisions on geometry collections and make them exist in the actual world solver so they can interact. 
#rb none
#jira UE-84918
#lockdown nick.penwarden

#ROBOMERGE-OWNER: Benn.Gallagher
#ROBOMERGE-AUTHOR: benn.gallagher
#ROBOMERGE-SOURCE: CL 10367302 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v594-10333955)

[CL 10367316 by Benn Gallagher in Main branch]
 2019-11-22 05:24:36 -05:00
benn gallagher
2633bedd01 Reimplemented detecting when an object should go dynamic for geometry collections 
Push the correct results out to the scene proxy
Fixed crash handling game->phys data transition
#rb none
#jira UE-84804
#lockdown nick.penwarden

#ROBOMERGE-SOURCE: CL 10321979 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v593-10286020)

[CL 10321985 by benn gallagher in Main branch]
 2019-11-20 13:24:55 -05:00
ryan kautzman
a8b88645a9 Hacking at GeometryCollection debug drawing, trying to replace the int32 rigid body id with a FGuid. It's not there yet, but this change gets things building. 
[FYI] Brice.Criswell, Michael.Lentine
#rb: Brice.Criswell
#jira: none

#ROBOMERGE-SOURCE: CL 10089571 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v574-10069753)

[CL 10090379 by ryan kautzman in Main branch]
 2019-11-08 19:47:41 -05:00
Benn Gallagher
ea08a4feb7 Removed T from TChaosPhysicsMaterial. Rename to FChaosPhysicsMaterial. Clean up old code in Defines.h 
#rb none
#jira


#ROBOMERGE-OWNER: Benn.Gallagher
#ROBOMERGE-AUTHOR: benn.gallagher
#ROBOMERGE-SOURCE: CL 10054737 via CL 10054742 via CL 10054751
#ROBOMERGE-BOT: (v565-10026848)

[CL 10054933 by Benn Gallagher in Main branch]
 2019-11-06 08:55:27 -05:00
michael lentine
acbc579509 Copy from //Fortnite/Dev-Physics 
#rb none


#ROBOMERGE-OWNER: michael.lentine
#ROBOMERGE-AUTHOR: michael.lentine
#ROBOMERGE-SOURCE: CL 9374650 via CL 9374665
#ROBOMERGE-BOT: (v456-9359915)

[CL 9385990 by michael lentine in Main branch]
 2019-10-02 17:27:26 -04:00
Michael Lentine
8c9b69ff63 Fix endplay signature 
#rb none
#jire ue-80235

[CL 8696062 by Michael Lentine in Main branch]
 2019-09-16 13:42:25 -04:00
marc audy
bfe200fee4 Fixup engine code misusing GetComponentsByClass 
#jira UE-79819
#rnx


#ROBOMERGE-SOURCE: CL 8503325 via CL 8503764
#ROBOMERGE-BOT: (v406-8472469)

[CL 8509323 by marc audy in Main branch]
 2019-09-05 15:45:24 -04:00
Michael Lentine
e1323af3e6 Fix CIS. 
#rb none
#jira ue-78210

[CL 8091463 by Michael Lentine in Main branch]
 2019-08-16 11:28:08 -04:00
Benn Gallagher
3a4873ef60 Copying //UE4/Dev-Physics to Dev-Main (//UE4/Dev-Main) @ 7703071 
#rb
#rnx

[CL 7705805 by Benn Gallagher in Main branch]
 2019-08-02 09:01:58 -04:00
eric soulvie
2a45377720 wrap FColorEdit with WITH_EDITOR #jira UE-77821 #rb trivial 
#ROBOMERGE-SOURCE: CL 7610192 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v372-7473910)

[CL 7610195 by eric soulvie in Main branch]
 2019-07-24 13:04:02 -04:00
eric soulvie
a06b83370e BoneSelection and Highlighted bones reset on GC Componenet registration. 
Fixed some metadata capitalization.
#jira UE-76699
#rb none
[FYI] michael.lentine

#ROBOMERGE-SOURCE: CL 7575261 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v372-7473910)

[CL 7575285 by eric soulvie in Main branch]
 2019-07-23 16:27:55 -04:00
max whitehead
b2689bc175 Reduce code paths that rebuild GeometryCollection levelset in Fracture Editor. 
#jira UE-76746
#rb none

#ROBOMERGE-SOURCE: CL 7476926 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v372-7473910)

[CL 7476928 by max whitehead in Main branch]
 2019-07-22 14:27:12 -04:00
devon penney
0f33fec49b GeometryCollection Cache improvements 
- fixed removal of internal faces for non-started caches (GeometryCollection must be static, though)
- fixed behavior of skipping ahead in cache
- fixed rewinding cache in Sequencer editor
#rb none #JIRA 77411

#ROBOMERGE-SOURCE: CL 7328943 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v371-7306989)

[CL 7328944 by devon penney in Main branch]
 2019-07-16 19:12:32 -04:00
kriss gossart
0de0f332ec Fix multiple successive crashes when a geometry collection is created in SIE due to a missing DynamicCollection transform array update. 
#jira UE-76237
#rb Benn.Gallagher

#ROBOMERGE-SOURCE: CL 7106177 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7106178 by kriss gossart in Main branch]
 2019-06-20 12:19:58 -04:00
devon penney
6156e5012c fixed bug with invisible GCs 
#rb none
#JIRA 73915

#ROBOMERGE-SOURCE: CL 7059630 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7059631 by devon penney in Main branch]
 2019-06-17 19:58:42 -04:00
Michael Lentine
f9b3324b32 Copying //UE4/Dev-Physics to Dev-Main (//UE4/Dev-Main) @ 6903150 
#rb none
#rnx

[CL 6903163 by Michael Lentine in Main branch]
 2019-06-08 17:15:34 -04:00
rolando caloca
2b8c415f74 UE4.22 - Remove almost all of ENQUEUE_UNIQUE_RENDER_COMMAND_TWOPARAMETER 
#rb none
#jira
#rnx

#ROBOMERGE-OWNER: rolando.caloca
#ROBOMERGE-AUTHOR: rolando.caloca
#ROBOMERGE-SOURCE: CL 5054105 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5054376 by rolando caloca in Main branch]
 2019-02-18 18:35:01 -05:00
Rolando Caloca
cea6ceff5a Unshelved from pending changelist '4932645': 
#CodeReview: rolando.caloca,ben.marsh,cristina.riveron,nick.bullard,nick.penwarden

Merge conflict.
rolando.caloca, please merge this change by hand.
More info at https://robomerge.epicgames.net#RELEASE

/src/ROBOMERGE_RELEASE_Main/Engine/Plugins/FX/Niagara/Source/Niagara/Private/NiagaraEmitterInstanceBatcher.cpp - merging //UE4/Release-4.22/Engine/Plugins/FX/Niagara/Source/Niagara/Private/NiagaraEmitterInstanceBatcher.cpp#2


--------------------------------------
UE4.22 - Deprecate ENQUEUE_UNIQUE_RENDER_COMMAND_THREEPARAMETER
#rb none
#jira

#ROBOMERGE-SOURCE: CL 4932643 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4932685 by Rolando Caloca in Main branch]
 2019-02-07 10:35:08 -05:00
Ben Marsh
7598af0532 Update copyright notices to 2019. 
#rb none
#lockdown Nick.Penwarden

[CL 4662404 by Ben Marsh in Main branch]
 2018-12-14 13:41:00 -05:00
Michael Lentine
ea5ca985d4 Copying //UE4/Dev-Physics to //UE4/Dev-Main. 
#rb none
#lockdown Nick.Penwarden

[CL 4653110 by Michael Lentine in Main branch]
 2018-12-12 11:25:29 -05:00