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,334 Commits 23 Branches 254 Tags
8a6e01f442c6b4eaa17833a235fed8bb08f57725
Commit Graph

8743 Commits

Author SHA1 Message Date
yasiman ahsani
ef291c4b3b Adding TPS licenses. 
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: yasiman.ahsani
#ROBOMERGE-SOURCE: CL 4868940 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4884170 by yasiman ahsani in Dev-Networking branch]
 2019-02-04 12:23:07 -05:00
ben marsh
9a25c193a9 Fix warnings building DDC on Windows, due to DeploymentServer.exe not being copied into the correct output directory. 
#rb none
#jira

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

[CL 4883989 by ben marsh in Dev-Networking branch]
 2019-02-04 12:15:19 -05:00
James Hopkin
03fa8c7775 Manual merge changelist that broke RoboMerge, due to weird integration records for test files 
Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)

Copying //UE4/Dev-Documentation to Samples-Main (//UE4/Samples-Main) CL - 4860397
#rb none

[CL 4883189 by James Hopkin in Dev-Networking branch]
 2019-02-04 09:35:31 -05:00
wyeth johnson
602e0762cb Enable Spawngroup on Spawn Per Unit 
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: wyeth.johnson
#ROBOMERGE-SOURCE: CL 4859761 via CL 4864753 via CL 4864852
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4865146 by wyeth johnson in Dev-Networking branch]
 2019-02-01 09:29:39 -05:00
jack porter
1b4db19019 Added mobile device bezel image TPS files 
#jira UE-59734
#rb None
#lockdown Nick.Penwarden

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

[CL 4863330 by jack porter in Dev-Networking branch]
 2019-02-01 05:55:30 -05:00
ben marsh
bae1e02719 Update version in Main to 4.23. 
#rb none

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

[CL 4863329 by ben marsh in Dev-Networking branch]
 2019-02-01 05:55:29 -05:00
ryan gerleve
f3be613426 Fix merge conflicts. 
--------------------------------------
Copying //UE4/Dev-Online to Dev-Main (//UE4/Dev-Main)
Source: //UE4/Dev-Online 4860295

#rb none

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

[CL 4860452 by ryan gerleve in Dev-Networking branch]
 2019-01-31 15:36:12 -05:00
simon therriault
89dcd34b1c - Removing two bad BP assets in Composure plugin 
#rb none
#jira UE-69278

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: simon.therriault
#ROBOMERGE-SOURCE: CL 4860166 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4860169 by simon therriault in Dev-Networking branch]
 2019-01-31 14:46:22 -05:00
hongyi yu
49cc308f71 Revert a unexpected change made to MatLayerBlend_AddWorldPositionOffset.uasset 
#jira UE-69219

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: hongyi.yu
#ROBOMERGE-SOURCE: CL 4858934 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4859610 by hongyi yu in Dev-Networking branch]
 2019-01-31 12:47:40 -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
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