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
78,161 Commits 23 Branches 254 Tags
2aed687fc8687ea524723aec9c44ba53191f5242
Commit Graph

198 Commits

Author SHA1 Message Date
ben marsh
2aed687fc8 UBT: Fix the path to the solution options file for VS2019, so we can collapse all the projects and select the right configuration by default. 
#rb none
#jira UE-78293

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 7709082 in //UE4/Release-4.23/... via CL 7709084
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v389-7813075)

[CL 7834937 by ben marsh in Dev-Build branch]
 2019-08-06 22:22:18 -04:00
Joakim Lindqvist
9bd3c52a8e Added option to VSCode generator to include all files (disabled by default). 
#rb none

[CL 7785859 by Joakim Lindqvist in Dev-Build branch]
 2019-08-06 07:30:57 -04:00
ben marsh
a4132cf4ff UBT: Fix the path to the solution options file for VS2019, so we can collapse all the projects and select the right configuration by default. 
#rb none
#jira UE-78293

#ROBOMERGE-SOURCE: CL 7709082 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v385-7708028)

[CL 7709084 by ben marsh in Main branch]
 2019-08-02 14:44:48 -04:00
brandon schaefer
c0b6ef0ac8 Remove conditions on include paths for QtCreator PR #5960 (thanks PhilBax!) 
#jira UE-76592
#rb none
[FYI] Arciel.Rekman

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: brandon.schaefer
#ROBOMERGE-SOURCE: CL 7475168 in //UE4/Release-4.23/... via CL 7475169
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v372-7473910)

[CL 7515539 by brandon schaefer in Dev-Build branch]
 2019-07-22 23:09:35 -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
aa4ce98c42 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-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 7321488 in //UE4/Release-4.23/... via CL 7321490
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v371-7306989)

[CL 7370119 by ben marsh in Dev-Build branch]
 2019-07-17 03:40:35 -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
Josh Adams
84150c0c8f - Changed the directory structure from /Platforms/Engine to /Engine/Platforms (and .../Project/Platforms) 
- Some fixes to get project platform files compiling
#rb ben.marsh

[CL 7294119 by Josh Adams in Dev-Build branch]
 2019-07-12 16:09:23 -04:00
Joakim Lindqvist
f54e448503 VsCode - Intellisense complaining about incorrect macro definitions 
Modified OpenColor header to check if GNUC is defined before using it (as it already does a few lines below). And thus removed the global invalid GNUC define which confuses VsCode.

Fixed up spaces in define that also confused VsCode.

#rb simon.therriault
#fyi ben.marsh

[CL 7288701 by Joakim Lindqvist in Dev-Build branch]
 2019-07-12 08:02:11 -04:00
dyanikoglu
5de2cd5522 PR #5971: Fix Stub Project Configuration Having Null Platform (Contributed by dyanikoglu) 
#jira UE-76635
#rb none
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 7229976 in //UE4/Release-4.23/... via CL 7229994
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v367-6836689)

[CL 7237398 by ben marsh in Dev-Build branch]
 2019-07-09 00:20:33 -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
ben marsh
f8903bf9bf Fix incorrect filename when launching DebugGame targets from VSCode (or any target that overrides the undecorated configuration) 
#rb none
#jira

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 7107524 in //UE4/Release-4.23/... via CL 7107528
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v367-6836689)

[CL 7133231 by ben marsh in Dev-Build branch]
 2019-06-21 03:27:19 -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
5e5ea68eb3 Fix incorrect executable path in VSCode projects that use unique build environments. 
#rb none
#jira UE-76277

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 6989251 in //UE4/Release-4.23/... via CL 6989254
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v367-6836689)

[CL 7092889 by ben marsh in Dev-Build branch]
 2019-06-19 10:47:50 -04:00
ben marsh
8d328b1db6 Fix for broken IntelliSense data (PR# 5908 Thanks zzz77!) 
#jira UE-75667
#rb none
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 6988618 in //UE4/Release-4.23/... via CL 6988619
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v367-6836689)

[CL 7092885 by ben marsh in Dev-Build branch]
 2019-06-19 10:47:42 -04:00
cmp-
f0992d9416 PR #5942: UBT: Fix duplicate platform check (Contributed by cmp-) 
#rb none
#rnx
#jira UE-76215

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 6988229 in //UE4/Release-4.23/... via CL 6988230
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v367-6836689)

[CL 7092860 by ben marsh in Dev-Build branch]
 2019-06-19 10:47:00 -04:00
ben marsh
11f022162f Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) [at] 6944469 
#rb none
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: rolando.caloca
#ROBOMERGE-SOURCE: CL 6944849 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v367-6836689)

[CL 7089689 by ben marsh in Dev-Build branch]
 2019-06-19 08:52:32 -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
Ben Marsh
cfe09c649f Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build) 
#rb none
#rnx

[CL 6922670 by Ben Marsh in Dev-Build branch]
 2019-06-10 19:47:29 -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
chris gagnon
72ba51c5bd Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.23 From CL 6837861 
#rb none


#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 6838042 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v366-6836689)

[CL 6874679 by chris gagnon in Dev-Build branch]
 2019-06-07 05:27:42 -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