Commit Graph

154 Commits

Author SHA1 Message Date
ben marsh
83bd3cd7c6 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 6631504 in //UE4/Main/...
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v365-6733468)

[CL 6748759 by ben marsh in Dev-Anim branch]
2019-05-31 18:06:13 -04:00
ben marsh
640069c5a2 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: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 6455253 in //UE4/Release-4.22/... via CL 6455273
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6474667 by ben marsh in Dev-Anim branch]
2019-05-15 08:12:01 -04:00
rob gay
6515852c7d Seekable Streams Using LPCM/ADPCM
#rb aaron.mcleran
https://p4-swarm.epicgames.net/reviews/6345090

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: rob.gay
#ROBOMERGE-SOURCE: CL 6399748 via CL 6400508 via CL 6400529
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6461007 by rob gay in Dev-Anim branch]
2019-05-15 03:53:52 -04:00
ben marsh
3cd65e6ca9 Fix missing include paths in generated project files in binary builds, due to exception while generating project files due to missing module.
#rb none
#jira UE-73075

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 6017285 in //UE4/Release-4.22/... via CL 6017289
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6020386 by ben marsh in Dev-Anim branch]
2019-04-19 17:06:11 -04:00
marc audy
8b92b24160 Fix non-unity
#rb
#rnx
[CODEREVIEW] Ben.Marsh
#jira

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 6007151 via CL 6007296 via CL 6007313
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6010535 by marc audy in Dev-Anim branch]
2019-04-19 06:34:05 -04:00
ben marsh
9f33ddaedf 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: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5993252 via CL 5993257 via CL 5995286 via CL 5995562
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6001808 by ben marsh in Dev-Anim branch]
2019-04-18 21:38:01 -04:00
ben marsh
435510ffd8 LiveCoding: Prevent Live Coding starting automatically when in unattended mode.
#rb none
#jira UE-72524

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5988868 in //UE4/Release-4.22/... via CL 5988908
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5999858 by ben marsh in Dev-Anim branch]
2019-04-18 21:27:17 -04:00
ben marsh
8b3fea50b9 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: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5740602 in //UE4/Release-4.22/... via CL 5740765
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5743767 by ben marsh in Dev-Anim branch]
2019-04-04 13:06:28 -04:00
ben marsh
3abb3afdca LiveCoding: Fix unnecessary newlines on log messages.
#jira

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5492012 via CL 5492936 via CL 5492937
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5510664 by ben marsh in Dev-Anim branch]
2019-03-22 17:30:06 -04:00
hongyi yu
c615c3e3d7 Added support for per-platform mapping from chunkid to pakchunk index. Part 1
- This feature allows different chunk layout on different platforms.
- Most mapping work is done in AssetRegistryGenerator.
- Terminology of ChunkID and Pakchunk Index are now separated and they are no longer the same if chunk id to pakchunk index mapping is defined.  The ChunkIDs in FAssetData is not renamed to keep consistency, but it actually is pakchunk index.  FAssetData.ChunkIDs is used for ChunkInstall.
- Chunks with encryption key guid or unique assetregistry name are not allowed to be mapped.  There are code to filter out those chunks and log errors while initializing mapping
- CheckChunkAssetsAreNotInChild() and ResolveChunkDependencyGraph() is skipped when making build for XboxOne and PS4, since they are not needed.  If for some reason, we need chunk dependency on console builds, we need to implement per-platform dependency graph, since now we support different chunk layout on different platforms.
- Disabled a few pak file overide rules for console builds, since they should only be applied to builds with Kairos chunk layout.

#test A preflight was kicked and tested on PS4 and XboxOne.  No new issue was found.
#rb Daniel.Lamb

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: hongyi.yu
#ROBOMERGE-SOURCE: CL 5470414 via CL 5474050 via CL 5474308
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5505793 by hongyi yu in Dev-Anim branch]
2019-03-22 17:01:47 -04:00
ben marsh
4c5bd2b726 LiveCoding: Add support for lazy loading modules. This lets us enable live coding for the entire engine without a large startup penalty. Project modules are still preloaded by default.
#rb none
#jira

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5437980 in //UE4/Release-4.22/... via CL 5437990
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5440764 by ben marsh in Dev-Anim branch]
2019-03-18 21:03:48 -04:00
ben marsh
20d5d291a6 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: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5403464 in //UE4/Release-4.22/... via CL 5403485
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5411452 by ben marsh in Dev-Anim branch]
2019-03-15 05:56:35 -04:00
ben marsh
31cbd27ac9 LiveCoding: Fix determination of whether a module is part of a project plugin. Such modules report "false" for FModuleStatus.bIsGamePlugin.
#rb none
#jira UE-71399

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5365389 in //UE4/Release-4.22/... via CL 5368509
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5381927 by ben marsh in Dev-Anim branch]
2019-03-13 10:04:06 -04:00
ben marsh
29b83e0018 LiveCoding: Fix the "Show Console" button being disabled until the first compile.
#rb none
#jira UE-71379

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5362145 in //UE4/Release-4.22/... via CL 5368489
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5381907 by ben marsh in Dev-Anim branch]
2019-03-13 10:03:36 -04:00
ben marsh
ff3f76cccb LiveCoding: Allow editor thread to keep running while server is processing modules.
#rb none
#jira UE-71269

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5361379 in //UE4/Release-4.22/... via CL 5368488
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5381906 by ben marsh in Dev-Anim branch]
2019-03-13 10:03:35 -04:00
ben marsh
0f45be443f LiveCoding: Explicitly batch all EnableModules() commands, to prevent user command thread preempting the editor thread before it's finished adding everything. Prevents "Live coding ready" messages being spammed in the console window.
#rb none
#jira UE-71270

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5361279 in //UE4/Release-4.22/... via CL 5368485
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5381900 by ben marsh in Dev-Anim branch]
2019-03-13 10:02:59 -04:00
ben marsh
b5e48810ff Fix "Compile" button in toolbar using legacy hot reload when live coding startup is set to manual.
#rb none
#jira UE-71359

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5361201 in //UE4/Release-4.22/... via CL 5368484
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5381899 by ben marsh in Dev-Anim branch]
2019-03-13 10:02:57 -04:00
ben marsh
9533e4c98c LiveCoding: Fix setting for enabling/disabling live coding not being saved when modified via the toolbar.
#rb none
#jira UE-71362

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5360814 in //UE4/Release-4.22/... via CL 5368482
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5381896 by ben marsh in Dev-Anim branch]
2019-03-13 10:02:54 -04:00
ben marsh
12ee40822a LiveCoding: Make properties for toggling on/off for engine modules hidden in installed builds.
#rb none
#jira UE-71274

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5353250 in //UE4/Release-4.22/... via CL 5364960
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5381718 by ben marsh in Dev-Anim branch]
2019-03-13 09:55:13 -04:00
ben marsh
8ec8577351 LiveCoding: Tweaks to live coding settings.
* Compile dropdown now just contains a checkbox for enabling live coding.
* Compile dropdown has a link to open the editor preferences window.
* Live coding can be enabled from the editor settings window.
* Option to show the console on startup is now folded into the startup mode.
* Options in the editor settings window are greyed out unless live coding is enabled.

#rb none
#jira

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5352692 in //UE4/Release-4.22/... via CL 5364901
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5381684 by ben marsh in Dev-Anim branch]
2019-03-13 09:53:47 -04:00
ben marsh
0a40fa81fa LiveCoding: Tidy up console output.
#rb none
#jira

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5350764 in //UE4/Release-4.22/... via CL 5364832
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5381661 by ben marsh in Dev-Anim branch]
2019-03-13 09:52:54 -04:00
ben marsh
f7705e3530 LiveCoding: Suppress dev channel log messages from console. Add a new server log channel that they are written to instead.
#rb none
#jira UE-71257

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5350628 in //UE4/Release-4.22/... via CL 5364828
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5381660 by ben marsh in Dev-Anim branch]
2019-03-13 09:52:52 -04:00
ben marsh
eef4ce3757 Move live coding settings back under the editor preferences window, since it's a user-specific thing.
#rb none
#jira UE-71126

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5350227 in //UE4/Release-4.22/... via CL 5364819
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5381658 by ben marsh in Dev-Anim branch]
2019-03-13 09:52:49 -04:00
Thomas Sarkanen
bb193db1aa Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 5356908
#rb none

[CL 5360337 by Thomas Sarkanen in Dev-Anim branch]
2019-03-11 12:18:32 -04:00
ben marsh
3ddf76b051 Disable warning when building xxhash.c.
#rb none
#jira
#rnx

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5312346 in //UE4/Release-4.22/... via CL 5316165
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5330358 by ben marsh in Dev-Anim branch]
2019-03-06 18:38:43 -05:00