brandon schaefer
c21fcafaaf
Fix compiler failure if compiling standalone cpp file
...
#jira UE-142766
#rb Rolando.Caloca, Andrew.Rodham
#preflight 620bbdc9483ff0ae5ebb6b00
#ROBOMERGE-AUTHOR: brandon.schaefer
#ROBOMERGE-SOURCE: CL 18995799 in //UE5/Release-5.0/... via CL 18996567 via CL 18997084
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v917-18934589)
[CL 19001172 by brandon schaefer in ue5-main branch]
2022-02-15 14:43:11 -05:00
DecoyRS
9817c8e355
PR #8780 : Merging changes from the GitHub RSCA (Contributed by DecoyRS)
...
#jira UE-139129
#preflight 61e08073341d372424e26d97
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 18602625 in //UE5/Release-5.0/... via CL 18602684 via CL 18602732
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v899-18417669)
[CL 18602782 by DecoyRS in ue5-main branch]
2022-01-13 15:05:33 -05:00
ben marsh
8a42d15dce
Missing include for version defines.
...
#preflight none
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 18579602 in //UE5/Release-5.0/... via CL 18579641 via CL 18579666
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Test -> Main) (v899-18417669)
[CL 18579688 by ben marsh in ue5-main branch]
2022-01-11 20:21:11 -05:00
DecoyRS
6721a053f3
PR #8698 : Merge RiderSourceCodeAccess changes from GitHub (Contributed by DecoyRS)
...
#jira UE-136952
#preflight 61ddfe63cd2cced7106d388a
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 18577726 in //UE5/Release-5.0/... via CL 18577749 via CL 18577780
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Test -> Main) (v899-18417669)
[CL 18577943 by DecoyRS in ue5-main branch]
2022-01-11 17:38:23 -05:00
Marc Audy
c43360f47c
Eliminate whitespace only differences between Release-Engine-Staging and Release-Engine-Test
...
#[fyi] Aurel.Cordonnier
#ushell-cherrypick of 18448630 by Marc.Audy
#preflight none
[CL 18483677 by Marc Audy in ue5-main branch]
2021-12-17 03:41:59 -05:00
aurel cordonnier
a12d56ff31
Merge from Release-Engine-Staging @ 17791557 to Release-Engine-Test
...
This represents UE4/Main @17774255, Release-5.0 @17791557 and Dev-PerfTest @17789485
[CL 17794212 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-12 21:21:22 -04:00
brandon schaefer
357cf7612b
Avoid Rider spamming log if mdfind is not installed on the system
...
Fix some coding standard issues
#jira none
#rb none
[FYI] Will.Damon, Dave.Hunter
#ROBOMERGE-SOURCE: CL 17107285 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v854-17104634)
[CL 17107317 by brandon schaefer in ue5-release-engine-test branch]
2021-08-09 16:40:37 -04:00
aurel cordonnier
dc4bf61540
Merge from Release-Engine-Staging @ 17030559 to Release-Engine-Test
...
This represents UE4/Main @ 17030256 and Dev-PerfTest @ 17030553
[CL 17031509 by aurel cordonnier in ue5-release-engine-test branch]
2021-08-03 11:56:47 -04:00
ben marsh
7427752f6c
Various UE4->UE5 renames.
...
#rb none
#jira UE-111511, UE-111448, UE-111128, UE-111287, UE-111198, UE-111657
#preflight 605b8cec0c31c10001599547
#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 15807072 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v783-15756269)
#ROBOMERGE-CONFLICT from-shelf
[CL 15813821 by ben marsh in ue5-main branch]
2021-03-24 20:52:19 -04:00
Marc Audy
9753392e2b
Merge UE5/RES CL# 15462083 to UE5/Main
...
This represents UE4/Main @ 15414221
[CL 15463811 by Marc Audy in ue5-main branch]
2021-02-18 18:13:28 -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
ada7c144fa
Merge //UE5/Release-Engine-Staging @14903491 to //UE5/Main
...
[CL 14906022 by Marc Audy in ue5-main branch]
2020-12-11 14:21:20 -04:00
Josh Adams
9753d368c9
- Disabled Rider installation discovery from doing recursive search through /Applications because it was taking _forever_ and also asking for permissions as we touch paths and maybe follow symlinks
...
#fyi joakim.lindqvist
#rb trivial
#jira UE-103790
[CL 14901305 by Josh Adams in ue5-main branch]
2020-12-10 16:39:19 -04:00
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
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
geoff evans
b658d442a1
Jira: Seeing a 1-2 second delay when opening File Menu in editor
...
Use FUProjectDictionary singleton to eliminate needless Refresh() inside DoesSolutionExist()/GetSolutionPath() queries.
The code accessors want to discover the active game project solution/project, which should exist at editor launch time. We don't need the more recent refreshes from the temporary stack instances of FUProjectDictionary.
#jira UE-96246
[CL 14283901 by geoff evans in ue5-main branch]
2020-09-09 16:34:38 -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
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
DecoyRS
d81b0a381e
PR #6858 : Fix discovery of "Rider for Unreal" version of Rider (Contributed by DecoyRS)
...
#jira UE-91974
#rb none
#ROBOMERGE-SOURCE: CL 12871389 in //UE4/Release-4.25/... via CL 12871413 via CL 12871424
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)
[CL 12871428 by ben marsh in Main branch]
2020-04-16 15:31:29 -04:00
ben marsh
cd21f932d9
PR #6659 : First version of RiderSourceCodeAccess plugin (Contributed by DecoyRS)
...
#jira
#ROBOMERGE-SOURCE: CL 11585296 via CL 11585300
#ROBOMERGE-BOT: (v654-11333218)
[CL 11585301 by ben marsh in Main branch]
2020-02-22 17:49:32 -05:00
