izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity
157,157 Commits 23 Branches 254 Tags
db463b031d42484bf7ff2b057a8bf0c94dea4a9c
Commit Graph

109 Commits

Author SHA1 Message Date
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
Ryan Schmidt
0c469c41be StaticMeshEditor: gracefully handle the situation where simple collision on an SM is modified externally, as there is no change notification to hook into. SelectedPrims becomes invalid and this check() will be immediately hit, so we can handle it here (obviously a hack). 
#rb jimmy.andrews
#rnx
#jira UE-106918

[CL 15276407 by Ryan Schmidt in ue5-main branch]
 2021-02-01 19:20:35 -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
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
6973e6a61e Toolbars can now support a hybrid mode where they include no text unless a specific toolbar entry is called out using the "calloutstyle" for the toolbar entry. This allows toolbars to reduce their width significantly. The level editor now uses this by default but a few other asset editors have been set up for this 
[CL 14994802 by Matt Kuhlenschmidt in ue5-main branch]
 2021-01-05 16:38:18 -04:00
Louise Rasmussen
3327121a15 Reconfigured the default position of the Static Mesh Socket Manager Panel 
#rb Lauren.Barnes

[CL 14602390 by Louise Rasmussen in ue5-main branch]
 2020-10-28 15:17:37 -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
Louise Rasmussen
909eb96ce6 Static Mesh Asset Editor Style Updates 
#rb matt.kuhlenschmidt, lauren.barnes

[CL 14493821 by Louise Rasmussen in ue5-main branch]
 2020-10-14 13:29:31 -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
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
brooke hubert
8af7d42fa5 Level Editor Viewports now inherit from SAssetEditorViewport. 
#rnx
#Jira UE-94283
#rb lauren.barnes chris.gagnon

[CL 13873728 by brooke hubert in ue5-main branch]
 2020-07-16 08:12:40 -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
richard talbotwatkin
ea65c2ef0f Fix for the "Additional Data" button in the Static Mesh editor, so that the changes are propagated to individual viewports. 
#jira UE-91863
#lockdown simon.tourangeau
[FYI] Lauren.Barnes
#rb none

#ROBOMERGE-SOURCE: CL 12759740 in //UE4/Release-4.25/... via CL 12759742 via CL 12784205
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12786506 by richard talbotwatkin in Main branch]
 2020-04-14 16:54:46 -04:00
lauren barnes
d928a84195 Copying over 11179103 so that Rset Camera toolbar button will work correctly 
#jira UE-87734
#rb trivial

#ROBOMERGE-SOURCE: CL 12232626 in //UE4/Release-4.25/... via CL 12232629
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v664-12234175)

[CL 12234775 by lauren barnes in Main branch]
 2020-03-17 15:11:19 -04:00
eric soulvie
47f621a216 StaticMeshEditor grid drawing now using EngineShowFlags instead of DrawHelper for grid drawing. 
Toolbar grid toggle button now syncs with viewport grid states.  If any viewport is showing a grid, the toggle will be on.
Fixes introduced with when UE-86749 was fixed.
#jira UE-89226
#rb Matt.Kuhlenschmidt


#ushell-cherrypick of 11608356 by Eric.Soulvie

#ROBOMERGE-SOURCE: CL 12156605 in //UE4/Release-4.25/... via CL 12156606
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v659-12123632)

[CL 12156610 by eric soulvie in Main branch]
 2020-03-12 18:12:52 -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
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
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
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
Chris Gagnon
d1973355bc Merge Dev-Tools-Stagng tp Dev-Editor 
#rb none

[CL 9961726 by Chris Gagnon in Dev-Editor branch]
 2019-11-01 17:39:56 -04:00
Eric Soulvie
52900e6a3c Moved generation of Layouts menu to SAssetEditoriViewport and moved layouts menu to submenu to match Level Editor 
[CL 9897025 by Eric Soulvie in Dev-Editor branch]
 2019-10-30 18:26:53 -04:00
richard talbotwatkin
e7c69b38d6 Made UStaticMesh::NavCollision a transactable object when entering the static mesh editor so that Undo is correctly handled. 
#jira UE-62002
#rb none

#ROBOMERGE-SOURCE: CL 9846946 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v548-9842178)

[CL 9846947 by richard talbotwatkin in Main branch]
 2019-10-27 14:20:06 -04:00
Chris Gagnon
8ab0638182 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.24 
#rb none

[CL 9325047 by Chris Gagnon in Main branch]
 2019-10-01 20:41:42 -04:00