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

957 Commits

Author SHA1 Message Date
josh adams
ba53727028 - 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.vance
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4963115 via CL 4963118 via CL 4963812 via CL 4969283
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5031108 by josh adams in Dev-VR branch]
 2019-02-16 06:02:18 -05:00
arciel rekman
c996cde458 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.vance
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4957085 in //UE4/Release-4.22/... via CL 4968444
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5030954 by arciel rekman in Dev-VR branch]
 2019-02-16 05:55:27 -05:00
justin marcus
af8d88c973 [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.vance
#ROBOMERGE-AUTHOR: justin.marcus
#ROBOMERGE-SOURCE: CL 4949345 via CL 4952070 via CL 4961624
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5030363 by justin marcus in Dev-VR branch]
 2019-02-16 05:33:21 -05:00
aaron mcleran
ad5d2a9b80 Reverting changes to engine ini files in CL 4953149 
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: aaron.mcleran
#ROBOMERGE-SOURCE: CL 4953537 via CL 4953539 via CL 4958843 via CL 4958896
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5028860 by aaron mcleran in Dev-VR branch]
 2019-02-16 04:46:36 -05:00
zak belica
7829da8722 Turning on AudioMixer for Windows, PS4, and XBOX One 
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: zak.belica
#ROBOMERGE-SOURCE: CL 4953149 via CL 4953152 via CL 4954659 via CL 4955544
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5028831 by zak belica in Dev-VR branch]
 2019-02-16 04:45:29 -05:00
Ryan Vance
b8f69c61f4 Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR) 
#rb integration

[CL 4922272 by Ryan Vance in Dev-VR branch]
 2019-02-06 13:27:58 -05:00
mitchell wilson
62805384bf Copying //UE4/Dev-Documentation to Samples-Main (//UE4/Samples-Main) CL - 4860397 
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: mitchell.wilson
#ROBOMERGE-SOURCE: CL 4860421 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4860484 by mitchell wilson in Dev-VR branch]
 2019-01-31 15:44:30 -05:00
marcus wassmer
b259f65406 Copying //UE4/Dev-Rendering[at]4854522 to Dev-Main (//UE4/Dev-Main) 
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: marcus.wassmer
#ROBOMERGE-SOURCE: CL 4854553 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4854570 by marcus wassmer in Dev-VR branch]
 2019-01-30 21:24:04 -05:00
chris gagnon
632b923945 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) 
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 4837001 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4837006 by chris gagnon in Dev-VR branch]
 2019-01-29 19:23:19 -05:00
Ryan Vance
cf29818a4d Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR) 
#rb integration
Unblocking RoboMerge

[CL 4836190 by Ryan Vance in Dev-VR branch]
 2019-01-29 17:41:46 -05:00
Ryan Vance
82046cb96e Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR) 
#rb integration
#lockdown nick.whiting

[CL 4819818 by Ryan Vance in Dev-VR branch]
 2019-01-25 23:58:19 -05:00
matt collins
0c6998256c Moving heuristics to Fortnite only. 
#jira UE-65764
#rb none

#ROBOMERGE-OWNER: jason.bestimt
#ROBOMERGE-AUTHOR: matt.collins
#ROBOMERGE-SOURCE: CL 4785067 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4802431 by matt collins in Dev-VR branch]
 2019-01-24 14:31:03 -05:00
Joe Conley
2c763c1971 Unblocking RoboMerge 
Unshelved from pending changelist '4792932':

Source=CL 4784913 in //UE4/Main/...
Acknowledger=joe.conley (Thu Jan 24 2019 17:07:18 GMT+0000 (Coordinated Universal Time))
ShelfCl=4792932
Target=Dev-VR
Merge conflict:
/src/ROBOMERGE_DEVVR_Dev_VR/Engine/Plugins/Runtime/nDisplay/Source/DisplayCluster/Private/Render/Devices/DisplayClusterDeviceBase.cpp - merging //UE4/Main/Engine/Plugins/Runtime/nDisplay/Source/DisplayCluster/Private/Render/Devices/DisplayClusterDeviceBase.cpp#7
/src/ROBOMERGE_DEVVR_Dev_VR/Engine/Source/Programs/PixelStreaming/WebRTCProxy/WebRTCProxy.sln - resolving delete from //UE4/Main/Engine/Source/Programs/PixelStreaming/WebRTCProxy/WebRTCProxy.sln#2
Delete resolve:
at: delete
ay: ignore
/src/ROBOMERGE_DEVVR_Dev_VR/Engine/Source/Programs/PixelStreaming/WebRTCProxy/WebRTCProxy.vcxproj.filters - resolving delete from //UE4/Main/Engine/Source/Programs/PixelStreaming/WebRTCProxy/WebRTCProxy...

Copying //UE4/Dev-Enterprise @ cl 4784880 to Dev-Main (//UE4/Dev-Main)

#rb none

[CL 4800808 by Joe Conley in Dev-VR branch]
 2019-01-24 12:43:34 -05:00
max chen
0072741f37 Copying //UE4/Dev-Sequencer [at] 4773300 to Dev-Main (//UE4/Dev-Main) 
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: jason.bestimt
#ROBOMERGE-AUTHOR: max.chen
#ROBOMERGE-SOURCE: CL 4773320 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4792322 by max chen in Dev-VR branch]
 2019-01-23 20:36:44 -05:00
Joe Conley
c12a880a0c Unshelved from pending changelist '4791207': 
Source=CL 4772220 in //UE4/Main/...
Acknowledger=joe.conley (Thu Jan 24 2019 00:26:59 GMT+0000 (Coordinated Universal Time))
ShelfCl=4791207
Target=Dev-VR
Merge conflict:
/src/ROBOMERGE_DEVVR_Dev_VR/Engine/Plugins/Lumin/MagicLeap/Source/MagicLeapController/Private/MagicLeapController.cpp - merging //UE4/Main/Engine/Plugins/Lumin/MagicLeap/Source/MagicLeapController/Private/MagicLeapController.cpp#5

#rb Ryan.Vance

[CL 4792243 by Joe Conley in Dev-VR branch]
 2019-01-23 19:56:41 -05:00
Ryan Vance
d57bbbcdaf Merging using MainToDevVR 
#rb integration

[CL 4748914 by Ryan Vance in Dev-VR branch]
 2019-01-17 19:43:28 -05:00
Ryan Vance
7c51ff94af Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR) 
CL 1 of 8
#rb integration

[CL 4748712 by Ryan Vance in Dev-VR branch]
 2019-01-17 18:54:05 -05:00
Ryan Vance
ee17a413b9 Lumin device profile update to fix leaking profiles when not running on device. 
#rb nick.whiting

[CL 4686752 by Ryan Vance in Dev-VR branch]
 2019-01-07 17:11:33 -05:00
Ryan Vance
61d5a87701 Removing OSVR. 
#rb cheers

[CL 4683502 by Ryan Vance in Dev-VR branch]
 2019-01-04 19:24:23 -05:00
Joe Conley
4e31ea41ab Rollback change to BaseDeviceProfiles.ini from CL-4636504 'Updated ML integration to MLSDK 0.19" 
Something was not set up correctly in one of the device profiles for Lumin, and it broke half of our automated rendering tests for windows.

#jira UE-67411 - "/UE4/Dev-VR - Run Incremental Automated Tests Win64 - 357 Errors"

#rb Ryan.Vance

[CL 4660701 by Joe Conley in Dev-VR branch]
 2018-12-13 21:07:33 -05:00
Jason Bestimt
ad9d5e5189 Updated ML integration to MLSDK 0.19 
#CodeReview: ryan.vance
#RB: ryan.vance

[CL 4636504 by Jason Bestimt in Dev-VR branch]
 2018-12-06 10:11:06 -05:00
jason bestimt
9a64d93526 -------------------------------------- 
Copying //UE4/Dev-Rendering[at]4626416 to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown nick.penwarden

#ROBOMERGE-OWNER: jason.bestimt
#ROBOMERGE-AUTHOR: marcus.wassmer
#ROBOMERGE-SOURCE: CL 4626501 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4627410 by jason bestimt in Dev-VR branch]
 2018-12-04 09:59:43 -05:00
robert manuszewski
7593c19717 The cooker will now attempt to collect garbage when the engine is getting close to running out of available UObject indices (reimplementing CL #4581474 from Dev-Core). Bumped max UObject count in the editor. 
#rb none
#jira UE-66989
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: jason.bestimt
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 4614594 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4614607 by robert manuszewski in Dev-VR branch]
 2018-11-30 00:48:18 -05:00
Jason Bestimt
e7ed7cd3ff Unblock robomerge from Main 
#RB:none

[CL 4604382 by Jason Bestimt in Dev-VR branch]
 2018-11-28 15:05:11 -05:00
demonixis
b87e17ab5d Merging CL 4573359 from //UE4/Release-4.21 
PR #5265: Removed duplicated WindowsMixedRealityHMD entry (Contributed by demonixis)

#jira UE-66329
#rb Jules.Blok

[CL 4573522 by Jules Blok in Dev-VR branch]
 2018-11-16 15:13:18 -05:00