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
Zousar Shaker
77d13185b7
Copying //UE5/Dev-Cooker@14539516 to Main (//UE5/Main)
...
[CL 14539954 by Zousar Shaker in ue5-main branch]
2020-10-21 17:56:05 -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
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
Rex Hill
b499a388b7
Fix a thread safety issue in perforce integration
...
#jira UE-95729
#rb lauren.barnes
[CL 13924176 by Rex Hill in ue5-main branch]
2020-07-22 11:56:24 -04:00
Matt Kuhlenschmidt
33c1f3ae03
Fix perforce connection icon not appering correctly if a server and credentials are specified but the server cannot be contacted.
...
#rb none
[CL 13276118 by Matt Kuhlenschmidt in ue5-main branch]
2020-05-12 09:33:58 -04:00
smallshake
86a6bb28c5
Copying from Dev-Editor
...
PR #6608 : Perforce Plugin: Use -P4Passwd cmd argument value when connecting to Perforce. (Contributed by smallshake)
#rb jason.stasik,ben.marsh
#jira UE-87467
#ROBOMERGE-SOURCE: CL 11588961 in //UE4/Release-4.25/... via CL 11588966
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)
[CL 11589146 by robomerge in Main branch]
2020-02-24 13:31:04 -05:00
JeanMichel Dignard
70d074639f
Merging //UE4/Dev-Main @ 10886849 to Dev-Tools-Staging (//UE4/Dev-Tools-Staging)
...
#rb none
#rnx
[CL 10906274 by JeanMichel Dignard in Dev-Tools-Staging branch]
2020-01-08 13:26:18 -05:00
Ryan Durand
28d3d740dd
(Integrating from Dev-EngineMerge to Main)
...
Second batch of remaining Engine copyright updates.
#rnx
#rb none
#jira none
[CL 10871196 by Ryan Durand in Main branch]
2019-12-27 07:44:07 -05:00
Chris Gagnon
346a4b05ea
Copy up from Dev-Editor @10681378
...
#rb none
[CL 10837446 by Chris Gagnon in Dev-Tools-Staging branch]
2019-12-19 18:07:47 -05:00
josh engebretson
58aa6c2f9f
Content browser, owner record branch change if mod time is newer
...
#rnx
#ROBOMERGE-SOURCE: CL 10600894 via CL 10600897 via CL 10600899
#ROBOMERGE-BOT: (v607-10590470)
[CL 10600907 by josh engebretson in Main branch]
2019-12-06 17:24:18 -05:00
josh engebretson
fd338bb294
Content browser status, filter delete operations (mod time 0) when content has been readded via branch/etc
...
#rnx
#ROBOMERGE-SOURCE: CL 10595988 via CL 10595995 via CL 10596000
#ROBOMERGE-BOT: (v607-10590470)
[CL 10596004 by josh engebretson in Main branch]
2019-12-06 14:48:56 -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
Rex Hill
b691fb5cd7
Perforce source control provider now detects login expiration and displays error status in level editor toolbar
...
#jira UE-80726
#rb laruen.barnes
[CL 9393092 by Rex Hill in Dev-Editor branch]
2019-10-03 11:22:27 -04:00
Ben Marsh
a0fb80ecf9
Disable source control plugins at runtime.
...
#rb none
#rnx
[CL 8393016 by Ben Marsh in Dev-Build branch]
2019-08-31 14:57:19 -04:00
chris gagnon
72ba51c5bd
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.23 From CL 6837861
...
#rb none
#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 6838042 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v366-6836689)
[CL 6874679 by chris gagnon in Dev-Build branch]
2019-06-07 05:27:42 -04:00
ben marsh
a2ef3b4f8f
Set the program name for UE4-initiated Perforce connections.
...
#rb none
#jira
#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5240220 in //UE4/Release-4.22/... via CL 5240223
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)
[CL 5252072 by ben marsh in Dev-Build branch]
2019-02-28 17:50:25 -05:00
lauren ridge
ada028f35e
Fix for SCC dialog popping up when messages should be suppressed when adding actors to checked out levels
...
#rb Rex.Hill
#rnx
#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: lauren.ridge
#ROBOMERGE-SOURCE: CL 5228442 via CL 5229358 via CL 5233465
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)
[CL 5250011 by lauren ridge in Dev-Build branch]
2019-02-28 17:35:48 -05:00
Ben Marsh
0f79d0e564
Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
...
#rb none
#rnx
[CL 4979967 by Ben Marsh in Dev-Build branch]
2019-02-12 21:08:26 -05:00
Ben Marsh
a3e87004d6
Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
...
#rb none
#rnx
[CL 4783611 by Ben Marsh in Dev-Build branch]
2019-01-23 10:59:53 -05:00
Ben Marsh
129aac0526
Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
...
#rb none
#rnx
[CL 4706788 by Ben Marsh in Dev-Build branch]
2019-01-10 20:03:35 -05:00
Ben Marsh
c09b6d7f18
Merge from //UE4/Main.
...
#rb none
#rnx
[CL 4701155 by Ben Marsh in Dev-Build branch]
2019-01-10 11:10:29 -05:00
Ben Marsh
530369c613
Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
...
#rb none
#rnx
[CL 4662695 by Ben Marsh in Dev-Build branch]
2018-12-14 14:49:12 -05:00
Ben Marsh
b0da1f4fe7
Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
...
#rb none
[CL 4577636 by Ben Marsh in Dev-Build branch]
2018-11-19 10:12:17 -05:00
Marc Audy
af90b7bcd4
Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main) @ 4395008
...
#rb
#rnx
#lockdown Nick.Penwarden
[CL 4395058 by Marc Audy in Main branch]
2018-09-25 10:11:35 -04:00
