Max Chen
e4d4965491
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 7774443 by Max Chen in Dev-Editor branch]
2019-08-05 15:48:51 -04:00
Chris Gagnon
d7d4ee7b38
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) at CL 7473521
...
#rb none
#fyi Max.Chen, Tim.Gautier
[CL 7614721 by Chris Gagnon in Dev-Editor branch]
2019-07-24 15:05:52 -04:00
brandon schaefer
8788b3b137
Remove conditions on include paths for QtCreator PR #5960 (thanks PhilBax!)
...
#jira UE-76592
#rb none
[FYI] Arciel.Rekman
#ROBOMERGE-SOURCE: CL 7475168 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v372-7473910)
[CL 7475169 by brandon schaefer in Main branch]
2019-07-22 11:14:59 -04:00
ben marsh
1c006fcfd4
Prevent LiveCodingConsole being built twice if bBuildLiveCodingConsole = true in BuildConfiguration.xml, and it's the target being built from Visual Studio.
...
#rb none
#rnx
#jira
#ROBOMERGE-SOURCE: CL 7321488 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v371-7306989)
[CL 7321490 by ben marsh in Main branch]
2019-07-16 09:02:16 -04:00
dyanikoglu
0b22064d23
PR #5971 : Fix Stub Project Configuration Having Null Platform (Contributed by dyanikoglu)
...
#jira UE-76635
#rb none
#rnx
#ROBOMERGE-SOURCE: CL 7229976 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)
[CL 7229994 by ben marsh in Main branch]
2019-07-08 13:55:31 -04:00
Max Chen
4561801a81
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) @7119039
...
#rb none
[CL 7120528 by Max Chen in Dev-Editor branch]
2019-06-21 01:21:43 -04:00
ben marsh
668b27b45d
Fix incorrect filename when launching DebugGame targets from VSCode (or any target that overrides the undecorated configuration)
...
#rb none
#jira
#ROBOMERGE-SOURCE: CL 7107524 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)
[CL 7107528 by ben marsh in Main branch]
2019-06-20 13:44:35 -04:00
ben marsh
882e90f7c9
Fix incorrect executable path in VSCode projects that use unique build environments.
...
#rb none
#jira UE-76277
#ROBOMERGE-SOURCE: CL 6989251 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)
[CL 6989254 by ben marsh in Main branch]
2019-06-14 11:48:44 -04:00
ben marsh
934accd842
Fix for broken IntelliSense data (PR# 5908 Thanks zzz77!)
...
#jira UE-75667
#rb none
#rnx
#ROBOMERGE-SOURCE: CL 6988618 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)
[CL 6988619 by ben marsh in Main branch]
2019-06-14 10:00:13 -04:00
cmp-
4f950a3ad1
PR #5942 : UBT: Fix duplicate platform check (Contributed by cmp-)
...
#rb none
#rnx
#jira UE-76215
#ROBOMERGE-SOURCE: CL 6988229 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)
[CL 6988230 by ben marsh in Main branch]
2019-06-14 08:17:02 -04:00
Rolando Caloca
aa0d2303d6
Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) @ 6944469
...
#rb none
#rnx
[CL 6944849 by Rolando Caloca in Main branch]
2019-06-11 18:27:07 -04:00
Jeff Fisher
bcc5bcf128
Copying //UE4/Dev-VR to Main (//UE4/Main)
...
-Copy up for 4.23
#rb none
[CL 6911980 by Jeff Fisher in Main branch]
2019-06-10 12:22:13 -04:00
Brandon Schaefer
577dfcb3ca
Fix for broken IntelliSense data (PR# 5908 Thanks zzz77!)
...
#jira UE-75667
#rb none
[CL 6882501 by Brandon Schaefer in Dev-Editor branch]
2019-06-07 09:15:49 -04:00
Chris Gagnon
930e33cb48
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.23 From CL 6837861
...
#rb none
[CL 6838042 by Chris Gagnon in Main branch]
2019-06-04 15:42:48 -04:00
Chris Gagnon
0a9f86357f
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 6837840 by Chris Gagnon in Dev-Editor branch]
2019-06-04 15:16:30 -04:00
Stefan Boberg
8607ecb30d
Copying //UE4/Dev-Core to Dev-Main (//UE4/Dev-Main)
...
#rb none
[CL 6815521 by Stefan Boberg in Main branch]
2019-06-03 15:32:00 -04:00
Chris Gagnon
9f1505e469
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 6671275 by Chris Gagnon in Dev-Editor branch]
2019-05-29 20:48:56 -04:00
David Harvey
a6aafea9d7
PlatformExtensions:
...
- extensions are included in the solution
- extension automation projects are included under Automation, and built as part of AutomationTool
#rb josh.adams
[CL 6662967 by David Harvey in Main branch]
2019-05-29 06:35:09 -04:00
Ben Marsh
0cc6e3dca6
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
...
#rb none
#rnx
[CL 6631504 by Ben Marsh in Main branch]
2019-05-24 11:51:54 -04:00
brian zaugg
5790d3ec3f
#ocn - Hotfix from 6258862 to fix iOS link failing with argument list too long.
...
#ROBOMERGE-SOURCE: CL 6265085 via CL 6265224
[CL 6265383 by brian zaugg in Main branch]
2019-05-02 17:58:53 -04:00
Michael Trepka
5e62611f56
Modified Xcode project generator to empty header search paths and preprocessor definitions build settings for the build target to solve the issue in latest Xcode with clang failing with "posix_spawn failed: Argument list too long" error for some files. Apparently Clang in Xcode 10.2 started to append the env variables containing these settings, which are set by Xcode before building, and that was causing extremely long command lines in some cases.
...
#jira UE-74079
#fyi Ben.Marsh
#rb trivial
[CL 6258862 by Michael Trepka in Dev-Editor branch]
2019-05-02 15:24:18 -04:00
Matt Kuhlenschmidt
fddbe0a896
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 6190096 by Matt Kuhlenschmidt in Dev-Editor branch]
2019-05-01 09:59:38 -04:00
jack porter
9df2286d36
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: robert.manuszewski
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 6042758 in //UE4/Release-4.22/... via CL 6042759
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)
[CL 6044651 by jack porter in Dev-Core branch]
2019-04-22 21:10:36 -04:00
jack porter
a847d4ba9f
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-SOURCE: CL 6042758 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)
[CL 6042759 by jack porter in Main branch]
2019-04-22 19:39:57 -04:00
Chris Gagnon
56e73ed431
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 6042607 by Chris Gagnon in Dev-Editor branch]
2019-04-22 18:56:08 -04:00