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
48,076 Commits 23 Branches 254 Tags
a90bace545932f97d7e86cc2ebbc659d7e656d5d
Commit Graph

196 Commits

Author SHA1 Message Date
julien stjean
2c44a0d04a Fixed "Mesh Editing" toolbar in Static Mesh Editor showing as "Secondary Toolbar" when closing and re-opening the tab. 
#jira UE-70173
#rb Anousack.Kitisa

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: julien.stjean
#ROBOMERGE-SOURCE: CL 5205456 in //UE4/Release-4.22/... via CL 5225202
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5244876 by julien stjean in Dev-Networking branch]
 2019-02-28 17:07:36 -05:00
lauren ridge
4a54f4b23a Fix for LOD radio button not updating static mesh editor viewport 
#jira UE-70134
#rb trivial

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: lauren.ridge
#ROBOMERGE-SOURCE: CL 5010058 in //UE4/Release-4.22/... via CL 5010061
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5085926 by lauren ridge in Dev-Networking branch]
 2019-02-19 19:59:21 -05:00
jian ru
c81937e065 Fix a potential data race when changing UStaticMesh::NumStreamedLODs through editor 
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jian.ru
#ROBOMERGE-SOURCE: CL 4917342 via CL 4918935 via CL 4920344
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5067121 by jian ru in Dev-Networking branch]
 2019-02-19 14:53:49 -05:00
jian ru
44e7719ff4 Resolve robomerge conflicts 
#jira none
#rb none
[FYI] chris.bunner, jeff.williams

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jian.ru
#ROBOMERGE-SOURCE: CL 4920023 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5066653 by jian ru in Dev-Networking branch]
 2019-02-19 14:46:21 -05:00
ryan gerleve
f9c954fabb Fix merge conflict 
/src/ROBOMERGE_ENGINE_Dev_Networking/FortniteGame/Content/Collections/Audit_InCook_BROnly.collection - merging //UE4/Main/FortniteGame/Content/Collections/Audit_InCook_BROnly.collection#63


--------------------------------------
Copying //UE4/Dev-Rendering[at]4854522 to Dev-Main (//UE4/Dev-Main)
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: marcus.wassmer
#ROBOMERGE-SOURCE: CL 4854553 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4859489 by ryan gerleve in Dev-Networking branch]
 2019-01-31 12:42:57 -05:00
chris gagnon
435467dd55 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) 
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 4837001 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4837013 by chris gagnon in Dev-Networking branch]
 2019-01-29 19:24:53 -05:00
ryan gerleve
b41214417e Resolving conflict from Dev-Enterprise. 
/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Source/Runtime/Sockets/Private/BSDSockets/SocketsBSD.cpp - merging //UE4/Main/Engine/Source/Runtime/Sockets/Private/BSDSockets/SocketsBSD.cpp#20


--------------------------------------
Copying //UE4/Dev-Enterprise[at]4705006 to Dev-Main (//UE4/Dev-Main)

#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: francis.hurteau
#ROBOMERGE-SOURCE: CL 4705151 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4712032 by ryan gerleve in Dev-Networking branch]
 2019-01-11 14:26:15 -05:00
josh jensen
686a8f8dac Moved feature level preview mode selection to a Preview Mode combo toggle button on the editor toolbar. 
The Preview Mode toggle button allows for fast feature level switching for the Level editor. Feature level switch now affects the Static Mesh editor, Material editor, and Animation editor.

Disabled the preview switching during PIE.

Icons are placeholder.

#rb Allan.Bentham
[FYI] Allan.Bentham, Jack.Porter

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: josh.jensen
#ROBOMERGE-SOURCE: CL 4700808 via CL 4701730
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4711160 by josh jensen in Dev-Networking branch]
 2019-01-11 13:16:00 -05:00
James Hopkin
235137b0cc Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking) 
Copying to Dev-Main @ CL# 4688301

#rb none

[CL 4707991 by James Hopkin in Dev-Networking branch]
 2019-01-11 02:57:03 -05:00
chris gagnon
aad5335ff6 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) 
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 4676940 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4676943 by chris gagnon in Dev-Networking branch]
 2019-01-02 15:37:07 -05:00
ben marsh
2b46ba7b94 Update copyright notices to 2019. 
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4662404 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4662413 by ben marsh in Dev-Networking branch]
 2018-12-14 13:44:01 -05:00
marcus wassmer
f43eb0e188 Copying //UE4/Dev-Rendering[at]4626416 to Dev-Main (//UE4/Dev-Main) 
#rb none
#lockdown nick.penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: marcus.wassmer
#ROBOMERGE-SOURCE: CL 4626501 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4626516 by marcus wassmer in Dev-Networking branch]
 2018-12-03 22:27:31 -05:00
ryan gerleve
289a4fa159 Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main) 
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4567513 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4573136 by ryan gerleve in Dev-Networking branch]
 2018-11-16 14:01:06 -05:00
Ryan Gerleve
9af1fb3463 Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking) 
#rb none
#rnx

[CL 4516466 by Ryan Gerleve in Dev-Networking branch]
 2018-10-29 10:01:28 -04:00
Ryan Gerleve
f20cd46b96 Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking) 
#rb none
#rnx

[CL 4344260 by Ryan Gerleve in Dev-Networking branch]
 2018-09-05 10:17:10 -04:00
Ryan Gerleve
e7612e89b2 Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking) 
#rb none
#rnx

[CL 4341874 by Ryan Gerleve in Dev-Networking branch]
 2018-09-04 14:32:41 -04:00
Ryan Gerleve
bcca42e74a Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking) 
#rb none
#rnx

[CL 4284864 by Ryan Gerleve in Dev-Networking branch]
 2018-08-14 15:58:25 -04:00
Ryan Gerleve
ac280888a0 Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking) 
#rb none
#rnx

[CL 4175728 by Ryan Gerleve in Dev-Networking branch]
 2018-06-29 20:48:58 -04:00
Ryan Gerleve
e88617b37e Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking) 
#rb none
#rnx

[CL 4119306 by Ryan Gerleve in Dev-Networking branch]
 2018-06-07 22:39:07 -04:00
Matt Kuhlenschmidt
3d3ea4c62b Merging //UE4/Dev-Main to Dev-Geometry (//UE4/Dev-Geometry) 
#rb none

[CL 3974236 by Matt Kuhlenschmidt in Dev-Geometry branch]
 2018-03-30 08:55:19 -04:00
Matt Kuhlenschmidt
0f5e6ea659 Merging //UE4/Dev-Main to Dev-Geometry (//UE4/Dev-Geometry) 
#rb none

[CL 3971873 by Matt Kuhlenschmidt in Dev-Geometry branch]
 2018-03-29 11:36:05 -04:00
Matt Kuhlenschmidt
0efe8c3475 Merging //UE4/Dev-Main to Dev-Geometry (//UE4/Dev-Geometry) 
#rb none

[CL 3960872 by Matt Kuhlenschmidt in Dev-Geometry branch]
 2018-03-22 19:22:36 -04:00
Matt Kuhlenschmidt
238fcb9d83 Merging //UE4/Dev-Main to Dev-Geometry (//UE4/Dev-Geometry) 
#fyi richard.talbotwatkin, alexis.matte

#rb none

[CL 3928841 by Matt Kuhlenschmidt in Dev-Geometry branch]
 2018-03-06 13:26:20 -05:00
Alexis Matte
1119758fae Change Meshdescription to use FName instead of indexes. 
#rb none

[CL 3924913 by Alexis Matte in Dev-Geometry branch]
 2018-03-05 10:06:09 -05:00
Matt Kuhlenschmidt
68f4525e1b Merging //UE4/Dev-Main to Dev-Geometry (//UE4/Dev-Geometry) 
#rb none

[CL 3889612 by Matt Kuhlenschmidt in Dev-Geometry branch]
 2018-02-14 14:13:42 -05:00