Commit Graph

919 Commits

Author SHA1 Message Date
ben marsh
ee55e0d236 Remove RPCUtility.
#rb none
#jira UE-70509
[FYI] Peter.Sauerbrei

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

[CL 5235370 by ben marsh in Dev-Networking branch]
2019-02-27 18:57:01 -05:00
cosmin sulea
9d2343c6bb UE-63767 - iOS Device Output Log console does not work
#jira UE-63767
#rb Jack.Porter

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5036543 in //UE4/Release-4.22/... via CL 5036544
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

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

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4975198 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5077462 by josh adams in Dev-Networking branch]
2019-02-19 18:12:20 -05:00
josh adams
26db8ffee8 - Proper fix to merge conflicts
#jira nojira
[FYI] bob.tellez
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4974522 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5077348 by josh adams in Dev-Networking branch]
2019-02-19 18:11:13 -05:00
bob tellez
36928a7c13 Back out revision 103 from CopyBuildToStagingDirectory.Automation.cs to fix CIS
#jira nojira
[FYI] Josh.Adams
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: bob.tellez
#ROBOMERGE-SOURCE: CL 4974353 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5077336 by bob tellez in Dev-Networking branch]
2019-02-19 18:11:07 -05:00
arciel rekman
cc0ff9c477 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: ryan.gerleve
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4963477 via CL 4963480 via CL 4964321 via CL 4969377
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5074136 by arciel rekman in Dev-Networking branch]
2019-02-19 17:30:11 -05:00
arciel rekman
0440bc8e10 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: ryan.gerleve
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4963367 via CL 4963372 via CL 4964207 via CL 4969343
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5074128 by arciel rekman in Dev-Networking branch]
2019-02-19 17:29: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
ben marsh
ae5b5a71e1 Fix ue4commandline.txt being written to engine directory during staging.
#rb none
#jira UE-69193

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

[CL 5074074 by ben marsh in Dev-Networking branch]
2019-02-19 17:28:42 -05:00
arciel rekman
f8fce972cc 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: ryan.gerleve
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4965320 in //UE4/Release-4.22/... via CL 4968661
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5074073 by arciel rekman in Dev-Networking branch]
2019-02-19 17:28:41 -05:00
ben marsh
b9d91bddfa Fix times for MSVC timing info being out by a factor of 1000.
#rb none
#jira

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4919950 via CL 4922411 via CL 4922639
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5067370 by ben marsh in Dev-Networking branch]
2019-02-19 15:00:34 -05:00
ben marsh
f012412d60 Add missing copyright notice.
#rb none
#rnx

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

[CL 4911751 by ben marsh in Dev-Networking branch]
2019-02-05 18:46:13 -05:00
ben marsh
0e5b708598 Parse out a sorted list of classes and functions from the MSVC timing info. Groups templates together, to allow better understanding the most expensive code to compile.
#jira

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4896229 via CL 4896975 via CL 4896977
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4911045 by ben marsh in Dev-Networking branch]
2019-02-05 18:42:23 -05:00
ben marsh
da9128a5cd UAT: Add a build command to parse the output from MSVC's /d1reportTime argument, and convert it into a trace that can be visualized in Chrome's chrome://tracing tab.
To generate an input file, compile a single file with UnrealBuildTool and redirect the output to a text file:

    UnrealBuildTool.exe UE4Editor Win64 Development -SingleFile="E:\P4\Engine\Source\Runtime\Core\Private\Misc\CoreGlobals.cpp" -Timing > E:\Output.txt

To convert into a trace readable by chrome:

   AutomationTool.exe ParseMsvcTimingInfo -File=E:\Output.txt

Output file will be written to the same directory as the input file, but with a json extension.

#jira

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4896073 via CL 4896742 via CL 4896785
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4910920 by ben marsh in Dev-Networking branch]
2019-02-05 18:42:07 -05:00
jamie dale
d74b44831a Allow Localization Automation to be be submitted to Perforce
#rb Ben.Marsh

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

[CL 4859609 by jamie dale in Dev-Networking branch]
2019-01-31 12:47:39 -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
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
robert manuszewski
be36beb7e4 Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 4772220 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4782699 by robert manuszewski in Dev-Networking branch]
2019-01-23 09:49:18 -05:00
graeme thornton
0fb3354acc When adding additional files to the UFS staging list, omit movie files on dedicated servers
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: graeme.thornton
#ROBOMERGE-SOURCE: CL 4760621 via CL 4760623 via CL 4760625 via CL 4760626
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4760627 by graeme thornton in Dev-Networking branch]
2019-01-21 08:44:22 -05:00
ben marsh
cf4a18955c Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

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

[CL 4718825 by ben marsh in Dev-Networking branch]
2019-01-14 12:15:37 -05:00
david harvey
203aee25a3 modifying BuildPhysX to automatically include a 'github ignore' tag so the automated Build PhysX can check in again.
#rb anthony.bills
[FYI] ben.marsh

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: david.harvey
#ROBOMERGE-SOURCE: CL 4709402 via CL 4709418
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4712498 by david harvey in Dev-Networking branch]
2019-01-11 14:39:20 -05:00
ryan gerleve
b41214417e Resolving conflict from Dev-Enterprise.
/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Source/Runtime/Sockets/Private/BSDSockets/SocketsBSD.cpp - merging //UE4/Main/Engine/Source/Runtime/Sockets/Private/BSDSockets/SocketsBSD.cpp#20


--------------------------------------
Copying //UE4/Dev-Enterprise[at]4705006 to Dev-Main (//UE4/Dev-Main)

#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: francis.hurteau
#ROBOMERGE-SOURCE: CL 4705151 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4712032 by ryan gerleve in Dev-Networking branch]
2019-01-11 14:26:15 -05:00
James Hopkin
235137b0cc Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)
Copying to Dev-Main @ CL# 4688301

#rb none

[CL 4707991 by James Hopkin in Dev-Networking branch]
2019-01-11 02:57:03 -05:00
chris gagnon
aad5335ff6 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 4676940 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4676943 by chris gagnon in Dev-Networking branch]
2019-01-02 15:37:07 -05:00