jamie dale
db9507f916
Fixed localization conflicts
...
#jira
#rb none
#rnx
#ROBOMERGE-SOURCE: CL 11448060 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)
[CL 11448075 by jamie dale in 4.25-Plus branch]
2020-02-14 15:48:32 -05:00
Max Chen
b4881d8bf8
Copying //UE4/Dev-Editor to Dev-Tools-Staging (//UE4/Dev-Tools-Staging) @11123875
...
#rb none
#jira none
[CL 11123880 by Max Chen in Dev-Tools-Staging branch]
2020-01-27 20:11:15 -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
Ryan Schmidt
d53c4df497
Merging //UE4/Dev-Tools-Staging down to //UE4/Dev-Editor at CL 10372033 (part 1 of 2)
...
#rb none
#rnx
[CL 10384788 by Ryan Schmidt in Dev-Editor branch]
2019-11-23 00:35:50 -05:00
Jamie Dale
6dc605448f
Fixed localization conflicts
...
#jira UE-84609
#fyi Shaun.Kime, Bob.Tellez
#rb none
[CL 10308667 by Jamie Dale in Main branch]
2019-11-19 11:42:06 -05:00
Matt Kuhlenschmidt
e056ec1843
Editor mode changes:
...
Made placement browser its own tab and not the default mode.
The default mode is now "Select" which does nothing
Modes are now actived from a toolbar drop down (old keybindings still work) and the old tabbed UI for changing modes has been deprecated.
Mode tab no longer appears when there is no active mode and will appear when a mode becomes active
This change resets the default layout of the editor
#rb none
[CL 10286341 by Matt Kuhlenschmidt in Dev-Editor branch]
2019-11-18 10:48:03 -05:00
bob tellez
9ee5dbd1fc
#UE4 IWYU fix
...
[FYI] Matt.Kuhlenschmidt
#ROBOMERGE-SOURCE: CL 9877681 via CL 9877683
#ROBOMERGE-BOT: (v553-9872581)
[CL 9877684 by bob tellez in Main branch]
2019-10-28 23:55:19 -04:00
bob tellez
9cf939fd79
#UE4 IWYU fix
...
[FYI] Matt.Kuhlenschmidt
#ROBOMERGE-SOURCE: CL 9876695 via CL 9876754
#ROBOMERGE-BOT: (v553-9872581)
[CL 9876764 by bob tellez in Main branch]
2019-10-28 19:30:58 -04:00
matt kuhlenschmidt
39273df566
Missed a non-unity fix
...
#ROBOMERGE-SOURCE: CL 9873726 via CL 9873780
#ROBOMERGE-BOT: (v553-9872581)
[CL 9873970 by matt kuhlenschmidt in Main branch]
2019-10-28 16:34:59 -04:00
matt kuhlenschmidt
15a654e357
Fix non-unity
...
#ROBOMERGE-SOURCE: CL 9873668 via CL 9873779
#ROBOMERGE-BOT: (v553-9872581)
[CL 9873969 by matt kuhlenschmidt in Main branch]
2019-10-28 16:34:57 -04:00
Matt Kuhlenschmidt
c0511b26d4
Moved BSP and all the related editor modes to a plugin so it can be disabled in some situations
...
#ROBOMERGE-OWNER: matt.kuhlenschmidt
#ROBOMERGE-AUTHOR: matt.kuhlenschmidt
#ROBOMERGE-SOURCE: CL 9870262 via CL 9870265
#ROBOMERGE-BOT: (v548-9842178)
#rb chris.gagnon
[CL 9872761 by Matt Kuhlenschmidt in Main branch]
2019-10-28 16:05:49 -04:00
