Commit Graph

804 Commits

Author SHA1 Message Date
ben marsh
e357715701 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-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 6455253 in //UE4/Release-4.22/... via CL 6455273
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6512984 by ben marsh in Dev-VR branch]
2019-05-15 16:17:53 -04:00
Ryan Vance
e5dcb18281 Copying //UE4/Partner-Oculus-Staging to Dev-VR (//UE4/Dev-VR)
#rb integrate

[CL 6430558 by Ryan Vance in Dev-VR branch]
2019-05-13 16:02:14 -04:00
ben marsh
020ebbdc2a UBT: Fix incorrect output directory being used for target version files.
#jira UE-74173
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 6316064 in //UE4/Release-4.22/... via CL 6317358
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6350222 by ben marsh in Dev-VR branch]
2019-05-07 18:00:19 -04:00
ben marsh
b257762788 UBT: Fix UnrealHeaderTool always needing to run whenever the makefile was invalidated. Order of files in the timestamp file is not guaranteed, so we can't do an element-wise comparison against current list of files.
#rb none
[CODEREVIEW] Steve.Robb
#jira UE-71031

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 6037107 in //UE4/Release-4.22/... via CL 6037108
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6039625 by ben marsh in Dev-VR branch]
2019-04-22 17:04:20 -04:00
ben marsh
a04439a9b1 UAT: Fix incorrect logic causing plugin references to override whether a plugin supports a target platform or not.
#rb none
#jira UE-71909

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 6011749 in //UE4/Release-4.22/... via CL 6011750
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6014724 by ben marsh in Dev-VR branch]
2019-04-19 13:02:12 -04:00
ben marsh
b78d96355f LiveCoding: Merging fixes to resolve issues with global symbols being reconstructed when loading patch DLLs. Was causing asserts when log channels were re-registered etc...
#jira
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5993252 via CL 5993257 via CL 5995286 via CL 5995562
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6004844 by ben marsh in Dev-VR branch]
2019-04-18 21:57:56 -04:00
ben marsh
e3e157d850 Live Coding: Fixes issue linking patch DLLs with Visual Studio Express, due to PATH environment variable not including path to mspdb140.dll.
Now stores the linker environment block in the live coding manifest, and adds it to the cache before executing the linker.

#rb none
#jira UE-72324

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5740602 in //UE4/Release-4.22/... via CL 5740765
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5744051 by ben marsh in Dev-VR branch]
2019-04-04 13:08:37 -04:00
peter engstrom
3596561072 Use forward slashes in include paths.
#rb ben.marsh
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: peter.engstrom
#ROBOMERGE-SOURCE: CL 5667718 via CL 5667743 via CL 5667748 via CL 5667751 via CL 5668993 via CL 5668997
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5670239 by peter engstrom in Dev-VR branch]
2019-04-01 13:02:06 -04:00
graeme thornton
b49cc79512 Reinstate the warning about short keys but wrap it in the condition that was lost in the merge from Release-4.22
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: graeme.thornton
#ROBOMERGE-SOURCE: CL 5629597 via CL 5629603 via CL 5629607 via CL 5629609 via CL 5631976 via CL 5632515
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5635890 by graeme thornton in Dev-VR branch]
2019-03-28 17:02:15 -04:00
ben marsh
0f5aa45c32 Fix problems with HotReload on Mac.
* Linker arguments for each hot-reloaded module where only being patched with that module's new name (and not *all* the new module names). Windows was unaffected by this, since it uses response files (which were being handled correctly).
* Loop to rename modules in the manifest was terminating after the first modified module was found. This prevented other modules from being renamed.

#rb none
[FYI] Steve.Robb, Michael.Trepka
#jira UE-62612

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5503573 in //UE4/Release-4.22/... via CL 5503574
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5518591 by ben marsh in Dev-VR branch]
2019-03-22 18:55:51 -04:00
bob tellez
d84630af91 #UE4 Disable warning while we wait for a key cycle
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: bob.tellez
#ROBOMERGE-SOURCE: CL 5493785 via CL 5495889 via CL 5496062
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5515897 by bob tellez in Dev-VR branch]
2019-03-22 18:08:05 -04:00
graeme thornton
ab42f2f4ec Add new config values to go alongside "PlatformRequiresDataCrypto" which can specifically disable signing or encryption. Allows selective disabling of signing OR encryption on some platforms, rather than the old config value which would disable both.
Disable signing on platforms that we wanted encryption enabled for by default (mobile mainly)
Add a warning if pak signing or encryption is enabled but there is no key, then disable the offending functionality for that build

#rb none
#jira UE-71811, UE-71806
#lockdown cristina.riveron

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: graeme.thornton
#ROBOMERGE-SOURCE: CL 5487098 in //UE4/Release-4.22/... via CL 5487102
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5509409 by graeme thornton in Dev-VR branch]
2019-03-22 17:21:46 -04:00
graeme thornton
a56af60239 Edigrated rollup of all engine RSA changes that were done for 4.22. Pak signature checking is now much more competent.
#rb none
[FYI] joe.barrett
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: graeme.thornton
#ROBOMERGE-SOURCE: CL 5469067 via CL 5469119 via CL 5470585 via CL 5470597
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5505344 by graeme thornton in Dev-VR branch]
2019-03-22 16:59:55 -04:00
ben marsh
653885df44 Fix issues related to hot-reload and LiveCoding co-existing.
* Removed code to invalidate makefiles when adding new source files. UBT should be reliable enough to make this determination itself nowadays, and ignored -invalidatemakefilesonly argument was causing modules to be recompiled.
* Fixed incorrect config section name when determining whether to allow hot reload from IDE. Now prevents hot reload from IDE when live coding is enabled.
* Added error message when trying to add a new class with Live Coding enabled.
* Added error messages when trying to start Live Coding after a hot reload has taken place.
* Added error messages when trying to hot reload with Live Coding enabled.

#jira UE-71253
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5403464 in //UE4/Release-4.22/... via CL 5403485
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5412284 by ben marsh in Dev-VR branch]
2019-03-15 06:22:38 -04:00
ben marsh
5a29ddd251 UBT: Fix generated config files not being read by UBT, or being considered when determining if makefiles are out of date.
#rb none
#jira UE-71501

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5392870 in //UE4/Release-4.22/... via CL 5392891
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5394497 by ben marsh in Dev-VR branch]
2019-03-13 21:04:41 -04:00
Ryan Vance
35eb0041ab Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
#rb integration

[CL 5387703 by Ryan Vance in Dev-VR branch]
2019-03-13 15:19:08 -04:00
ben marsh
2d222bf661 Improve accuracy of timer for running UBT. Now includes startup time as well as time spent in the build mode.
#rb none
#jira UE-71116

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5319676 in //UE4/Release-4.22/... via CL 5337053
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5387461 by ben marsh in Dev-VR branch]
2019-03-13 14:51:42 -04:00
ben marsh
7a8ebb0c18 UBT: Use the cached filesystem attributes to figure out which files are part of the adaptive non-unity working set. Much faster than querying directly because (a) they're cached, and (b) they're enumerated via a directory scan, which fetches the metadata up front.
#rb none
#jira UE-71116
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5318685 in //UE4/Release-4.22/... via CL 5336842
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5387297 by ben marsh in Dev-VR branch]
2019-03-13 14:47:24 -04:00
ben marsh
ca542b6b25 UBT: Figure out outdated actions in parallel. Saves 0.5s on iterative compile.
#rb none
#jira
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5315074 in //UE4/Release-4.22/... via CL 5317566
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5333778 by ben marsh in Dev-VR branch]
2019-03-06 19:23:43 -05:00
ben marsh
e8e9181dfa UBT: Add additional timing info into logs.
#rb none
#rnx
#jira

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5312405 in //UE4/Release-4.22/... via CL 5316167
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5333415 by ben marsh in Dev-VR branch]
2019-03-06 19:15:59 -05:00
ben marsh
e40dec9ee0 Integrating live coding feature (aka Live++) into UE4.
Allows fast iteration of C++ changes without restarting the application. To use, select the "Live Coding (Experimental)" mode from the drop down menu next to the editor's compile button, or type "LiveCoding" into the console for a monolithic build. Press Ctrl+Alt+F11 to find changes and compile.

Changes vs standalone Live++ version:

* UBT is used to execute builds. This allows standard UE4 adaptive unity mode, allows us to reuse object files when we do regular builds, supports using any build executor allowed by UBT (XGE, SNDBS, etc..).
* Adding new source files is supported.
* Custom visualizer for FNames is supported via a weakly linked symbol in a static library (Engine/Extras/NatvisHelpers).
* Settings are exposed in the editor's project settings dialog.
* Standalone application has been rewritten as a Slate app ("LiveCodingConsole"). There is an additional option to start the program as hidden, where it will not be visible until Ctrl+Alt+F11 is hit. Similarly, closing the window will hide it instead of closing the application.
* Does not require a standalone licensed version of Live++.

Known issues:

* Does not currently support class layout changes / object reinstancing

#rb none
[FYI] Marc.Audy, Stefan.Boberg, Nick.Penwarden
#jira

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5304722 in //UE4/Release-4.22/... via CL 5309051
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5329502 by ben marsh in Dev-VR branch]
2019-03-06 18:34:25 -05:00
ben marsh
8ab4063a30 Fix settings for enabling shadow variable and undefined identifier warnings not being treated as requiring a unique PCH. Also fix shared PCHs not enabling each by default. The compiler (at least on Windows) does not produce a warning/error on this mismatch, but does not respect the different settings passed via the command line.
#rb none
#jira

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5295902 in //UE4/Release-4.22/... via CL 5308945
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5329285 by ben marsh in Dev-VR branch]
2019-03-06 18:33:28 -05:00
ben marsh
9a06386475 Fix exception when trying to get path for main module for hot reload.
#rb none
#rnx
#jira

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5290983 in //UE4/Release-4.22/... via CL 5308917
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5328726 by ben marsh in Dev-VR branch]
2019-03-06 18:29:48 -05:00
graeme thornton
1a551d6144 Minor unrealpak refactor
- Added a "-sign" parameter to enable signing for the given pak. The cached settings in the crypto.json file aren't used to enable signing any more.
 - Encapsulated all signing and encryption keys in a single keychain object which is passed around, rather than individual keys
 - Added some validation to UBT/UAT encryption config parsing so that if you enable any signing or encryption stuff but haven't generated a key, it'll warn and disable everything.

#jira

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: graeme.thornton
#ROBOMERGE-SOURCE: CL 5237725 via CL 5237726 via CL 5240337 via CL 5240343
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5257171 by graeme thornton in Dev-VR branch]
2019-02-28 18:38:20 -05:00
josh adams
019c12863e - Merging Dev-Kairos/Engine/... to Main/Engine/...
- Brings over the necessary engine changes for embedding UE4 mobile as a dylib/so in native mobile app
- Various changes for facial animation, screen recording, others
- ARKit and ARCore plugins were removed, as deemed "not ready"
#rb many people

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 5201138 via CL 5203024 via CL 5226277
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5244512 by josh adams in Dev-VR branch]
2019-02-28 17:06:02 -05:00