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
157,157 Commits 23 Branches 254 Tags
db463b031d42484bf7ff2b057a8bf0c94dea4a9c
Commit Graph

33 Commits

Author SHA1 Message Date
Marc Audy
cac1fe0019 Merge UE5/Release-Engine-Staging @ CL# 15299266 to UE5/Main 
This represents UE4/Main @ CL# 15277572

[CL 15299962 by Marc Audy in ue5-main branch]
 2021-02-03 14:57:28 -04:00
Brice Criswell
71bff90bf4 Chaos : Destruction 
- Added Size Specific damage thresholds.

#rb none
#jira FROST-1044

[CL 15260032 by Brice Criswell in ue5-main branch]
 2021-01-29 00:35:21 -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
Jimmy Andrews
a366a918b4 fix comment on CollisionSampleFraction 
#rb brice.criswell
#rnx

[CL 15192694 by Jimmy Andrews in ue5-main branch]
 2021-01-25 19:12:43 -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
benn gallagher
3d9038cbc9 Re-added navmesh support for geometry collections. This is a naive implementation that periodically triggers nav updates on a timer rather than knowing the state of the object. Also the navigation export will push the render triangles to the navigation system until we 
#rb none
#jira
#rnx

#ROBOMERGE-SOURCE: CL 13113651 via CL 13113653 via CL 13113654
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13113657 by benn gallagher in Main branch]
 2020-04-30 07:34:59 -04:00
ori cohen
5848053e1a Added traits to chaos solver. 
#rb Benn.Gallagher

#ROBOMERGE-OWNER: ori.cohen
#ROBOMERGE-AUTHOR: ori.cohen
#ROBOMERGE-SOURCE: CL 13008565 via CL 13009980 via CL 13009981
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v683-13008971)

[CL 13009989 by ori cohen in Main branch]
 2020-04-23 13:44:21 -04:00
ryan kautzman
d07137a6e8 Reconnect ether drag properties to the simulator for geometry collections. Move linear and angular ether drag properties from the GeometryCollectionComponent to UChaosPhysicalMaterial. Add static (angular) friction propterty to UChaosPhysicalMaterial. 
[FYI] Benn.Gallagher, Michael.Lentine
#rb: none
#jira: none

#ROBOMERGE-OWNER: ryan.kautzman
#ROBOMERGE-AUTHOR: ryan.kautzman
#ROBOMERGE-SOURCE: CL 12915012 in //UE4/Release-4.25/... via CL 12915022 via CL 12915954
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12915962 by ryan kautzman in Main branch]
 2020-04-20 04:54:20 -04:00
bill henderson
a6609977e8 Chaos: Fixes to get event demo level working again 
#rb none
#jira nojira

#ROBOMERGE-SOURCE: CL 12719657 in //UE4/Release-4.25/... via CL 12721825 via CL 12781713
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12782529 by bill henderson in Main branch]
 2020-04-14 13:39:39 -04:00
ori cohen
3d3769b711 IWYU changes 
#rb none

#ROBOMERGE-OWNER: ori.cohen
#ROBOMERGE-AUTHOR: ori.cohen
#ROBOMERGE-SOURCE: CL 12673540 via CL 12673589 via CL 12673595 via CL 12673596
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12673600 by ori cohen in Main branch]
 2020-04-08 10:59:25 -04:00
ori cohen
22879e453d Remove chaos include guard macros 
#rb none

#ROBOMERGE-SOURCE: CL 12672568 via CL 12672588 via CL 12672602 via CL 12672607
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12672626 by ori cohen in Main branch]
 2020-04-08 10:19:29 -04:00
ori cohen
e4a7a7d199 Add temp guards for chaos header includes 
[FYI] Chris.Caulfield
#rb none

#ROBOMERGE-SOURCE: CL 12558640 via CL 12558650 via CL 12558752 via CL 12558774 via CL 12560025
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12560214 by ori cohen in Main branch]
 2020-04-02 14:18:06 -04:00
ori cohen
7ad6a77aa7 Add lvl1 header include (result of script) 
#rb none

#ROBOMERGE-OWNER: ori.cohen
#ROBOMERGE-AUTHOR: ori.cohen
#ROBOMERGE-SOURCE: CL 12510784 via CL 12510899 via CL 12510908 via CL 12510913
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12510925 by ori cohen in Main branch]
 2020-04-01 16:28:03 -04:00
robomerge
b8b2f3d0e9 CIS fix 
#rb none
#jira

#ROBOMERGE-SOURCE: CL 12064121 in //UE4/Release-4.25/... via CL 12064124
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v657-12064184)

[CL 12076632 by robomerge in Main branch]
 2020-03-09 13:23:05 -04:00
robomerge
25ce51a063 Hooked up geometry collection to new SQ structures. GT dynamic collection now attached a TGeometryParticle array to store external geometry and transform for queries. Rotated Geometry Collection DDC key to fix previous serialization breakage. 
#rb none
#jira
[FYI] Ryan.Kautzman, Brice.Criswell

#ROBOMERGE-SOURCE: CL 12063680 in //UE4/Release-4.25/... via CL 12063684
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v657-12064184)

[CL 12076570 by robomerge in Main branch]
 2020-03-09 13:22:54 -04:00
brice criswell
20a8922d88 Chaos : Destruction 
- Moved the DynamicCollections into ChaosSolvers
#rb none
#jira nojira

#ROBOMERGE-SOURCE: CL 11888120 in //UE4/Release-4.25/... via CL 11888207
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11888232 by brice criswell in Main branch]
 2020-03-03 16:56:59 -05:00
ryan kautzman
f51050e90e Merge 11447502 to Release-4.24. 
Add error checking and reporting for level set generation and geometry collection collision shape initialization.

[FYI] Michael.Lentine, Devon.Penney, Brice.Criswell
#rb: none
#jira: none

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

[CL 11579507 by ryan kautzman in Main branch]
 2020-02-21 17:41:35 -05:00
Ryan Kautzman
4e412aabdd Merge 11257801 to Release-4.25. 
Get clustering building with handles - preliminary checkin.

[FYI] Michael.Lentine
#rb: none
#jira: none

#ROBOMERGE-OWNER: Ryan.Kautzman
#ROBOMERGE-AUTHOR: ryan.kautzman
#ROBOMERGE-SOURCE: CL 11555717 in //UE4/Release-4.25/... via CL 11555721
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11579493 by Ryan Kautzman in Main branch]
 2020-02-21 17:40:37 -05:00
Josh Adams
aa9705149b Copying Private-LoadTimes-4.24 stream to Main. Biggest changes are in Materials/Shader memory freezing. 
#rb none

[CL 11282608 by Josh Adams in Main branch]
 2020-02-06 13:13:41 -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
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
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