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
46,052 Commits 23 Branches 254 Tags
0fb3354acc36bb1d032d020b7defb7ebb685bba2
Commit Graph

2996 Commits

Author SHA1 Message Date
ben marsh
5973555c33 Suppress warning message when opening the project browser if a project doesn't have any engine identifier or version field. 
#rb none
#jira UE-68682

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

[CL 4753691 by ben marsh in Dev-Networking branch]
 2019-01-18 14:34:41 -05:00
graeme thornton
ca166ea51e Unrealpak: Throw a meaningful error when a crypto keys cache is specified on the command line that doesn't exist 
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: graeme.thornton
#ROBOMERGE-SOURCE: CL 4750032 via CL 4750034 via CL 4750036 via CL 4750039
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4750046 by graeme thornton in Dev-Networking branch]
 2019-01-18 06:10:15 -05:00
marc audy
892f022bda Copying //UE4/Dev-Framework to Dev-Main (//UE4/Dev-Main) [at] 4736279 
#rb
#rnx

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 4736445 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4736453 by marc audy in Dev-Networking branch]
 2019-01-16 16:19:29 -05:00
shaun kime
6810eab1e3 Copying //UE4/Dev-Niagara to Dev-Main (//UE4/Dev-Main) as of Niagara CL 4733936 
#rb none
#tests Niagara auto-tests for DX11 pass

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: shaun.kime
#ROBOMERGE-SOURCE: CL 4734948 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4734964 by shaun kime in Dev-Networking branch]
 2019-01-16 14:31:35 -05:00
martin wilson
e3103f1d97 Update copyright notice 
#Jira UE-68442
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: martin.wilson
#ROBOMERGE-SOURCE: CL 4723985 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4723995 by martin wilson in Dev-Networking branch]
 2019-01-15 09:45:20 -05:00
ben marsh
cf4a18955c Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main) 
#rb none
#rnx

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

[CL 4718825 by ben marsh in Dev-Networking branch]
 2019-01-14 12:15:37 -05:00
lina halper
76003579dd Copying //UE4/Dev-Anim to Main (//UE4/Main) 
[FYI] Laurent.Delayen, Thomas.Sarkanen
#rb: none
#lockdown thomas.sarkanen

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: lina.halper
#ROBOMERGE-SOURCE: CL 4715449 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4715461 by lina halper in Dev-Networking branch]
 2019-01-11 22:36:30 -05:00
nick darnell
96c6c7fb56 WidgetReflector - Make sure to reset the visual tree capture after switching to hittesting reflecting, otherwise, it gets stuck in visual picking mode, which we don't want. 
[FYI] Aaron.Johnson

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: nick.darnell
#ROBOMERGE-SOURCE: CL 4712887 via CL 4712895
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4712901 by nick darnell in Dev-Networking branch]
 2019-01-11 15:17:44 -05:00
jamie dale
c5c5e7122d Fixed empty translations being added to non-native LocRes files 
New text always has an empty translations by default, so this was causing new text to go missing for non-native languages

[FYI] Arthur.Flew, Fred.Kimberley, Dan.Hertzka
#rb Francis.Hurteau

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jamie.dale
#ROBOMERGE-SOURCE: CL 4712821 via CL 4712827
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4712836 by jamie dale in Dev-Networking branch]
 2019-01-11 15:09:15 -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
matt kuhlenschmidt
f512ce179b Properly compile out slate debugging code unless WITH_SLATE_DEBUGGING is true 
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: matt.kuhlenschmidt
#ROBOMERGE-SOURCE: CL 4692393 via CL 4692395
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4710616 by matt kuhlenschmidt in Dev-Networking branch]
 2019-01-11 13:00:24 -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
ben marsh
0403ec7378 Use explicit FVector4 -> FLinearColor constructor to fix Clang compile error. 
#lockdown Nick.Penwarden
#rb none
#rnx

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

[CL 4677611 by ben marsh in Dev-Networking branch]
 2019-01-02 19:58:52 -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
30a922878e Update some missing copyright strings. 
#rb none
#lockdown Nick.Penwarden

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

[CL 4668762 by ben marsh in Dev-Networking branch]
 2018-12-18 13:38:45 -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
ryan gerleve
9843ebaa9f Merging conflict by hand. 
/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Plugins/Experimental/GeometryCollectionPlugin/Source/GeometryCollectionEditor/GeometryCollectionEditor.Build.cs - merging //UE4/Main/Engine/Plugins/Experimental/GeometryCollectionPlugin/Source/GeometryCollectionEditor/GeometryCollectionEditor.Build.cs#1
/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Source/Runtime/Experimental/Chaos/Private/Chaos/PBDCollisionConstraint.cpp - merging //UE4/Main/Engine/Source/Runtime/Experimental/Chaos/Private/Chaos/PBDCollisionConstraint.cpp#1
/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Source/Runtime/Experimental/Chaos/Private/Chaos/PBDRigidsEvolution.cpp - merging //UE4/Main/Engine/Source/Runtime/Experimental/Chaos/Private/Chaos/PBDRigidsEvolution.cpp#1


--------------------------------------
Copying //UE4/Dev-Physics to //UE4/Dev-Main.

#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: michael.lentine
#ROBOMERGE-SOURCE: CL 4653110 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4653305 by ryan gerleve in Dev-Networking branch]
 2018-12-12 11:43:42 -05:00
mark satterthwaite
e36651a7d7 Duplicate 4628076 //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) 
All macOS Metal shader formats must use Metal 2.0 or later now, I no longer support Metal 1.2 for desktop.

#rb none
#jira UE-67151
#lockdown nick.penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: mark.satterthwaite
#ROBOMERGE-SOURCE: CL 4628516 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4628517 by mark satterthwaite in Dev-Networking branch]
 2018-12-04 13:21:00 -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
53a3e4eaa8 Copying //UE4/Release-Staging-4.21 to Dev-Main (//UE4/Dev-Main) [at] 4547701 
#rb
#rnx
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 4547706 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4548022 by ryan gerleve in Dev-Networking branch]
 2018-11-07 11:34:19 -05:00
marc audy
9e9c0fdb36 Copying //UE4/Release-Staging-4.21 to Dev-Main (//UE4/Dev-Main) [at] 4530863 
#rb none
#rnx
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 4530881 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4530882 by marc audy in Dev-Networking branch]
 2018-11-01 09:57:31 -04:00
ben marsh
51bd922115 Copying //UE4/Release-Staging-4.21 to Dev-Main (//UE4/Dev-Main) 
#rb none
#lockdown Nick.Penwarden

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

[CL 4523841 by ben marsh in Dev-Networking branch]
 2018-10-30 10:25:06 -04: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
dc8c73958a Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking) 
#rb none
#rnx

[CL 4344377 by Ryan Gerleve in Dev-Networking branch]
 2018-09-05 10:39:46 -04:00