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
Chris Gagnon
930e33cb48
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.23 From CL 6837861
...
#rb none
[CL 6838042 by Chris Gagnon in Main branch]
2019-06-04 15:42:48 -04:00
Chris Gagnon
00f8b72a0b
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 5602170 by Chris Gagnon in Dev-Editor branch]
2019-03-27 15:03:08 -04:00
Cody Albert
144e9849e9
Update source control integration GetOpenedOnly operations to look in project directory instead of root directory
...
#rb none
[CL 5352063 by Cody Albert in Dev-Editor branch]
2019-03-08 15:20:19 -05:00
ben marsh
6d7aa0be33
Set the program name for UE4-initiated Perforce connections.
...
#rb none
#jira
#ROBOMERGE-SOURCE: CL 5240220 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)
[CL 5240223 by ben marsh in Main branch]
2019-02-28 12:38:46 -05:00
lauren ridge
607b26befe
Fix for SCC dialog popping up when messages should be suppressed when adding actors to checked out levels
...
#rb Rex.Hill
#rnx
#ROBOMERGE-SOURCE: CL 5228442 via CL 5229358
[CL 5233465 by lauren ridge in Main branch]
2019-02-27 17:31:50 -05:00
Chris Gagnon
80918bea22
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 5110714 by Chris Gagnon in Dev-Editor branch]
2019-02-21 13:05:30 -05:00
josh engebretson
9585a8d3ab
Never overwrite edit with an integrate for same mod time
...
#ROBOMERGE-SOURCE: CL 4976351 via CL 4976354 via CL 4977567
[CL 4978249 by josh engebretson in Main branch]
2019-02-12 18:38:04 -05:00
Chris Gagnon
0dbe1f7fb2
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 4766091 by Chris Gagnon in Dev-Editor branch]
2019-01-21 17:47:02 -05:00
josh engebretson
9943fb9897
Fixing display issue with branch in content browser
...
#ROBOMERGE-SOURCE: CL 4748306 via CL 4748308 via CL 4748309
[CL 4748312 by josh engebretson in Main branch]
2019-01-17 18:04:40 -05:00
Chris Gagnon
1dd3e0189f
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 4730305 by Chris Gagnon in Dev-Editor branch]
2019-01-15 18:47:22 -05:00
Chris Gagnon
1a3bf5caf1
Merging The Engine directory from //UE4/Dev-Main to //UE4/Dev-Editor upto CL 4698813
...
#rb none
[CL 4720826 by Chris Gagnon in Dev-Editor branch]
2019-01-14 16:55:55 -05:00
Francis Hurteau
57c677da93
Copying //UE4/Dev-Enterprise@4705006 to Dev-Main (//UE4/Dev-Main)
...
#rb none
#lockdown Nick.Penwarden
[CL 4705151 by Francis Hurteau in Main branch]
2019-01-10 17:26:53 -05:00
Marc Audy
ab108c215e
Copying to Dev-Main @ CL# 4688301
...
#rb
#rnx
[CL 4688816 by Marc Audy in Main branch]
2019-01-08 11:38:48 -05:00
Chris Gagnon
8fc25ea18e
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 4676797 by Chris Gagnon in Dev-Editor branch]
2019-01-02 14:54:39 -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
Matt Kuhlenschmidt
cde8160913
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 4572510 by Matt Kuhlenschmidt in Dev-Editor branch]
2018-11-16 11:15:08 -05:00
Ben Marsh
ea340d3fbf
Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main)
...
#rb none
#lockdown Nick.Penwarden
[CL 4567513 by Ben Marsh in Main branch]
2018-11-14 19:05:13 -05:00
