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
wyeth johnson
0e92264831
AdvancedDisplay Flag on Spawn Burst
...
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: wyeth.johnson
#ROBOMERGE-SOURCE: CL 4831507 via CL 4834336 via CL 4834357
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4834377 by wyeth johnson in Dev-Networking branch]
2019-01-29 15:13:39 -05:00
wyeth johnson
a99b334935
Burst spawning now supports spawn groups
...
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: wyeth.johnson
#ROBOMERGE-SOURCE: CL 4831482 via CL 4834106 via CL 4834113
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4834205 by wyeth johnson in Dev-Networking branch]
2019-01-29 14:55:55 -05:00
James Hopkin
51d5e59cbe
Copying //UE4/Dev-Console to Main (//UE4/Main) Source CL: 4825024
...
#lockdown: Nick.Penwarden
#rb integration
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: joe.barnes
#ROBOMERGE-SOURCE: CL 4825156 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4828298 by James Hopkin in Dev-Networking branch]
2019-01-29 04:28:43 -05:00
ryan vance
398a8c4814
Copying //UE4/Dev-VR to Dev-Main (//UE4/Dev-Main) Souce CL: 4824152
...
#lockdown: Nick.Penwarden
#rb Integration
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ryan.vance
#ROBOMERGE-SOURCE: CL 4824851 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4824878 by ryan vance in Dev-Networking branch]
2019-01-28 16:32:53 -05:00
chris babcock
a2934b0518
Add some protection to controller polling for Java exceptions
...
#android
#rb Peter.Sauerbrei
[REVIEW]
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 4817444 via CL 4817453 via CL 4817456 via CL 4819002 via CL 4819100
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4819434 by chris babcock in Dev-Networking branch]
2019-01-25 22:57:31 -05:00
jack porter
27e6147a55
Add missing DeploymentServerLauncher
...
#rb None
#jira UE-69121
#lockdown: Nick.Penwarden
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 4818058 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4818066 by jack porter in Dev-Networking branch]
2019-01-25 19:40:10 -05:00
ben marsh
51a777abee
Change cl-filter to not treat carriage return characters as line terminators, so the input buffer isn't split on them if a following carriage return didn't fit.
...
#rb none
#rnx
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4814235 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4814243 by ben marsh in Dev-Networking branch]
2019-01-25 13:34:49 -05:00
rob gay
3a88b54176
Copying //UE4/Dev-Audio to Dev-Main (//UE4/Dev-Main) Souce CL: 4806741
...
#rb aaron.mcleran
#lockdown aaron.mcleran
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: rob.gay
#ROBOMERGE-SOURCE: CL 4806765 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4806770 by rob gay in Dev-Networking branch]
2019-01-24 20:59:01 -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
Ryan Gerleve
f96a7c0d77
Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)
...
#rnx
#rb none
[CL 4804506 by Ryan Gerleve in Dev-Networking branch]
2019-01-24 16:19:42 -05:00
mic rooney
f28e7de1c2
Adding support for Razer controllers in Android input and making trigger threshold in line with other platforms.
...
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: mic.rooney
#ROBOMERGE-SOURCE: CL 4793200 via CL 4799034 via CL 4799084 via CL 4800920 via CL 4801057
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4804369 by mic rooney in Dev-Networking branch]
2019-01-24 16:05:53 -05:00
ben marsh
dfe427facc
Fix cl-filter always reading into the start of the buffer.
...
#rb none
#rnx
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4785039 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4788123 by ben marsh in Dev-Networking branch]
2019-01-23 16:06:36 -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
ben marsh
61fc1045a5
Change how cl-filter buffers output text. Since MultiByteToWideChar doesn't report back how many input characters were actually used, we can drop output that wasn't converted into the output buffer if the stdout pipe is full. Instead, always look for ANSI markers indicating the presence of an include file, and redirect based on that. This makes the assumption that CL.EXE outputs single-byte ANSI strings for all supported codepages; if not, we'll either have to buffer the whole output and convert at once, or step through the output text one character at a time.
...
#rb none
#rnx
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4783512 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4785296 by ben marsh in Dev-Networking branch]
2019-01-23 15:13:28 -05:00
chris babcock
163c5041c0
Allow URLs other than http[s]:// on Android for LaunchURL
...
#jira UE-68888
#ue4
#android
#rb Matthew.Clark
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 4772565 via CL 4772879 via CL 4778845 via CL 4779002
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4783091 by chris babcock in Dev-Networking branch]
2019-01-23 10:01:35 -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
thomas sarkanen
7ce2df7b88
Fixed sorting & layout issues with anim nodes
...
Fixed anim node details customization so that it respects code re-ordered parameters and ordering metadata.
Fixed EditCondition and (As Pin) indicators causing double-checkboxes.
Moved (As Pin) indicators to a right-aligned checkbox instead of right-aligning the label.
Reordered anim node properties: AnimDynamics, ApplyAdditive, BlendBoneByChannel.
Also manually resized the 'eye' icon (as it was box filtered form 40x40) & fixed up asymmetric padding for its checkbox style. This means 'public' checkboxes in Blueprints are now square!
#rb Jurre.deBaare
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: thomas.sarkanen
#ROBOMERGE-SOURCE: CL 4738868 via CL 4738870 via CL 4738871 via CL 4738872
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4738875 by thomas sarkanen in Dev-Networking branch]
2019-01-17 04:08:30 -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
0caa2a0800
Resolving Dev-Niagara push to FN/Main and UE4/Main. UE4/Main has the correct versions, so just accepting Target
...
#rb None
#tests n/a
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: shaun.kime
#ROBOMERGE-SOURCE: CL 4735923 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4735926 by shaun kime in Dev-Networking branch]
2019-01-16 15:36:26 -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
ben marsh
82f2080de3
Copy UGS from Dev-Build (pt 2)
...
#rb none
#rnx
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4732764 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4733960 by ben marsh in Dev-Networking branch]
2019-01-16 13:39:33 -05:00
ryan gerleve
cac17e709a
Fixing merge conflict.
...
/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Source/Programs/UnrealGameSync/UnrealGameSync/Forms/PerforceSyncSettingsWindow.cs - merging //UE4/Main/Engine/Source/Programs/UnrealGameSync/UnrealGameSync/Forms/PerforceSyncSettingsWindow.cs#1
--------------------------------------
Copying latest UGS from Dev-Build (pt 1)
#rb none
#rnx
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4732753 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4733949 by ryan gerleve in Dev-Networking branch]
2019-01-16 13:38:33 -05:00
david hamm
c75081b36f
Added support for using display cutout region on Android
...
- added new project setting bUseDisplayCutout
- temporary restriction to HUAWEI devices for this release (remove later)
#android
#rb Jack.Porter
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 4732433 via CL 4732462 via CL 4732476 via CL 4732493 via CL 4732510
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4732567 by david hamm in Dev-Networking branch]
2019-01-16 10:14:53 -05:00
josh jensen
aa74422202
Updated the SM5/SM4/HTML5 placeholder icons for the Preview Mode button
...
#jira UE-68357
#rb Allan.Bentham
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: josh.jensen
#ROBOMERGE-SOURCE: CL 4732184 via CL 4732185 via CL 4732187
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4732188 by josh jensen in Dev-Networking branch]
2019-01-16 09:35:08 -05:00