Marc Audy
e47a934672
Merge main stabilization changes back to //depot/UE4
...
#lockdown Ben.Marsh
[CL 2723377 by Marc Audy in Main branch]
2015-10-09 15:13:41 -04:00
Marc Audy
02cba58cb2
Merge build fixes back from //UE4/Main to //depot/UE4
...
#lockdown Ben.Marsh
#platformnotify Josh.Adams
[CL 2720261 by Marc Audy in Main branch]
2015-10-07 17:46:58 -04:00
Marc Audy
6183efcc36
Integrate Engine/Config, Engine/Plugins, Engine/Programs, Engine/Shaders and remaining Engine/Source from UE4-Orion to UE4 at CL# 2716634
...
#lockdown Ben.Marsh
#platformnotify Josh.Adams
[CL 2718314 by Marc Audy in Main branch]
2015-10-06 16:47:09 -04:00
Marc Audy
e5bb9b4d0d
Integrate all non-branch Engine/Source changes from //depot/UE4-Orion to //depot/UE4
...
#lockdown Ben.Marsh
#platformnotify Josh.Adams
[CL 2718236 by Marc Audy in Main branch]
2015-10-06 15:59:09 -04:00
Chris Wood
1b392a2422
UnrealVS 1.41 - added logging to track possible hang when starting up VS or opening a solution.
...
[CL 2715142 by Chris Wood in Main branch]
2015-10-02 16:55:35 -04:00
Chris Babcock
f8eb271dd2
Merging using UE4-To-UE4-Releases-4.10
...
Default launch image theme fallback is black to prevent stretch/squash of the image if started in wrong orientation
#jira UE-21702
#ue4
#android
[CL 2714961 by Chris Babcock in Main branch]
2015-10-02 15:29:14 -04:00
Peter Sauerbrei
8676509cb3
Merging fix for failure to sign on mac from 4.10
...
[CL 2714908 by Peter Sauerbrei in Main branch]
2015-10-02 14:54:05 -04:00
Peter Sauerbrei
af2ffc1126
Merging fix for failure to package when having an & in the bundle display name from 4.10
...
[CL 2714906 by Peter Sauerbrei in Main branch]
2015-10-02 14:53:33 -04:00
Peter Sauerbrei
c94f87e065
Merging fix for mobile provision/certificate detection errors from 4.10
...
[CL 2714905 by Peter Sauerbrei in Main branch]
2015-10-02 14:53:06 -04:00
Peter Sauerbrei
33c786b48a
Merging PR-1578 from 4.10
...
[CL 2714901 by Peter Sauerbrei in Main branch]
2015-10-02 14:52:00 -04:00
Peter Sauerbrei
9bcb17f25f
Merging PR-1568 from 4.10
...
[CL 2714877 by Peter Sauerbrei in Main branch]
2015-10-02 14:45:54 -04:00
Peter Sauerbrei
ea8fbb1b2b
fix for merge error
...
[CL 2714874 by Peter Sauerbrei in Main branch]
2015-10-02 14:45:12 -04:00
Peter Sauerbrei
80b99fb67f
Merging mobile provision selection from 4.10
...
[CL 2714831 by Peter Sauerbrei in Main branch]
2015-10-02 14:24:38 -04:00
Mike Beach
17390cc045
(WIP) Cleaning up UAT so that it will properly utilizes the Blueprint generated plugin, both for UBT and cook.
...
#codereview Ben.Marsh, Peter.Sauerbrei
[CL 2714714 by Mike Beach in Main branch]
2015-10-02 12:55:29 -04:00
Michael Trepka
dd49628ba9
Support for p4 tool installed in /usr/local/bin on Mac
...
[CL 2713170 by Michael Trepka in Main branch]
2015-10-01 13:48:01 -04:00
Mark Satterthwaite
bd57f7fd06
Move .dSYM files out of the application bundle to prevent a crash on launch under 10.10 and earlier. This will cause regeneration of .dSYMs whenever you build, even if nothing changes, because in order for them to be built at all we have to tell UBT that they are alongside their .dylib counterparts. Successfully preflighted and should fix UE-20070.
...
[CL 2713017 by Mark Satterthwaite in Main branch]
2015-10-01 12:10:06 -04:00
Dmitry Rekman
a8a01b962d
UBT: do not try to access registry unnecessarily.
...
- Can error out on Linux.
#codereview Ben.Marsh, Jeff.Campeau
[CL 2712630 by Dmitry Rekman in Main branch]
2015-10-01 08:53:52 -04:00
Chris Babcock
1deb3dca09
Merging using UE4-To-UE4-Releases-4.10
...
Replace escaped characters in Android application display name
#jira UE-21658
#ue4
#android
[CL 2712236 by Chris Babcock in Main branch]
2015-09-30 19:44:29 -04:00
Chris Babcock
3e9f98d61c
Merging using UE4-To-UE4-Releases-4.10
...
Generate proper proguard-project.txt file with optional additions from Build/Android/ProguardAdditions.txt
#jira UE-21653
#ue4
#android
[CL 2712042 by Chris Babcock in Main branch]
2015-09-30 18:10:41 -04:00
Ben Marsh
326101127e
Remove input dependency on WaitToMakeRocketBuild trigger; we only care about the order of that trigger firing, and don't want to build all its dependencies.
...
[CL 2711842 by Ben Marsh in Main branch]
2015-09-30 16:41:24 -04:00
Ben Marsh
1cc0be0a06
Separate all the project specific settings for a platform into a separate class (derived from UEBuildPlatformContext), and remove the last few references to the global .uproject file path. Checks for SupportsWindowsXP() are now done inside the toolchain.
...
#codereview Peter.Sauerbrei
[CL 2711835 by Ben Marsh in Main branch]
2015-09-30 16:40:04 -04:00
Chris Babcock
b305bc1c8b
Merging using UE4-To-UE4-Releases-4.10
...
Strip passwords from DefaultEngine.ini in pak files
#ue4
[CL 2711617 by Chris Babcock in Main branch]
2015-09-30 15:21:45 -04:00
Dmitry Rekman
f2036c9707
TestPAL: add more sysinfo tests.
...
[CL 2711582 by Dmitry Rekman in Main branch]
2015-09-30 15:08:43 -04:00
Jaroslaw Surowiec
8935340860
CrashReporter-Frontend - Fixes for JIRA changes, better support for missing/changed JIRAs
...
[CL 2711549 by Jaroslaw Surowiec in Main branch]
2015-09-30 14:57:20 -04:00
Jaroslaw Palczynski
9703d22f63
Major HotReload fix.
...
[CL 2710850 by Jaroslaw Palczynski in Main branch]
2015-09-30 05:26:51 -04:00
