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
49,852 Commits 23 Branches 254 Tags
ffcf145baa4e80530403db072f8d59401cd74776
Commit Graph

924 Commits

Author SHA1 Message Date
cosmin sulea
652e1658e7 UE-63767 - iOS Device Output Log console does not work 
#jira UE-63767
#rb Jack.Porter

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5036543 in //UE4/Release-4.22/... via CL 5036544
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5122300 by cosmin sulea in Dev-Anim branch]
 2019-02-22 00:59:24 -05:00
josh adams
c69edb5ee7 - Final fix now for merge issue (I had compiled wrong program to test my fix, oops) 
#jira none
#rb none

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4975198 in //UE4/Main/...
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5030131 by josh adams in Dev-Anim branch]
 2019-02-16 05:19:13 -05:00
josh adams
fe4d0edc2f - Proper fix to merge conflicts 
#jira nojira
[FYI] bob.tellez
#rb none

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4974522 in //UE4/Main/...
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5030058 by josh adams in Dev-Anim branch]
 2019-02-16 05:17:28 -05:00
bob tellez
5591624444 Back out revision 103 from CopyBuildToStagingDirectory.Automation.cs to fix CIS 
#jira nojira
[FYI] Josh.Adams
#rb none

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: bob.tellez
#ROBOMERGE-SOURCE: CL 4974353 in //UE4/Main/...
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5030051 by bob tellez in Dev-Anim branch]
 2019-02-16 05:17:22 -05:00
arciel rekman
750f72e041 PhysX: change v13 Linux toolchain to v12 one (for real). 
- There are issues when the libraries are compiled with clang 7.0.1 (tracked as UE-69848).

#rb Ben.Marsh
#rnx
[FYI] [at]Bob.Tellez

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4963477 via CL 4963480 via CL 4964321 via CL 4969377
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5027996 by arciel rekman in Dev-Anim branch]
 2019-02-16 04:10:06 -05:00
arciel rekman
2dd720d583 PhysX: change v13 Linux toolchain to v12 one. 
- There are issues when the libraries are compiled with clang 7.0.1 (tracked as UE-69848).

#rb Ben.Marsh
#rnx
[FYI] [at]Bob.Tellez

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4963367 via CL 4963372 via CL 4964207 via CL 4969343
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5027980 by arciel rekman in Dev-Anim branch]
 2019-02-16 04:09:50 -05:00
josh adams
a487e89fda - 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: lina.halper
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4963115 via CL 4963118 via CL 4963812 via CL 4969283
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5027870 by josh adams in Dev-Anim branch]
 2019-02-16 04:08:25 -05:00
ben marsh
8abb70f32e Fix ue4commandline.txt being written to engine directory during staging. 
#rb none
#jira UE-69193

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4967031 in //UE4/Release-4.22/... via CL 4968665
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5027829 by ben marsh in Dev-Anim branch]
 2019-02-16 04:08:01 -05:00
arciel rekman
60ed7118dc PhysX: change v13 Linux toolchain to v12 one. 
- There are issues when the libraries are compiled with clang 7.0.1 (tracked as UE-69848).

#jira UE-69848
#rb Ben.Marsh
#rnx

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4965320 in //UE4/Release-4.22/... via CL 4968661
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5027825 by arciel rekman in Dev-Anim branch]
 2019-02-16 04:08:00 -05:00
ben marsh
2f3d0cb869 Fix times for MSVC timing info being out by a factor of 1000. 
#rb none
#jira

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4919950 via CL 4922411 via CL 4922639
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5018259 by ben marsh in Dev-Anim branch]
 2019-02-16 01:36:38 -05:00
Lina Halper
f7baa58bc9 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) 
#fyi: Laurent.Delayen, James.Hopkin
#rb: none

[CL 4923303 by Lina Halper in Dev-Anim branch]
 2019-02-06 14:35:56 -05:00
Thomas Sarkanen
fdcba8f624 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4822026 
#rb none
#jira none

[CL 4822205 by Thomas Sarkanen in Dev-Anim branch]
 2019-01-28 05:55:22 -05:00
Marc Audy
e5610adfd8 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ 4802313 
#rb
#rnx
#lockdown Laurent.Delayen

[CL 4803512 by Marc Audy in Dev-Anim branch]
 2019-01-24 15:32:49 -05:00
Thomas Sarkanen
cc942a3341 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4768627 
#rb none
#jira none

[CL 4769629 by Thomas Sarkanen in Dev-Anim branch]
 2019-01-22 06:48:04 -05:00
Lina Halper
f473c3d669 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) 
#fyi: Laurent.Delayen, Thomas.Sarkanen
#rb: none
#lockdown thomas.sarkanen

[CL 4715236 by Lina Halper in Dev-Anim branch]
 2019-01-11 21:07:09 -05:00
Thomas Sarkanen
b709a10f4c Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4708558 
#rb none
#jira none
#lockdown Laurent.Delayen

[CL 4708630 by Thomas Sarkanen in Dev-Anim branch]
 2019-01-11 07:37:39 -05:00
Thomas Sarkanen
e0f6136524 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4704791 
#rb none
#jiira none

[CL 4708070 by Thomas Sarkanen in Dev-Anim branch]
 2019-01-11 04:11:30 -05:00
Thomas Sarkanen
7088a2f273 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4683693 
#rb none
#jira none

[CL 4684302 by Thomas Sarkanen in Dev-Anim branch]
 2019-01-07 05:38:46 -05:00
Thomas Sarkanen
8ba3c4c087 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671 
#rb none
#jira none

[CL 4665410 by Thomas Sarkanen in Dev-Anim branch]
 2018-12-17 06:31:16 -05:00
Thomas Sarkanen
ce1d05fdb1 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4620382 
#rb none
#jira none

[CL 4623267 by Thomas Sarkanen in Dev-Anim branch]
 2018-12-03 05:28:11 -05:00
Thomas Sarkanen
c51a339259 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4574801 
#jira none
#rb none

[CL 4575789 by Thomas Sarkanen in Dev-Anim branch]
 2018-11-19 07:03:18 -05:00
Thomas Sarkanen
c359a36380 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4534846 
#rb none
#jira none

[CL 4539252 by Thomas Sarkanen in Dev-Anim branch]
 2018-11-05 05:56:30 -05:00
ben marsh
2423ffb06b Create a separate installed DDC pak file for Enterprise. 
#rb none
#jira UE-65228

#ROBOMERGE-SOURCE: CL 4476497 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4476512 by ben marsh in Staging-4.21 branch]
 2018-10-16 17:26:31 -04:00
ben marsh
a1c5452e98 Fixes to plugin packaging script. 
* Now much simpler to build a plugin against a target: UE4Game Win64 Development -Plugin=Foo.uplugin will now configure all appropriate settings and will include all files to be distributed in the manifest.
* BuildPlugin command in UAT now uses the manifest to determine which files need to be distributed.

#rb none
#jira UE-65189

#ROBOMERGE-SOURCE: CL 4462075 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4462077 by ben marsh in Staging-4.21 branch]
 2018-10-12 16:52:09 -04:00
chad garyet
55945b99dc Integrating changes from dev-build over to release-4.21 
- Add win64 host support to DDC Group Linux
- Change project params split to remove empty entries
- Change BuildDerivedDataCache to skip building a feature pack if there are no project specific platforms for it out of the available targetplatforms
#jira UE-62311
#rb ben.marsh

#ROBOMERGE-SOURCE: CL 4431926 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4431927 by chad garyet in Staging-4.21 branch]
 2018-10-05 11:15:17 -04:00