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
47,511 Commits 23 Branches 254 Tags
46985a773e0ecd229b6fcb2bcece205ea85f95dd
Commit Graph

942 Commits

Author SHA1 Message Date
ethan geller
54e9d96e2a #jira UE-70387 Fix up INI files to make sure we are using AudioMixerAndroid rather than AndroidAudio backend. #rb none #fyi aaron.mcleran, chris.babcock 
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ethan.geller
#ROBOMERGE-SOURCE: CL 5119930 in //UE4/Release-4.22/... via CL 5206672
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5220239 by ethan geller in Dev-Networking branch]
 2019-02-26 21:01:14 -05:00
phillip kavan
1fc0caa26d Fix for nativized builds failing on a VirtualProductionUtilities plugin Blueprint asset dependency. 
#rnx
#rb None
#jira UE-70351

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

[CL 5220108 by phillip kavan in Dev-Networking branch]
 2019-02-26 21:00:50 -05:00
billy mccarroll
097eccee76 Fixes to spectator JIP. Make sure spectator beacon timeout variables are initialized. 
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: billy.mccarroll
#ROBOMERGE-SOURCE: CL 5062489 via CL 5062496 via CL 5062916 via CL 5062978
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5135946 by billy mccarroll in Dev-Networking branch]
 2019-02-22 03:54:29 -05:00
rolando caloca
48e3743b27 UE4.22 - Revert to emulated uniform buffers on Vulkan for all platforms 
#rb none
#rnx
#jira UE-66920

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: rolando.caloca
#ROBOMERGE-SOURCE: CL 5048928 in //UE4/Release-4.22/... via CL 5048938
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5129484 by rolando caloca in Dev-Networking branch]
 2019-02-22 02:10:28 -05:00
ben zeigler
ddb31795df #jira UE-69912 Fix crashes in ToggleDebugCamera if the selected actor was destroyed/modified while active by exposing object properties to the GC 
Remove old ShowSelectedLightmap debug command as it was unsafe and not publicly exposed
#rb michael.noland

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

[CL 5129382 by ben zeigler in Dev-Networking branch]
 2019-02-22 02:09:37 -05:00
bob tellez
b4c2ac17dc Merging CL#5013294 
Support for AnimClass Property Track by exposing SetAnimClass,GetAnimClass.
Added redirects for k2_SetAnimInstanceClass (and previous SetAnimInstanceClass).

Copy from Dev-Sequencer

#jira UE-65524
#rb mike.zyracki
[FYI] juan.collado

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: Max.Chen
#ROBOMERGE-SOURCE: CL 5014755 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5086092 by bob tellez in Dev-Networking branch]
 2019-02-19 20:05:32 -05:00
juan canada
0564fcebfe Copying //UE4/Private-Woodchuck-Staging[at]4997051 to Release-4.22 (//UE4/Release-4.22) 
#rb none
#jira
[FYI] marcus.wassmer
[FYI] zachary.wilson

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: juan.canada
#ROBOMERGE-SOURCE: CL 4997195 in //UE4/Release-4.22/... via CL 4997198
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5083157 by juan canada in Dev-Networking branch]
 2019-02-19 19:16:58 -05:00
jamie dale
e90473ddd5 Removing redundant config file that no longer works 
#jira UE-70002
#rnx

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

[CL 5083062 by jamie dale in Dev-Networking branch]
 2019-02-19 19:15:59 -05:00
dmitriy dyomin
b9305974ad Disable Vulkan support on Adreno 5xx based devices running Android 6, driver issues. 
#jira UE-65480
#rb jack.porter

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: dmitriy.dyomin
#ROBOMERGE-SOURCE: CL 4992184 in //UE4/Release-4.22/... via CL 4992187
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5080934 by dmitriy dyomin in Dev-Networking branch]
 2019-02-19 18:52:40 -05:00
dmitriy dyomin
103a2ff14d Disabled ES3.1 support on PowerVR Rogue G6xxx devices, as they don't work properly with it 
Added PowerVRHigh device profile which will match Rogue G7xxx and up.
#jira UE-64286

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: dmitriy.dyomin
#ROBOMERGE-SOURCE: CL 4981532 in //UE4/Release-4.22/... via CL 4981533
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5078597 by dmitriy dyomin in Dev-Networking branch]
 2019-02-19 18:24:55 -05:00
josh adams
c510e3cc7b - Memory Mapped IO enabled on IOS for Audio (via ini and platform property) 
- -nommio on the commandline will disble it for testing
#rb gil.gribb

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4963115 via CL 4963118 via CL 4963812 via CL 4969283
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5074095 by josh adams in Dev-Networking branch]
 2019-02-19 17:29:04 -05:00
arciel rekman
b891751b83 Ensures: fixed discrepancy between the UI and the actual setting (UE-69764) 
- Also hardened the code.

#rb none
#jira UE-69764
[FYI] Marcin.Undak

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4957085 in //UE4/Release-4.22/... via CL 4968444
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5073819 by arciel rekman in Dev-Networking branch]
 2019-02-19 17:25:37 -05:00
justin marcus
a72aa3c306 [CODEREVIEW] justin.marcus,jeff.williams 
Merge conflict.
justin.marcus, please merge this change by hand.
More info at https://robomerge.epicgames.net#FORTNITE

/src/robomerge_ue4_main_01/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformMisc.cpp - merging //Fortnite/Dev-EngineMerge/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformMisc.cpp#3
/src/robomerge_ue4_main_01/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericWidePlatformString.cpp - merging //Fortnite/Dev-EngineMerge/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericWidePlatformString.cpp#4
/src/robomerge_ue4_main_01/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatformMisc.h - merging //Fortnite/Dev-EngineMerge/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatformMisc.h#3


--------------------------------------
Merging //Fortnite/Dev-Kairos to Main (//Fortnite/Main)

Get Install Bundle Manager and dependcies building in main.




#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: justin.marcus
#ROBOMERGE-SOURCE: CL 4949345 via CL 4952070 via CL 4961624
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5073469 by justin marcus in Dev-Networking branch]
 2019-02-19 17:16:21 -05:00
aaron mcleran
bc163c3601 Reverting changes to engine ini files in CL 4953149 
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: aaron.mcleran
#ROBOMERGE-SOURCE: CL 4953537 via CL 4953539 via CL 4958843 via CL 4958896
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5073054 by aaron mcleran in Dev-Networking branch]
 2019-02-19 16:58:03 -05:00
zak belica
009a120330 Turning on AudioMixer for Windows, PS4, and XBOX One 
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: zak.belica
#ROBOMERGE-SOURCE: CL 4953149 via CL 4953152 via CL 4954659 via CL 4955544
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5073017 by zak belica in Dev-Networking branch]
 2019-02-19 16:56:37 -05:00
marc audy
5cd2c165e0 Rename bSpawnPawn to accurate bSpawnPlayerController for UGameplayStatics::CreatePlayer. 
Also clarify parameter name for UGameInstance::CreateLocalPlayer
#jira UE-69170
#rb Michael.Noland

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

[CL 5067185 by marc audy in Dev-Networking branch]
 2019-02-19 14:55:21 -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
thomas ross
09adbeb940 Adding background http protype system. Enables downloading files while app is suspended on iOS. Other platforms need to be added over time if desired. For now other platforms just wrap basic HTTPRequests under the hood. 
#rb none
#tests iOS / Android
[CODEREVIEW] Andrew.Grant,Daniel.Lamb,Justin.Marcus
[FYI] Pete.Sauerbrei

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: thomas.ross
#ROBOMERGE-SOURCE: CL 4898958 via CL 4898963 via CL 4898965 via CL 4905881 via CL 4906509
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5065194 by thomas ross in Dev-Networking branch]
 2019-02-19 14:21:20 -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
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
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
sam zamani
9c1c3cc4fd Added "NetErrorLogInterval" config to reduce network connection failure log spam 
[at]josh.markiewicz, [at]ryan.gerleve

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: sam.zamani
#ROBOMERGE-SOURCE: CL 4806517 via CL 4806787 via CL 4806834 via CL 4809381 via CL 4809616
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4810051 by sam zamani in Dev-Networking branch]
 2019-01-25 05:16:42 -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