Commit Graph

7315 Commits

Author SHA1 Message Date
jamie dale
bbffdb8e81 Moved CollectionAssetManagement to AssetTools so it can be shared
#jira
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 13006995 via CL 13007016 via CL 13007026 via CL 13007030
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 13007036 by jamie dale in Main branch]
2020-04-23 10:44:49 -04:00
josh adams
31d7a43cc3 - Fix CIS error
#jira UE-92369
#rb none

#ROBOMERGE-SOURCE: CL 13005944 in //UE4/Release-4.25/... via CL 13005949 via CL 13005973
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 13005992 by josh adams in Main branch]
2020-04-23 09:33:39 -04:00
mihnea balta
85cc0348a1 Fixed bug introduced in CL 12982657 which caused compile failures for some geometry shaders on Vulkan.
Arrays don't have matrix_columns set to 1.

#jira none
#rb none
#rnx
#lockdown Christina.Riveron

#ROBOMERGE-SOURCE: CL 12997560 in //UE4/Release-4.25/... via CL 12997564 via CL 12997575
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12997577 by mihnea balta in Main branch]
2020-04-23 02:40:10 -04:00
josh adams
7f5b8df769 - Fixed ProjectLauncher/UnrealFrontend/LaunchOn to respect the Target32Bit windows project setting
#jira UE-92363
#rb none

#ROBOMERGE-SOURCE: CL 12986697 in //UE4/Release-4.25/... via CL 12986699 via CL 12986703
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12986835 by josh adams in Main branch]
2020-04-22 22:46:38 -04:00
florin pascu
9110a0dc5f - Revert ssbo back to texturebuffer in hlslcc. We now also support vec4 & vec1 of type float & unsigned & signed
- Filtered out a Niagara Ray tracing compute(was causing cooking problems cause of float3x4)
- Fixed GPU Scene
#jira UE-92314
#rb Jack.Porter, Dmitriy.Dyomin, Rolando.Caloca, Mihnea.Balta

#ROBOMERGE-OWNER: florin.pascu
#ROBOMERGE-AUTHOR: florin.pascu
#ROBOMERGE-SOURCE: CL 12984452 in //UE4/Release-4.25/... via CL 12984457 via CL 12984596
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12984603 by florin pascu in Main branch]
2020-04-22 17:24:48 -04:00
mihnea balta
6b154fd015 Fixed overlapping shader attributes in Vulkan when using matrix types.
The code was assuming that each attribute occupies a single vector, so we got compiler errors if a shader used a matrix attribute.

#jira UE-91836
#rnx
#lockdown Christina.Riveron
#rb Rolando.Caloca

#ROBOMERGE-SOURCE: CL 12982657 in //UE4/Release-4.25/... via CL 12982668 via CL 12982691
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12982704 by mihnea balta in Main branch]
2020-04-22 15:30:48 -04:00
rex hill
f6ece06d33 Disabled menu customization via config file as long as it conflicts with runtime menu customization
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 12975262 via CL 12975393 via CL 12975411 via CL 12975426
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12975458 by rex hill in Main branch]
2020-04-22 11:42:56 -04:00
alexis matte
54144a8ab9 Fix alternate skinning
#rb jurre.debaare

#ROBOMERGE-OWNER: alexis.matte
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 12974497 via CL 12974666 via CL 12974667
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12974686 by alexis matte in Main branch]
2020-04-22 10:41:35 -04:00
patrick laflamme
0364d01a96 #jira UE-92319 - Normal Editor shutdown can be reported as abnormal shutdown because of lock contention
- In case of contention on the system session lock, fallback on the lockless mechanism (the one use for crash/terminate) to report the shutdown (we may not save everything, but we will save the most important information)

#rb none
#lockdown cristina.riverun

#ROBOMERGE-SOURCE: CL 12974643 in //UE4/Release-4.25/... via CL 12974652 via CL 12974654
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12974660 by patrick laflamme in Main branch]
2020-04-22 10:39:52 -04:00
jamie dale
978b9023e3 Fixed LatAm Spanish using Castilian Spanish translations for things that had been deliberately left untranslated
LatAm Spanish (es-419) often leaves words in English rather than translate them, however we were finding that they would take the Castilian Spanish (es) translation instead, which often lead to confusion for players as those terms weren't understood within the LatAm community.

This was caused by the fact that any untranslated text (text matching the source) was considered redundant and was skipped when generating the LocRes file, which failed to take into account potentially needing to override a base translation when dealing with language hierarchies.

This change now tests otherwise untranslated text against the translations of any parent languages, and will consider the entry translated if it is different from one that would be inherited at runtime.

[FYI] Carlos.Almeida, David.Emmanuelli
#rb Lauren.Barnes

#ROBOMERGE-SOURCE: CL 12973946 via CL 12973947 via CL 12973948 via CL 12973950
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12973951 by jamie dale in Main branch]
2020-04-22 08:14:03 -04:00
carlmagnus nordin
373fd671f7 Copying //UE4/Release-4.25Plus-Dev to Release-4.25Plus (//UE4/Release-4.25Plus)
#rnx
#jira none
#rb none

#ROBOMERGE-OWNER: carlmagnus.nordin
#ROBOMERGE-AUTHOR: carlmagnus.nordin
#ROBOMERGE-SOURCE: CL 12973630 in //UE4/Release-4.25Plus/... via CL 12973644
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12973696 by carlmagnus nordin in Main branch]
2020-04-22 06:25:12 -04:00
Arne Schober
ee6d0ecb20 M - More renameing the Octree to Octree2 in preparation to add a deprecation for the original class
#RB

[CL 12972489 by Arne Schober in Main branch]
2020-04-21 23:23:12 -04:00
Arne Schober
61bf307e6e M - Rename the Octree to Octree2 in preparation to add a deprecation for the original class
#RB

[CL 12965782 by Arne Schober in Main branch]
2020-04-21 20:01:52 -04:00
andrew grant
387622c149 Removed some debugging code that was accidentally submitted.
Droped some debug logging to VeryVerbose
Set EngineTest back to regular DDC logging

#jira UE-92249 UE-92221
#rb swarm
[FYI] devin.doucette

#ROBOMERGE-SOURCE: CL 12954517 in //UE4/Release-4.25/... via CL 12954529 via CL 12958534
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12958578 by andrew grant in Main branch]
2020-04-21 14:45:10 -04:00
zabir hoque
8c89dae9ea Enable RenderDoc Captures for failing automation tests.
[FYI] Andrew.Grant; Arciel.Rekman;
#rb: none
#jira: UE-91964

#ROBOMERGE-SOURCE: CL 12941114 in //UE4/Release-4.25/... via CL 12941117 via CL 12941124
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12941128 by zabir hoque in Main branch]
2020-04-20 19:57:16 -04:00
patrick laflamme
30017ee6f0 #jira UE-92231 - Editor session summary event doesn't have any link to CrashGUID
- Implemented a special logger inside CrashReportClientEditor to capture and save important events such as crash reporting (along with the CrashGUID)
  - When CrashReportClientEditor sends all the Editor summary events, if an error was detected in the session being sent, the mini-log for that session is attached to the analytic event.

#rb Chris.Gagnon, Jamie.Dale
#lockdown cristina.riverun

#ROBOMERGE-SOURCE: CL 12935952 in //UE4/Release-4.25/... via CL 12935970 via CL 12935996
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12936020 by patrick laflamme in Main branch]
2020-04-20 15:38:55 -04:00
rob krajcarski
af02155770 Tweak D3d shader compiler to cleanly report error with too many UAV's rather than issuing a fatal error
#jira none
#rb stu.mckenna
#lockdown Marcus.Wassmer

#ROBOMERGE-SOURCE: CL 12928868 in //UE4/Release-4.25/... via CL 12928880 via CL 12928942
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12928955 by rob krajcarski in Main branch]
2020-04-20 14:24:11 -04:00
helge mathee
86d659f978 Control Rig: Ensure to clean up injected nodes during undo / redo
The injected node action was just calling RemoveNode, which outside of undo / redo does not clean up links. We had some stale / transient nodes due to this in the repro case. By adding an additional argument to force recursion into BreakAllLinks etc this is fixed.

#rb lina.halper
#lockdown laurent.delayen
#jira UE-92035

#ROBOMERGE-SOURCE: CL 12923962 in //UE4/Release-4.25/... via CL 12923974 via CL 12923998
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12924002 by helge mathee in Main branch]
2020-04-20 11:20:47 -04:00
andrew grant
835b997f53 Edit-grated improved DDC behavior logging from Main to get better info around failing cooked tests
Temporarily turning on verbose DDC logging for EngineTest project

[FYI] zabir.hoque ben.ingram
#jira #rb na
#lockdown cristina.riveron

#ROBOMERGE-OWNER: andrew.grant
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 12911373 in //UE4/Release-4.25/... via CL 12911375 via CL 12911433
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12911435 by andrew grant in Main branch]
2020-04-19 14:32:34 -04:00
ben ingram
8b1cd24d0b #jira none
Add some more verbose DDC logging
#rb none

#ROBOMERGE-OWNER: ben.ingram
#ROBOMERGE-AUTHOR: ben.ingram
#ROBOMERGE-SOURCE: CL 12905133 in //UE4/Release-4.25/... via CL 12905135 via CL 12905175
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12907642 by ben ingram in Main branch]
2020-04-18 16:05:20 -04:00
brooke hubert
d3c732505a Feature and content Paks can be imported again in the editor.
# This was a side effect of removal of hash storage in index entries from CL 11442058

#rnx
#rb matt.peters

#ROBOMERGE-SOURCE: CL 12900833 via CL 12900834 via CL 12900835
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12907408 by brooke hubert in Main branch]
2020-04-18 16:00:56 -04:00
rolando caloca
0325fe0ba6 UE4.25 - Fix bad module dependencies
#rb none
#rnx
#jira
#lockdown Marcus.Wassmer

#ROBOMERGE-SOURCE: CL 12874924 in //UE4/Release-4.25/... via CL 12874991 via CL 12875005
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12875015 by rolando caloca in Main branch]
2020-04-16 18:37:33 -04:00
rolando caloca
369d6d8b29 UE4.25 - Compile fix
#rb none
#rnx
#jira
#lockdown Marcus.Wassmer

#ROBOMERGE-SOURCE: CL 12874478 in //UE4/Release-4.25/... via CL 12874480 via CL 12874484
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12874493 by rolando caloca in Main branch]
2020-04-16 18:06:51 -04:00
josh adams
498f1ad854 - Don't scan for .uplugin files for platformextensions where there is no support for the platform compiled in to the editor. This helps with build machines that don't have NDAd platform support that makes precompiled binaries, but users sync those platforms so have the .uplugin locally
- Optimized GetExtensionDirs()
- Added a FDataDrivenPlatformInfoRegistry::HasCompiledSupportForPlatform() function that can be used in other places to detect if a platform has been compiled or not

[FYI] bob.tellez
#rb ben.marsh

#ROBOMERGE-SOURCE: CL 12874042 via CL 12874043 via CL 12874048
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12874059 by josh adams in Main branch]
2020-04-16 17:40:14 -04:00
josh adams
6142689460 - Added compression methods to the pak dump outpout
#rb trivial

#ROBOMERGE-SOURCE: CL 12873061 via CL 12873196 via CL 12873273
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12873301 by josh adams in Main branch]
2020-04-16 17:12:56 -04:00