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,186 Commits 23 Branches 254 Tags
25571ec85ba205f12d405ea133624cfa993e8032
Commit Graph

3007 Commits

Author SHA1 Message Date
ben marsh
80d8d4defd Fix mode argument to UBT when setting up AutoSDKs. 
#rb none
#rnx

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

[CL 4820583 by ben marsh in Dev-Networking branch]
 2019-01-26 14:47:31 -05:00
david hill
32ada04ee0 Merging using Dev-Anim<=>Main 
//
Make our own HLOD and Skeletal reduction modules the default when user is not configured to use simplygon.
P1 4.22
#jira UE-68947
#rb self

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: david.hill
#ROBOMERGE-SOURCE: CL 4817148 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4817150 by david hill in Dev-Networking branch]
 2019-01-25 18:10:04 -05:00
jack porter
2bbc43bc53 Copying //UE4/Dev-Mobile to Dev-Main (//UE4/Dev-Main) Souce CL: 4806680 
#lockdown: Nick.Penwarden
#rb None

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 4806726 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4806733 by jack porter in Dev-Networking branch]
 2019-01-24 20:39:08 -05:00
marc audy
ca037cc449 Copying //UE4/Dev-Anim to Dev-Main (//UE4/Dev-Main) [at] 4803512 
#rb
#rnx

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

[CL 4804431 by marc audy in Dev-Networking branch]
 2019-01-24 16:07:24 -05:00
matt kuhlenschmidt
bd1f13779d Fix slate viewer 
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: matt.kuhlenschmidt
#ROBOMERGE-SOURCE: CL 4784056 via CL 4788832 via CL 4789078
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4803659 by matt kuhlenschmidt in Dev-Networking branch]
 2019-01-24 15:48:53 -05:00
ryan gerleve
efd1e98234 Resolving conflict. 
/src/ROBOMERGE_ENGINE_Dev_Networking/Enterprise/Plugins/Editor/DatasmithFBXImporter/Source/DatasmithDeltaGenImporter/Private/DatasmithDeltaGenImporterAuxFiles.cpp - merging //UE4/Main/Enterprise/Plugins/Editor/DatasmithFBXImporter/Source/DatasmithDeltaGenImporter/Private/DatasmithDeltaGenImporterAuxFiles.cpp#1
/src/ROBOMERGE_ENGINE_Dev_Networking/Enterprise/Plugins/Editor/DatasmithFBXImporter/Source/DatasmithDeltaGenImporter/Private/DatasmithDeltaGenImporterAuxFiles.h - merging //UE4/Main/Enterprise/Plugins/Editor/DatasmithFBXImporter/Source/DatasmithDeltaGenImporter/Private/DatasmithDeltaGenImporterAuxFiles.h#1
/src/ROBOMERGE_ENGINE_Dev_Networking/Enterprise/Plugins/Editor/MDLImporter/Source/MDLImporter/Private/MDLImporterFactory.h - merging //UE4/Main/Enterprise/Plugins/Editor/MDLImporter/Source/MDLImporter/Private/MDLImporterFactory.h#1


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

#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jeanmichel.dignard
#ROBOMERGE-SOURCE: CL 4784913 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4788073 by ryan gerleve in Dev-Networking branch]
 2019-01-23 16:05:15 -05:00
robert manuszewski
be36beb7e4 Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main) 
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 4772220 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4782699 by robert manuszewski in Dev-Networking branch]
 2019-01-23 09:49:18 -05:00
phillip kavan
86b6fa111e Fix invalid cast of a nativized enum term to its underlying pointer type in generated Blueprint C++ code. 
#rb None
#jira UE-66445

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: phillip.kavan
#ROBOMERGE-SOURCE: CL 4770254 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4782632 by phillip kavan in Dev-Networking branch]
 2019-01-23 09:47:16 -05:00
robert manuszewski
2c7eaef87f Fix hot reload compiling all game modules. Caused by AnimationSharing module declaring itself as a game module (via IModuleInterface), and hot reload disabling shared PCHs if a non-game module (determined via directory location) is being rebuilt. 
(reimplementing CL #4755564 from Dev-Core)


#rb Ben.Marsh
#lockdown Nick.Penwarden
#jira UE-68715

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 4770170 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4782630 by robert manuszewski in Dev-Networking branch]
 2019-01-23 09:47:14 -05:00
jamie dale
2a7968687a Fixed localization gather warnings 
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jamie.dale
#ROBOMERGE-SOURCE: CL 4763603 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4763614 by jamie dale in Dev-Networking branch]
 2019-01-21 15:19:57 -05:00
graeme thornton
62a6a3af2d Removed signing key generation functionality from unrealpak. Keys should be generated with the CryptoKeys plugin in the editor now 
#jira UE-68090


#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: graeme.thornton
#ROBOMERGE-SOURCE: CL 4760704 via CL 4760706 via CL 4760723
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4760777 by graeme thornton in Dev-Networking branch]
 2019-01-21 09:30:11 -05:00
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