Commit Graph

104 Commits

Author SHA1 Message Date
Lauren Barnes
6248f8d412 Replacing legacy EditorStyle calls with AppStyle
#preflight 6272a74d2f6d177be3c6fdda
#rb Matt.Kuhlenschmidt

#ROBOMERGE-OWNER: Lauren.Barnes
#ROBOMERGE-AUTHOR: lauren.barnes
#ROBOMERGE-SOURCE: CL 20057269 via CL 20070159 via CL 20072035 via CL 20072203
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)
#ROBOMERGE-CONFLICT from-shelf

[CL 20105363 by Lauren Barnes in ue5-main branch]
2022-05-09 13:12:28 -04:00
Matt Peters
7ad238a806 AssetRegistry includes (Engine/Source): change #include "AssetData.h" -> #include "AssetRegistry/AssetData.h", and similar for the other moved AssetRegistry headers.
#rb Zousar.Shaker
#rnx
#preflight 6270509a220f89f0ad573030

[CL 20016982 by Matt Peters in ue5-main branch]
2022-05-02 18:06:48 -04:00
Dan Thompson
21d31ddd15 Fix for crash when auditing static meshes with no static lighting enabled.
#jira UE-147997
#rb trivial
#preflight 6269c3892d28b9d0f75e74b0

[CL 19949306 by Dan Thompson in ue5-main branch]
2022-04-27 18:51:38 -04:00
christopher waters
f70db987e8 Fixing shader cooker stats showing the wrong shader format names. PlatformNames is indexed by SP_ enum so we have to put each format at the correct index. Also uses the DDSPI to determine if a format is valid to display at all.
#jira none
#rb arciel.rekman, jason.nadro, lukas.hermanns, mihnea.balta
#preflight 61eae841ea0da8133dcf48e3

[CL 18692180 by christopher waters in ue5-main branch]
2022-01-21 13:24:09 -05:00
Marc Audy
0c3be2b6ad Merge Release-Engine-Staging to Test @ CL# 18240298
[CL 18241953 by Marc Audy in ue5-release-engine-test branch]
2021-11-18 14:37:34 -05:00
aurel cordonnier
a6e741e007 Merge from Release-Engine-Staging @ 17915896 to Release-Engine-Test
This represents UE4/Main @17911760, Release-5.0 @17915875 and Dev-PerfTest @17914035

[CL 17918595 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-25 20:05:28 -04:00
aurel cordonnier
7f517562d5 Merge from Release-Engine-Staging @ 17438845 to Release-Engine-Test
This represents UE4/Main @17430120 and Dev-PerfTest @17437669

[CL 17439044 by aurel cordonnier in ue5-release-engine-test branch]
2021-09-06 12:23:53 -04:00
danny couture
25c6066c53 Prepare for the deprecation of direct access to the Resource member of UTexture in favor of the GetResource() accessor.
#rb Francis.Hurteau
#preflight 609e5182ef86d30001ad0a18
#rnx

#ROBOMERGE-SOURCE: CL 16328103 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v804-16311228)

[CL 16328107 by danny couture in ue5-release-engine-test branch]
2021-05-14 07:17:49 -04:00
daren cheng
194425e479 Remove UE4 references.
#jira UE-111737 UE-111741 UE-111752 UE-111848
#rb trivial
#robomerge Release-5.0-EarlyAccess

[CL 15789512 by daren cheng in ue5-main branch]
2021-03-23 21:05:23 -04:00
jeanfrancois dube
3423e4cacf Fix PrimitiveStatsGenerator::IsInVisibleLevel to support external actors.
#rb patrick.enfedqaue

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

[CL 15472219 by jeanfrancois dube in ue5-main branch]
2021-02-19 11:59:47 -04:00
Marc Audy
bc88b73a29 Merge Release-Engine-Staging to Main @ CL# 15151250
Represents UE4/Main @ 15133763

[CL 15158774 by Marc Audy in ue5-main branch]
2021-01-21 16:22:06 -04:00
Marc Audy
bf80889353 UE5/Release-Engine-Staging to UE5/Main
This represents UE4/Main up to CL# 14958402

[CL 15028197 by Marc Audy in ue5-main branch]
2021-01-08 19:56:07 -04:00
Andrew Davidson
10bca5261b Double math ambiguity Engine fixes
#rb jeanfrancois.dube, trivial

[CL 14974758 by Andrew Davidson in ue5-main branch]
2021-01-04 07:59:22 -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
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
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
Matt Kuhlenschmidt
603a4119c5 Fix HAL/PlatformFileManager.h non-portable casing CIS issues
#rb none

[CL 13214257 by Matt Kuhlenschmidt in ue5-main branch]
2020-05-06 17:58:18 -04:00
james hopkin
83aaac7c0f Fix two crashes in ShaderCookerStats when no stats are yet available
#rb none


#ROBOMERGE-OWNER: james.hopkin
#ROBOMERGE-AUTHOR: jonas.meyer
#ROBOMERGE-SOURCE: CL 11302716 via CL 11302882 via CL 11302883 via CL 11302884
#ROBOMERGE-BOT: (v649-11301724)

[CL 11302885 by james hopkin in Main branch]
2020-02-10 05:01:22 -05:00
ryan durand
627baf970a Updating copyright for Engine Editor.
#rnx
#rb none


#ROBOMERGE-SOURCE: CL 10869241 via CL 10869527 via CL 10869904
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870586 by ryan durand in Main branch]
2019-12-26 15:33:43 -05:00
jonas meyer
c0eb40cc4b Support for shadercategories, for shader cook statistics.
Add Compiletime stat
Add some tooltips
#rb ben.salem, rolando.caloca


#ROBOMERGE-SOURCE: CL 10808389 via CL 10808392
#ROBOMERGE-BOT: (v610-10636431)

[CL 10808393 by jonas meyer in Main branch]
2019-12-19 05:37:56 -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
jonas meyer
4c43a67f07 dont crash shadercookstats on deprecated shader platforms.
#rb none


#ROBOMERGE-SOURCE: CL 10647417 via CL 10647418
#ROBOMERGE-BOT: (v609-10634694)

[CL 10647419 by jonas meyer in Main branch]
2019-12-11 08:38:46 -05:00
marc audy
dbcf07a558 Use new inline versions of substring functions
Fix up nearby cases where ESearchCase::CaseSensitive should have been used
#jira
#rnx
#rb

#ROBOMERGE-OWNER: marc.audy
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 10309793 via CL 10309818
#ROBOMERGE-BOT: (v593-10286020)

[CL 10309932 by marc audy in Main branch]
2019-11-19 13:27:07 -05:00
ben salem
6b61d81912 add more explicit includes in an attempt to make non unity happy.
#JIRA UE-84683


#ROBOMERGE-SOURCE: CL 10309290 via CL 10309292
#ROBOMERGE-BOT: (v593-10286020)

[CL 10309293 by ben salem in Main branch]
2019-11-19 12:32:01 -05:00
ben salem
f653ec02ed Fix incremental compile issue
#JIRA UE-84683


#ROBOMERGE-SOURCE: CL 10307043 via CL 10307049
#ROBOMERGE-BOT: (v593-10286020)

[CL 10307051 by ben salem in Main branch]
2019-11-19 09:32:03 -05:00