Commit Graph

83 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
aurel cordonnier
fc542f6cfd Merge from Release-Engine-Staging @ 18081189 to Release-Engine-Test
This represents UE4/Main @18073326, Release-5.0 @18081140 and Dev-PerfTest @18045971

[CL 18081471 by aurel cordonnier in ue5-release-engine-test branch]
2021-11-07 23:43:01 -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
patrick enfedaque
209be396b4 World Partition:
- New Level Dialog: Empty Open World Template
- Remove IsWorldPartitionEnabled project setting

#rb jeanfrancois.dube, richard.malo
#preflight 615477fc03f3320001fefe99

#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 17663222 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v875-17642767)

[CL 17663241 by patrick enfedaque in ue5-release-engine-test branch]
2021-09-29 12:29:37 -04:00
JeanFrancois Dube
b93a328d13 Don't allow spawning the level editor when the world is partitioned.
#rb patrick.enfedaque
#fyi simon.tourangeau

[CL 15131290 by JeanFrancois Dube in ue5-main branch]
2021-01-18 14:07:53 -04:00
Matt Kuhlenschmidt
bd1dea6248 Reskin numeric entry boxes and related details customizations (vectors, rotators, transforms)
[CL 14629610 by Matt Kuhlenschmidt in ue5-main branch]
2020-11-02 13:49:16 -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
michael daum
7c6d7b3ab2 Drastically reduce the number of targets depending on UnrealWidget.h
#rb lauren.barnes

[CL 14266936 by michael daum in ue5-main branch]
2020-09-07 20:36:09 -04:00
JeanFrancois Dube
838a802f81 Integrate 14115533 from RES: Expose External Actors Conversion to the Level tab context menu.
#jira UE-96703
#rb francis.hurteau

[CL 14141893 by JeanFrancois Dube in ue5-main branch]
2020-08-19 08:53:04 -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
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
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
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
Patrick Enfedaque
d62d1195c4 Editing LevelPartitionGrid: Edigrate from //dev-editor-openworld
Multiple engine changes needed to support LevelGrid

#rb jeanfrancois.dube, sebastien.lussier, richard.malo
#rnx


#ROBOMERGE-OWNER: Patrick.Enfedaque
#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 10318590 via CL 10318595
#ROBOMERGE-BOT: (v593-10286020)

[CL 10318965 by Patrick Enfedaque in Main branch]
2019-11-20 09:47:23 -05:00
jeanfrancois dube
e9743ce6f0 Fixed crash when attempting to load a world composition sublevel after deleting the map.
#jira UE-76791
#rb patrick.enfedaque
#rnx

#ROBOMERGE-SOURCE: CL 7312950 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v371-7306989)

[CL 7312953 by jeanfrancois dube in Main branch]
2019-07-15 17:08:31 -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
Stefan Boberg
8607ecb30d Copying //UE4/Dev-Core to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 6815521 by Stefan Boberg in Main branch]
2019-06-03 15:32:00 -04: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
patrick boutot
7b02c2dda2 Empty Level Text fixed internally and the user-facing text for the World Outliner
#jira UE-69901
#rb lauren.ridge

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: patrick.boutot
#ROBOMERGE-SOURCE: CL 5010617 in //UE4/Release-4.22/... via CL 5010623
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5060905 by patrick boutot in Dev-Core branch]
2019-02-19 03:24:14 -05:00
patrick boutot
a94187f012 Empty Level Text fixed internally and the user-facing text for the World Outliner
#jira UE-69901
#rb lauren.ridge

#ROBOMERGE-SOURCE: CL 5010617 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5010623 by patrick boutot in Main branch]
2019-02-15 13:53:46 -05:00
Chris Gagnon
a48e767b94 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4835066 by Chris Gagnon in Dev-Editor branch]
2019-01-29 16:15:19 -05:00
Rolando Caloca
732810a13b DR - Copying //UE4/Dev-Main@4785067 to //UE4-DevRendering
#rb none
#rnx
#lockdown Marcus.Wassmer

[CL 4790611 by Rolando Caloca in Dev-Rendering branch]
2019-01-23 17:01:56 -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
Marcus Wassmer
e83575daa4 Merging //UE4/Dev-Main@4754280 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none
Major update is from Niagara stream.

[CL 4757171 by Marcus Wassmer in Dev-Rendering branch]
2019-01-18 18:16:57 -05:00