Commit Graph

297 Commits

Author SHA1 Message Date
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
bf80889353 UE5/Release-Engine-Staging to UE5/Main
This represents UE4/Main up to CL# 14958402

[CL 15028197 by Marc Audy in ue5-main branch]
2021-01-08 19:56:07 -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
Zousar Shaker
fc2ad21a5e Prototype Wrapped Object Pointers (ObjectHandle/ObjectPtr)
Call-site changes for non-scalar wrapped object pointer upgrades in Engine + Shootergame

#rb devin.doucette

[CL 14996467 by Zousar Shaker in ue5-main branch]
2021-01-05 19:16:25 -04:00
sebastian nordgren
c678b96a4b FDetailsViewArgs 8 parameter defaulted constructor deprecated and all usages fixed.
#rb lauren.barnes

[CL 14750682 by sebastian nordgren in ue5-main branch]
2020-11-16 08:16:15 -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
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
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
Matt Kuhlenschmidt
7643234731 Blueprint editor reskin first pass and supporting work
[CL 14279737 by Matt Kuhlenschmidt in ue5-main branch]
2020-09-09 10:51:17 -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
Marc Audy
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
2020-06-23 18:40:00 -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
yoan stamant
6867bd2ae3 BehaviorTreeDebugger: added missing initialization for StoppedOnBreakpointExecutionIndex and make sure to always reset it when active node changes
#jira UE-86943
#rnx
#rb aris.theophanidis


#ROBOMERGE-SOURCE: CL 11050265 via CL 11050325 via CL 11050330
#ROBOMERGE-BOT: (v637-11041722)

[CL 11050336 by yoan stamant in Main branch]
2020-01-17 13:28:32 -05:00
JeanMichel Dignard
99b55fb883 Merged main @ cl 10981486
#rb none
#rnx

[CL 10985598 by JeanMichel Dignard in Dev-Tools-Staging branch]
2020-01-14 14:45:07 -05:00
yoan stamant
40b1781daa BehaviorTreeDebugger: prevent displaying old subtree recorded step. Fixed displayed step index using recording buffer index instead of debugger execution step id.
[at]aris.theophanidis


#ROBOMERGE-SOURCE: CL 10950831 via CL 10950832 via CL 10950833
#ROBOMERGE-BOT: (v632-10940481)

[CL 10950834 by yoan stamant in Main branch]
2020-01-13 07:45:40 -05:00
Marc Audy
51a972ebb8 Fix deprecation warnings
#rb
#rnx

[CL 10949401 by Marc Audy in Main branch]
2020-01-11 23:06:16 -05:00
mikko mononen
4866c0317e Call notifications when editing Blackboard data
- Call Pre/PostEditChangeProperty() on add, delete, rename key
- Update FBlackboardKeySelector references on all classes deriving from IBlackboardDataProvider when renaming a Blackboard key (used to beBehaviorTree only)

#rb Yoan.StAmant Stephen.Holmes


#ROBOMERGE-SOURCE: CL 10940202 via CL 10940204
#ROBOMERGE-BOT: (v626-10872990)

[CL 10940205 by mikko mononen in Main branch]
2020-01-10 06:18:31 -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
jeanmichel dignard
2ce7666d2d Copying //UE4/Dev-Core [at] 10708550 to Dev-Main (//UE4/Dev-Main)
#rb none

#ROBOMERGE-OWNER: jeanmichel.dignard
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 10708666 in //UE4/Main/...
#ROBOMERGE-BOT: TOOLS (Main -> Dev-Tools-Staging) (v626-10872990)

[CL 10898071 by jeanmichel dignard in Dev-Tools-Staging branch]
2020-01-07 15:54:23 -05: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
rob gay
9d3e1794ee Fix-up strict compile errors from prior PCH updates
#rb none
#rnx

#ROBOMERGE-OWNER: jeanmichel.dignard
#ROBOMERGE-AUTHOR: rob.gay
#ROBOMERGE-SOURCE: CL 10696631 via CL 10700068 via CL 10700177
#ROBOMERGE-BOT: TOOLS (Main -> Dev-Tools-Staging) (v610-10636431)

[CL 10838602 by rob gay in Dev-Tools-Staging branch]
2019-12-19 18:52: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
yoan stamant
fcc2a8e4af BehaviorTreeDebugger: only collect current runtime node descriptions when displaying the most recent step since the current tree state will match. Otherwise we keep the descriptions from the displayed debugger step that were updated by UpdateAssetFlags.
#rb aris.theophanidis


#ROBOMERGE-SOURCE: CL 10708516 via CL 10714340 via CL 10714446
#ROBOMERGE-BOT: (v610-10636431)

[CL 10714586 by yoan stamant in Main branch]
2019-12-13 14:35:02 -05:00