brian zaugg
ec8a39c13a
#ocn - Hotfix from 6258862 to fix iOS link failing with argument list too long.
...
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: brian.zaugg
#ROBOMERGE-SOURCE: CL 6265085 via CL 6265224 via CL 6265383
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 6280360 by brian zaugg in Dev-VR branch]
2019-05-03 17:17:07 -04:00
jack porter
23aba70caa
Back out CL5935374 for UE-72100 as it causes 3 other issues
...
#jira UE-73066
#jira UE-73067
#jira UE-73073
#rb John.Mauney
#lockdown Cristina.Riveron
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 6042758 in //UE4/Release-4.22/... via CL 6042759
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 6045057 by jack porter in Dev-VR branch]
2019-04-22 21:14:18 -04:00
cosmin sulea
f05f16b1b3
UE-72100 - tvOS For Distribution packages fail with Code Signing Error if made after a Development Build
...
#jira UE-72100
#rb Jack.Porter
#lockdown Cristina.Riveron
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5935374 in //UE4/Release-4.22/... via CL 5935375
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5947138 by cosmin sulea in Dev-VR branch]
2019-04-17 13:53:17 -04:00
sorin gradinaru
31a34f1551
UE-72058 tvOS: Project Packaged with CloudKit Support Crashes on Launch Due to Malformed Value in the Entitlement
...
#jira UE-72058
#tvOS
#4.22.1
#rb Jack.Porter
Manually integrated (robomerge errors) from CL5731997
When building on Mac, the packaging & signing rely on the entitlements file.
- the values should correspond to those in the entitlements (take into account syntax differences). Fixed problems related to icloud-container-identifiers, ubiquity-container-identifiers and com.apple.developer.icloud-services
- ICloudContainerIdentifier added to the tvOS plist (previously it was added on iOS)
- added com.apple.developer.icloud-container-environment to the entitlements file, needed when signing the package
- shipping build with CloudKit should also have the push notifications enabled
- fixed an issue with com.apple.developer.associated-domains when the value is a string, not an array
- addding CODE_SIGN_ENTITLEMENTS in the project file
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: sorin.gradinaru
#ROBOMERGE-SOURCE: CL 5732468 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5735260 by sorin gradinaru in Dev-VR branch]
2019-04-04 09:06:28 -04:00
cosmin sulea
48a22242ee
ROBOMERGE conflict 5630547 resolved UE-71953 - Blueprint iOS projects can't package For Distribution
...
#jira UE-71953
#rb Jack.Porter
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5630708 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5635447 by cosmin sulea in Dev-VR branch]
2019-03-28 17:00:11 -04:00
jules blok
f052c97b89
Escape all paths when generating VS project filter files
...
#jira UE-71727
#rb Jack.Porter
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: jules.blok
#ROBOMERGE-SOURCE: CL 5439949 in //UE4/Release-4.22/... via CL 5439986
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5443382 by jules blok in Dev-VR branch]
2019-03-19 01:06:29 -04:00
ben marsh
5a29ddd251
UBT: Fix generated config files not being read by UBT, or being considered when determining if makefiles are out of date.
...
#rb none
#jira UE-71501
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5392870 in //UE4/Release-4.22/... via CL 5392891
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5394497 by ben marsh in Dev-VR branch]
2019-03-13 21:04:41 -04:00
Ryan Vance
35eb0041ab
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
...
#rb integration
[CL 5387703 by Ryan Vance in Dev-VR branch]
2019-03-13 15:19:08 -04:00
josh adams
41ae462231
- Changed how framework signing for dylibs works. Remove the framework searching from Xcode into UBT (likely a placeholder spot until we overhaul some things)
...
- This keeps Mac from failing with SG_Com because now it only signs what has been staged via UBT/UAT
#rb michael.trepka (well, the concept, i had to get this in today, and he is OOO, but he will look at this tomorrow)
[FYI] michael.trepka
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 5290031 via CL 5294615 via CL 5294617
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5304550 by josh adams in Dev-VR branch]
2019-03-05 15:50:42 -05:00
ben marsh
f0f6e5f99c
UBT: Include other files in the project directory within the generated projects.
...
#rb none
#rnx
#jira
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5271663 in //UE4/Release-4.22/... via CL 5271664
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5274343 by ben marsh in Dev-VR branch]
2019-03-01 21:00:32 -05:00
josh adams
019c12863e
- Merging Dev-Kairos/Engine/... to Main/Engine/...
...
- Brings over the necessary engine changes for embedding UE4 mobile as a dylib/so in native mobile app
- Various changes for facial animation, screen recording, others
- ARKit and ARCore plugins were removed, as deemed "not ready"
#rb many people
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 5201138 via CL 5203024 via CL 5226277
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5244512 by josh adams in Dev-VR branch]
2019-02-28 17:06:02 -05:00
ben marsh
3554ddf318
Add Visual Studio 2019 as a compiler for generating intellisense data.
...
#rb none
#rnx
#jira
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4993256 in //UE4/Release-4.22/... via CL 4993257
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5074233 by ben marsh in Dev-VR branch]
2019-02-19 17:33:00 -05:00
ben marsh
ba1f76a40c
UBT: Update toolset version number for Visual Studio 2019 preview 2.
...
#rb none
#jira
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4954380 in //UE4/Release-4.22/... via CL 4968431
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5030943 by ben marsh in Dev-VR branch]
2019-02-16 05:55:05 -05:00
ben marsh
8d5f9f3977
UBT: Fix the user's selected Visual Studio version not being respected when generating project files.
...
#rb none
#jira UE-69239
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4951803 in //UE4/Release-4.22/... via CL 4968336
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5030935 by ben marsh in Dev-VR branch]
2019-02-16 05:54:48 -05:00
arciel rekman
d5c356b9c0
Linux: harden the UBT makefile generator against .target.cs
...
#rb none
#jira none
[FYI] Brandon.Schaefer
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4950441 in //UE4/Release-4.22/... via CL 4950443
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5026766 by arciel rekman in Dev-VR branch]
2019-02-16 03:50:42 -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
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
20aac7875a
Integration fallout
...
#rb trivial
[CL 4749217 by Ryan Vance in Dev-VR branch]
2019-01-17 21:20:28 -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
Joe Conley
8de5c67bec
Revert UnrealBuildTool changes from CL-4636504 "Updated ML integration to MLSDK 0.19"
...
It appers to have made it so compiling in Visual Studio cooks and deploys to device. That is not consistent with any other platform.
#rb Ryan.Vance, Ben.Marsh
[CL 4642351 by Joe Conley in Dev-VR branch]
2018-12-07 16:39:11 -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
Joe Graf
65b8d8f518
Moved CLion specific functions from the general cmake project file to the CLion specific generator
...
Changed output of the ignore xml to be utf8
#rb: none
[CL 4611720 by Joe Graf in Dev-VR branch]
2018-11-29 14:58:30 -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
ben marsh
f011ad75de
Merge fixes to project file generator from 4.21 branch (duplicate projects appearing in Xcode workspace, incorrect version association for solution on Windows)
...
#rb none
#lockdown Nick.Penwarden
#ROBOMERGE-OWNER: jason.bestimt
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4551290 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 4551298 by ben marsh in Dev-VR branch]
2018-11-08 10:18:30 -05:00