Commit Graph

239 Commits

Author SHA1 Message Date
Marc Audy
01b7c9f4f5 Merge UE5/RES @ 15958325 to UE5/Main
This represents UE4/Main @ 15913390 and Dev-PerfTest @ 15913304

[CL 15958515 by Marc Audy in ue5-main branch]
2021-04-08 14:32:07 -04:00
louise rasmussen
af40e9cac5 Level Editor Menu Clean Up, Part 2
#JIRA UETOOL-3039
#rb Lauren.Barnes
#lockdown Simon.Tourangeau
#preflight 606d2c11dc3e5b0001c915aa

#ROBOMERGE-OWNER: louise.rasmussen
#ROBOMERGE-AUTHOR: louise.rasmussen
#ROBOMERGE-SOURCE: CL 15937971 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)
#ROBOMERGE-CONFLICT from-shelf

[CL 15938452 by louise rasmussen in ue5-main branch]
2021-04-07 02:56:12 -04:00
louise rasmussen
825c64a6f5 Level Editor Menu Re-org, Part 1
#JIRA UETOOL-3039
#rb Lauren.Barnes
#lockdown Simon.Tourangeau
#preflight 606b8e0315d4190001b1698b

#ROBOMERGE-SOURCE: CL 15924633 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)

[CL 15924652 by louise rasmussen in ue5-main branch]
2021-04-05 19:11:24 -04:00
Yoan StAmant
d265153bd8 [VisualLogger] Renamed some slate widgets to fix some symbol mixup between modules
#jira UE-110591
#review-15869247 @maxime.mercier @brandon.schaefer
#preflight 6064ba47b262d500010330d7

[CL 15879561 by Yoan StAmant in ue5-main branch]
2021-03-31 15:07:57 -04:00
mark lintott
86f5949387 #jira UE-111548
#rb trivial
Removed reference to ue4

#ROBOMERGE-SOURCE: CL 15801766 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v783-15756269)

[CL 15807997 by mark lintott in ue5-main branch]
2021-03-24 16:38:38 -04:00
Yoan StAmant
df07501b17 [LogVisualizer] Fixed some typos
#review-15495108 @mieszko.zielinski

[CL 15513328 by Yoan StAmant in ue5-main branch]
2021-02-24 08:33:37 -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
vincent gauthier
4968f1003c Fix to warning message on Slate Styling.
#jira UE-108786, UE-104317
#rb Lauren.Barnes
#rnx

#ROBOMERGE-SOURCE: CL 15438427 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15454131 by vincent gauthier in ue5-main branch]
2021-02-18 13:07:57 -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
3b4c8fc1c5 Automated wrapped object pointer upgrade for Engine + ShooterGame + ShooterGame referenced plugins
#rb none

[CL 15224650 by Zousar Shaker in ue5-main branch]
2021-01-27 17:40:25 -04:00
Matt Kuhlenschmidt
036e2d0733 Removed all instances of large toolbars with 40x40 icons and reset their layouts to confrom to the new standard toolbar size and tabless design
[CL 14999694 by Matt Kuhlenschmidt in ue5-main branch]
2021-01-06 12:07:36 -04:00
Andrew Davidson
10bca5261b Double math ambiguity Engine fixes
#rb jeanfrancois.dube, trivial

[CL 14974758 by Andrew Davidson in ue5-main branch]
2021-01-04 07:59:22 -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
Zousar Shaker
3cdeeb8075 Prototype Wrapped Object Pointers (ObjectHandle/ObjectPtr) Change ternary operators that are ambiguous when TObjectPtr can be implicitly constructed from a raw pointer. Also allow TObjectPtr to be implicitly constructed from an appropriate raw pointer.
#rb devin.doucette

[CL 14739879 by Zousar Shaker in ue5-main branch]
2020-11-12 18:18:02 -04:00
Mieszko Zielinski
e1dff8c7a5 Fixed parameter and property naming in capsule-shape related vislog and DebugRendererSceneProxy code
#review-14608462 @Mikko.Mononen, @Yoan.StAmant
#rb swarm

[CL 14608627 by Mieszko Zielinski in ue5-main branch]
2020-10-29 08:56:12 -04:00
Mieszko Zielinski
e026ca6dc2 Made sure no one will accidentally place VisualLoggerRenderingActor on the level.
#rb trivial

[CL 14578576 by Mieszko Zielinski in ue5-main branch]
2020-10-26 13:26:30 -04:00
Yoan StAmant
bc1a8c138e Added missing include for non unity build from previously integrated PR
[CL 14523221 by Yoan StAmant in ue5-main branch]
2020-10-20 10:10:18 -04:00
matt-newcombe
10ac19eec3 PR #7408: [VisualLogger] Moved FLogVisualiser to a public header, added function to seek to a time (Contributed by matt-newcombe)
[CL 14523112 by matt-newcombe in ue5-main branch]
2020-10-20 09:57:33 -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
Fred Kimberley
eb2edb9b69 Adding lightweight instances subsystem for gameplay objects.
Lightweight instances allow a low memory representation of objects. Instances can be converted into full actors when necessary. Actors can also be reduced down to light weight instances when the full representation is no longer needed.
Hit results now return a handle that may refer to either an actor or lightweight instance.

#rb Michael.Noland

[CL 14369221 by Fred Kimberley in ue5-main branch]
2020-09-22 15:55:19 -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
Matt Kuhlenschmidt
5c064acc86 Initial pass on content browser reskin
[CL 13949190 by Matt Kuhlenschmidt in ue5-main branch]
2020-07-27 16:11:54 -04:00
josh gross
71a4703acc [Engine] - Add the possibility to arrange the slots top-to-bottom in the DynamicEntryBox and the WrapBox widgets instead of only supporting left-to-right.
#RNX
#rb [at]Ghislain.Theriault

#ROBOMERGE-OWNER: josh.gross
#ROBOMERGE-AUTHOR: maxime.vaillancourt
#ROBOMERGE-SOURCE: CL 12869792 via CL 12872658 via CL 12872659 via CL 12872660
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12872663 by josh gross in Main branch]
2020-04-16 17:02:30 -04:00
mieszko zielinski
5de2761190 Fixed vislog's perf and architecture issue resulting in vislog constantly recreating AVisualLoggerRenderingActor in client-server PIE due to vlogging with different worlds.
[at]Yoan.StAmant, [at]Stephan.Delmer
#rb Yoan.StAmant

#ROBOMERGE-SOURCE: CL 12689800 via CL 12689801 via CL 12689803
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v676-12543919)

[CL 12689808 by mieszko zielinski in Main branch]
2020-04-09 10:35:17 -04:00