5 Commits

Author	SHA1	Message	Date
wouter burgers	5204069750	Skein / ConflictUE: Fixed 'check in changes' no longer redirecting to the 'conflict resolution' window when there are conflicts remaining. This was introduced in #29863963 when SSourceControlControls was created. ... #rb Marco.Anastasi #rnx [CL 30260472 by wouter burgers in ue5-main branch]	2023-12-12 07:03:52 -05:00
wouter burgers	9dce208c39	UEFN / Skein: Fixed 'Sync To Latest' functionality moving the user out of their selected 'EditorMode' and losing a part of their progress, by disabling the SourceControl 'Check In Changes' and 'Sync Latest' buttons while an interactive tool is active. ... #rb Jamie.Dale, Manuel.Lang, Marco.Anastasi #rnx [CL 30010665 by wouter burgers in ue5-main branch]	2023-11-30 03:37:36 -05:00
wouter burgers	b1096cb5d0	Skein / ConflictUE: Enable conflict resolution workflow and remove the obsolete retrieval of asset list pre-pass. ... If a conflict situation ever ends up blocking an internal developer (due to some unforeseen issue), the CLI command 'asset resolve conclude' can always get them out of it. #rb Marco.Anastasi #rnx [CL 29884264 by wouter burgers in ue5-main branch]	2023-11-22 03:36:56 -05:00
marco anastasi	768aebf28f	Added #if SOURCE_CONTROL_WITH_SLATE to SSourceControlControls Slate class in SourceControl module ... #rb paul.chipchase [CL 29864891 by marco anastasi in ue5-main branch]	2023-11-21 10:29:56 -05:00
marco anastasi	0eb858d5d9	* Created Snapshot History Tab structure ... * Created Date Picker Widget * Created Source Control Controls Widget * Refactored Status Bar menu to use Source Control Controls Widget #rb wouter.burgers, stuart.hill [CL 29864023 by marco anastasi in ue5-main branch]	2023-11-21 09:56:04 -05:00