Commit Graph

128 Commits

Author SHA1 Message Date
aurel cordonnier
e0ad4e25df Merge from Release-Engine-Test @ 16624776 to UE5/Main
This represents UE4/Main @ 16579691 and Dev-PerfTest @ 16579576

[CL 16625248 by aurel cordonnier in ue5-main branch]
2021-06-10 13:13:24 -04:00
Patrick Boutot
aeea5f0679 Slate: Convert SConcertScrollBox, SWrapBox, SBoxPanel, SWindow FSlot's to the FSlotArgument syntax.
#jira UE-114425
#preflight 60adb0b704188d000133d0b9

[CL 16466544 by Patrick Boutot in ue5-main branch]
2021-05-26 06:42:00 -04:00
Chris Varnsverry
16230185c0 - Merge CL's 15977926, 15978323, 15978393, 15978401 and 15981176 from //UE5/RES to //UE5/Main
- Moves CoreOnline headers into their own module

#jira UE-113427
#fyi Matt.Peters
#tests built EdTest, QAGame, and one internal project in DevEd Win64

[CL 16036320 by Chris Varnsverry in ue5-main branch]
2021-04-16 13:16:39 -04:00
Patrick Boutot
383815f480 Slate: Convert SWidget's Enabled and Visibility flag to SlateAttribute.
#jira UE-106515, UE-112897
#rb vincent.gauthier
#preflight 606f3fcd97c8220001315871
#preflight 60749a870adbfb0001f0455c

[CL 15982898 by Patrick Boutot in ue5-main branch]
2021-04-12 16:13:38 -04:00
Brandon Schaefer
9c70d52265 c++17 fixes
#jira none
#rb none

[CL 15786053 by Brandon Schaefer in ue5-main branch]
2021-03-23 18:00:15 -04:00
John Barrett
e9e80a1f95 Rename NetcodeUnitTest plugins referencing UE4.
#JIRA UE-111370, UE-111422
#rb none

[CL 15780375 by John Barrett in ue5-main branch]
2021-03-23 13:31:36 -04:00
Patrick Boutot
17e2d4886e Slate: Convert SBorder attributes to SlateAttributes
#jira UE-109146
#rb vincent.gauthier
#preflight 605a0c8ade09250001e33a7d

[CL 15779227 by Patrick Boutot in ue5-main branch]
2021-03-23 12:33:14 -04:00
John Barrett
f9004cb460 Remove NetcodeUnitTest references to UE4.
#JIRA UE-111370, UE-111422
#rb none

[CL 15778982 by John Barrett in ue5-main branch]
2021-03-23 12:21:02 -04:00
Marc Audy
0cbbc781ca Merge UE5/Release-Engine-Staging @ 15740152 to UE5/Main
This represents UE4/Main @ 15709114

[CL 15740605 by Marc Audy in ue5-main branch]
2021-03-18 15:20:03 -04:00
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
Zousar Shaker
12d60feecc Bulk pass to address PVS warnings due to use of a TObjectPtr in the result clauses of a ternary operator.
#jira UE-107532
#jira UE-107530
#rb none

[CL 15276391 by Zousar Shaker in ue5-main branch]
2021-02-01 19:17:54 -04:00
Josh Adams
b0e4357576 - UBT Code changes to remove 32-bit Windows support (C++ code for 32-bit still exists)
#rb marc.audy (concept, not each file)

[CL 15265424 by Josh Adams in ue5-main branch]
2021-01-31 15:09:58 -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
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
Ben Marsh
486408b1a9 Rename UE5Editor to UnrealEditor.
#rb none
#jira UE-97600

[CL 14292067 by Ben Marsh in ue5-main branch]
2020-09-10 15:39:00 -04:00
Ben Marsh
be7034ec27 Rename UE4Editor to UE5Editor, and generated solution/projects from UE4 -> UE5.
UE4Game/Client/Server targets left intact for the time being.

#rb none

[CL 14288076 by Ben Marsh in ue5-main branch]
2020-09-10 09:10:30 -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
robert manuszewski
b7568cc694 Fix for UE-90683: You can no longer delete conflicting variables
Refactored FindField into FindUField and FindFProperty to avoid confusion caused by the fact that FindField<UField> will no longer return FProperties.

#jira UE-90683
#rb Steve.Robb
#tests Basic editor functionality test, cooked and ran PC client and server, bot soak tests for two hours

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 12190998 in //UE4/Release-4.25/... via CL 12190999
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v661-12148976)

[CL 12191300 by robert manuszewski in Main branch]
2020-03-15 10:33:45 -04:00
rex hill
4511728f09 Tab manager filter can now block tab spawn
#rb chris.gagnon


#ROBOMERGE-OWNER: rex.hill
#ROBOMERGE-AUTHOR: rex.hill
#ROBOMERGE-SOURCE: CL 11604269 via CL 11604360 via CL 11604439
#ROBOMERGE-BOT: (v656-11643781)

[CL 11743509 by rex hill in Main branch]
2020-02-28 11:30:46 -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 Gerleve
35e095a9d8 Copying //UE4/Dev-Networking @ CL 11201841 to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 11202190 by Ryan Gerleve in Main branch]
2020-01-31 18:46:22 -05:00
marc audy
826320c88b Second batch of remaining Engine copyright updates.
#rnx
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 10871248 in //UE4/Main/...
#ROBOMERGE-BOT: NETWORKING (Main -> Dev-Networking) (v624-10872983)

[CL 10874754 by marc audy in Dev-Networking branch]
2020-01-03 09:55:36 -05:00
Marc Audy
360d078ca3 Second batch of remaining Engine copyright updates.
#rnx
#rb none

[CL 10871248 by Marc Audy in Main branch]
2019-12-27 09:26:59 -05:00