Commit Graph

890 Commits

Author SHA1 Message Date
TroutZhang
05e98c9a69 PR #11394: Fix Android Studio path detection for installs from JetBrains Toolbox
#jira UE-205398
#android
[REVIEW] [at]Brandon.Schaefer
#rb Brandon.Schaefer

[CL 31057350 by TroutZhang in ue5-main branch]
2024-01-31 14:02:46 -05:00
ben marsh
590bfefb8c P4VUtils: Treat any *.json files as Horde config files. We've added a few more extensions recently, and will probably keep adding more.
[CL 31056874 by ben marsh in ue5-main branch]
2024-01-31 13:51:46 -05:00
josh adams
dd929eecff - Fixed xcodecheckout script to not point to /usr/local/bin/p4, but just run p4 from wherever it is, after sourcing zshrc and zprofile to help look for p4
#rb zack.neyland

#changelist validated
#virtualized

[CL 31051638 by josh adams in ue5-main branch]
2024-01-31 11:53:26 -05:00
buildmachine
f2b89fb9d9 Updating P4VUtils from CL 30975903
[CL 30976975 by buildmachine in ue5-main branch]
2024-01-29 15:55:12 -05:00
marc audy
3effa19c16 Fix crash reconsidering a CL with assets on an edge that blocks asset merges
[CL 30907575 by marc audy in ue5-main branch]
2024-01-25 19:04:40 -05:00
marc audy
7223bfb475 We don't need the ignore
[CL 30907565 by marc audy in ue5-main branch]
2024-01-25 19:04:20 -05:00
buildmachine
c8c858c5fd Updating P4VUtils from CL 30848481
[CL 30848895 by buildmachine in ue5-main branch]
2024-01-24 12:02:38 -05:00
marc audy
572622adce Preflight command will now attempt to support import+ streams and direct the preflight for the stream the files come from
#rb Ryan.Hummer

[CL 30847791 by marc audy in ue5-main branch]
2024-01-24 11:42:34 -05:00
elliot colp
57d6c583e9 [LiveLinkVCAM] Add missing file
#jira UE-202557

[CL 30808094 by elliot colp in ue5-main branch]
2024-01-23 12:05:09 -05:00
Martin Ridgers
a402064e13 Updated ushell [30799199]
[CL 30799947 by Martin Ridgers in ue5-main branch]
2024-01-23 07:51:21 -05:00
marc audy
ecd6c872f3 Fix missing parameters to log
#rb Paul.Chipchase
#rnx

[CL 30796296 by marc audy in ue5-main branch]
2024-01-23 02:02:28 -05:00
marc audy
b5e2b8a5f3 Fix warning CA1822: Member 'FindLastEditInFileHistory' does not access instance data and can be marked as static
#rnx

[CL 30790809 by marc audy in ue5-main branch]
2024-01-22 19:16:51 -05:00
marc audy
cc4c07097d Update documentation for yield
[CL 30740914 by marc audy in ue5-main branch]
2024-01-19 23:08:30 -05:00
marc audy
a4f75d90a4 Remove the debugging
[CL 30740911 by marc audy in ue5-main branch]
2024-01-19 23:08:24 -05:00
marc audy
1714d2bdb1 Additional functional test debugging
[CL 30734250 by marc audy in ue5-main branch]
2024-01-19 19:11:52 -05:00
marc audy
54dc991d5d debugging
[CL 30731744 by marc audy in ue5-main branch]
2024-01-19 18:03:04 -05:00
marc audy
7c5004207f Functional test debugging
[CL 30730796 by marc audy in ue5-main branch]
2024-01-19 17:33:34 -05:00
marc audy
c24e8fad95 Try and add additional diagnosis information for the swarm changelist issues with stomp
[CL 30728423 by marc audy in ue5-main branch]
2024-01-19 16:26:33 -05:00
marc audy
ca9f0bbef9 Fix functional tests failing to wait for stomp operations to complete especially when running only a single test
[CL 30728396 by marc audy in ue5-main branch]
2024-01-19 16:26:09 -05:00
marc audy
6ef34bb4db Log slack errors instead of throwing which is generally uncaught and crashes the application.
Remove unused function

[CL 30728382 by marc audy in ue5-main branch]
2024-01-19 16:25:57 -05:00
marc audy
0ae9f4d8ca Fix use of #robomerge #manual failing crashing when the desired client is on an edgeserver in most cases
Fix #robomerge #manual not sending a notification message that the shelf is ready.

[CL 30728363 by marc audy in ue5-main branch]
2024-01-19 16:25:50 -05:00
marc audy
7d9a86724b Correctly mark functional tests as using slack in dev
[CL 30728341 by marc audy in ue5-main branch]
2024-01-19 16:25:41 -05:00
marc audy
394fc2ffa2 TrackChanges will now link to the related github commit for streams/changes that are mirrored
[CL 30728328 by marc audy in ue5-main branch]
2024-01-19 16:25:04 -05:00
marc audy
d7917607db Don't send slack messages in dev when useSlackInDev is false even if the bot/user tokens are in the vault
[CL 30728313 by marc audy in ue5-main branch]
2024-01-19 16:24:56 -05:00
elliot colp
a1108f57ff [LiveLinkVCAM] Gamepad support
#jira UE-202557
#rb jason.walter

[CL 30725987 by elliot colp in ue5-main branch]
2024-01-19 15:17:21 -05:00