Commit Graph

217 Commits

Author SHA1 Message Date
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
ethan geller
13d186f8b3 [FYI] hongyi.yu, aaron.mcleran
#ROBOMERGE-SOURCE: CL 7674538 via CL 7680304
#ROBOMERGE-BOT: (v382-7680231)

[CL 7680413 by ethan geller in Main branch]
2019-08-01 06:46:29 -04:00
brandon schaefer
85d93a94b9 Remove OpenGL4 from the DefaultRHI list
#jira UE-78158
#rb none

#ROBOMERGE-SOURCE: CL 7671960 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v376-7668820)

[CL 7671961 by brandon schaefer in Main branch]
2019-07-31 11:59:28 -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
ethan geller
de4be8b155 Force inline CachePlatformAudioCookOverrides to avoid symbol duplication in monolithic builds.
#jira UE-77446
[FYI] aaron.mcleran
#rb none


#ROBOMERGE-OWNER: ethan.geller
#ROBOMERGE-AUTHOR: ethan.geller
#ROBOMERGE-SOURCE: CL 7422161 via CL 7430943
#ROBOMERGE-BOT: (v371-7306989)

[CL 7431574 by ethan geller in Main branch]
2019-07-17 16:15:27 -04:00
ben marsh
ef3c866b47 LiveCoding: Prevent object files being overwritten during a live coding compile. Object files are now built with a .lc suffix, leaving the original files intact. This ensures it can gather COFF data from the correct executables on relaunch, and means that any existing changes will be patched in as soon as the first Live Coding compile is initiated. Should fix several issues.
#rb none
#jira UE-76940, UE-76993, UE-76943

#ROBOMERGE-SOURCE: CL 7321451 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v371-7306989)

[CL 7321452 by ben marsh in Main branch]
2019-07-16 08:51:35 -04:00
ben marsh
3cc5d9c8a2 Few CIS fixes.
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 7321421 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v371-7306989)

[CL 7321423 by ben marsh in Main branch]
2019-07-16 08:47:25 -04:00
ben marsh
741185a47b LiveCoding: Add support for the new restart functionality in Live++ 1.5.0. The Live Coding console window now includes a "Quick Restart" button, which restarts the process and adds the existing patches back in.
#rb none
#jira

#ROBOMERGE-SOURCE: CL 7321413 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v371-7306989)

[CL 7321415 by ben marsh in Main branch]
2019-07-16 08:46:52 -04:00
ben marsh
940f5a5f73 LiveCoding: Create a new external module that includes the appropriate headers for Visual Studio automation support (VisualStudioDTE), allowing the UE-friendly version to be used by the VS source code accessor as well as Live Coding.
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 7321384 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v371-7306989)

[CL 7321387 by ben marsh in Main branch]
2019-07-16 08:45:13 -04:00
ben marsh
45e9324ffc LiveCoding: Allow building without Visual Studio DTE being present. We don't support the restart feature yet.
#rb none
#jira

#ROBOMERGE-SOURCE: CL 7321373 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v371-7306989)

[CL 7321376 by ben marsh in Main branch]
2019-07-16 08:44:38 -04:00
ben marsh
4596a52f91 Fix unity build error.
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 7321364 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v371-7306989)

[CL 7321365 by ben marsh in Main branch]
2019-07-16 08:44:06 -04:00
ben marsh
e675e5497c Merging Live++ 1.5.0
#rb none
#jira

#ROBOMERGE-SOURCE: CL 7321355 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v371-7306989)

[CL 7321356 by ben marsh in Main branch]
2019-07-16 08:43:32 -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
Andrew Grant
d72cbb0b92 Fixes for tools and Ocean editor
#rb na

[CL 7119039 by Andrew Grant in Main branch]
2019-06-20 21:57:22 -04:00
marc audy
a98d95f9ef #rb aaron.mcleran
[FYI] rob.gay aaron.mcleran maxwell.hayes phil.popp
[FYI] Ethan.Geller


#ROBOMERGE-OWNER: marc.audy
#ROBOMERGE-AUTHOR: ethan.geller
#ROBOMERGE-SOURCE: CL 7095880 via CL 7106842
#ROBOMERGE-BOT: (v367-6836689)

[CL 7106847 by marc audy in Main branch]
2019-06-20 13:28:39 -04:00
ben marsh
814a1088bd Live Coding: Fix support for lazy loading modules. Now passes UBT a list of modules that can be updated, and UBT fails the build and writes out a list of others that would be modified. Live Coding console then loads those modules and retries.
#rb none
#jira UE-74679

#ROBOMERGE-SOURCE: CL 6960867 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v366-6836689)

[CL 6966783 by ben marsh in Main branch]
2019-06-12 23:22:20 -04:00
ben marsh
4e1e602670 Live Coding: Prevent compiling from the IDE while a Live Coding session is active. Engine runtime creates a global mutex with the executable path in the a name and leaks the handle, then UBT checks for it existing before allowing a build to start.
#rb none
#jira UE-74438

#ROBOMERGE-SOURCE: CL 6957113 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v366-6836689)

[CL 6966779 by ben marsh in Main branch]
2019-06-12 23:22:12 -04:00
ben marsh
cbac5f3915 Live Coding: Print a warning if the PDB file for an image cannot be loaded.
#rb none
#jira UE-75970
#rnx

#ROBOMERGE-SOURCE: CL 6956952 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v366-6836689)

[CL 6966774 by ben marsh in Main branch]
2019-06-12 23:22: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
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
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
Chris Gagnon
812b127109 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6525730 by Chris Gagnon in Dev-Editor branch]
2019-05-15 19:27:16 -04:00
ben marsh
c3e532b195 Live Coding: Fix crashes when patching adaptive non-unity files in game modules containing static global variables.
Live++ reads object files at startup for game modules, and assigns unique ids to each compiland (used to disambiguate static variables). When compiling the patch, these compilands are modified to reference a unique id for the unity blob, causing the variables to be reconstructed.

Solution is to generate a JSON file to each output directory containing object files containing the mapping, and to use that to assign compiland ids at startup.

#rb none
#jira UE-74036

#ROBOMERGE-SOURCE: CL 6455253 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 6455273 by ben marsh in Main branch]
2019-05-14 18:12:06 -04:00