Commit Graph

52 Commits

Author SHA1 Message Date
marco anastasi
0f5a4e5481 Add support for cherry picking an asset from the asset history dialog, using Tool Menus
#rb wouter.burgers, brooke.hubert
#preflight 640795242559570cc7f6705b

[CL 24557170 by marco anastasi in ue5-main branch]
2023-03-08 05:40:18 -05:00
jordan hoffmann
f46746f35f [CrashFix] Fix Dereference Null
#rb trivial
#pf none

[CL 24456485 by jordan hoffmann in ue5-main branch]
2023-02-28 20:40:09 -05:00
jordan hoffmann
5abf21121d [BugFix] Modified actors are not diff'ing correctly with one file per actor
#rb dan.oconnor
#rb francis.hurteau

[CL 24451087 by jordan hoffmann in ue5-main branch]
2023-02-28 16:07:32 -05:00
lauren barnes
d36592a0cc Create revision control context object for menu creation
[REVIEW] [at]wouter.burgers, [at]zach.rammell
#preflight 63f56e1791018822cc2f9055
#jira UE-178131
#rb Wouter.Bougers, Marco.Anastasi, Zach.Rammell

[CL 24371853 by lauren barnes in ue5-main branch]
2023-02-22 17:56:16 -05:00
lauren barnes
b254a402bd Change to capture weak pointer to the revision control UI in the dynamic menu entry.
#rb JeanMichel.Dignard
#preflight 63e426dbea7ad686983b4f6f

[CL 24092965 by lauren barnes in ue5-main branch]
2023-02-09 00:36:32 -05:00
lauren barnes
ad3e6dd345 Converting Revision Control History window to use UToolMenu for its context menu
#rb Aditya.RaviChandran, Zach.Rammell
#preflight 63e13111b923ed4bddf04af6

[CL 24035663 by lauren barnes in ue5-main branch]
2023-02-06 14:21:35 -05:00
wouter burgers
25ed23158a SourceControl: Changelist #22880108 added support to the Submit window with support for exposing the diff functionality yes/no, depending on the SourceControl provider used. This changelist does the same for the History window.
#preflight none

[CL 23674935 by wouter burgers in ue5-main branch]
2023-01-13 02:29:22 -05:00
patrick boutot
2fc7dab67f Add the ellipsis at the end of the description when the changelist description is too long to be displayed correctly.
[FYI] chris.morrison

[CL 23662529 by patrick boutot in ue5-main branch]
2023-01-12 09:46:14 -05:00
jordan hoffmann
52755b77d7 [BugFix] Diffing Assets against depot can cause them to get saved with the PKG_ForDiffing flag
- non-temp assets shouldn't be loaded with the LOAD_ForDiff flag.
#jira UE-160889
#rb dan.oconnor
#rb phillip.kavan
[FYI] julien.lheureux
#preflight 63911c8e255f07df8e817474

[CL 23439362 by jordan hoffmann in ue5-main branch]
2022-12-07 20:12:12 -05:00
SRombauts
69941d023e PR #9868: Revision Control History display file size with best unit (Contributed by SRombauts)
#Jira UE-171295
#rb brooke.hubert
#preflight 638e59c7bb6fefa4726bc89b

[CL 23399428 by SRombauts in ue5-main branch]
2022-12-05 16:28:05 -05:00
brooke hubert
2900a9310e Fixed an issue in the history window where strings that began with whitespace could show as empty in the description column
Standardized changelist description single line to a helper function to ensure the changelist window and history window have consistency

#rb wouter.burgers
#preflight 638e09551776b8c21c18e716

[CL 23394656 by brooke hubert in ue5-main branch]
2022-12-05 13:19:35 -05:00
patrick laflamme
1de07a9081 Fixed the source control history window not properly displaying multilines submit descriptions.
#jira UE-141274 - Text overflow in CL description panel of file history
#rb Lauren.Barnes
#preflight 63037f9ec744dac9679ed021

[CL 21500398 by patrick laflamme in ue5-main branch]
2022-08-22 21:39:19 -04:00
Lauren Barnes
6248f8d412 Replacing legacy EditorStyle calls with AppStyle
#preflight 6272a74d2f6d177be3c6fdda
#rb Matt.Kuhlenschmidt

#ROBOMERGE-OWNER: Lauren.Barnes
#ROBOMERGE-AUTHOR: lauren.barnes
#ROBOMERGE-SOURCE: CL 20057269 via CL 20070159 via CL 20072035 via CL 20072203
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)
#ROBOMERGE-CONFLICT from-shelf

[CL 20105363 by Lauren Barnes in ue5-main branch]
2022-05-09 13:12:28 -04:00
julien lheureux
a460459eed Added possibility to get asset data from history, with a max fetch size (until we have a better solution)
Changed the way we associate shelved files with their local filename to facilitate mapping (perforce operations)
Implemented what was needed on the SCC side to support diff against shelve
Improved way we display object names for deleted & shelved files

#rb sebastien.lussier

[CL 15356101 by julien lheureux in ue5-main branch]
2021-02-08 09:36:20 -04:00
Marc Audy
cac1fe0019 Merge UE5/Release-Engine-Staging @ CL# 15299266 to UE5/Main
This represents UE4/Main @ CL# 15277572

[CL 15299962 by Marc Audy in ue5-main branch]
2021-02-03 14:57:28 -04:00
julien lheureux
7660280730 Added ActorLabel tag for actors using WP
Used the ActorLabel tag to obtain a better name in changelists dialog

#rb sebastien.lussier, jeanfrancois.dube

[CL 15166658 by julien lheureux in ue5-main branch]
2021-01-22 16:21:29 -04:00
julien lheureux
8d3734f953 Added contextual menu options for file actions (diff agains depot, show history, locate file)
Better cleanup in perforce revert operation
Made revert work on changelists
Fixed issue where no changelists would be displayed if the default changelist was empty.

#rb sebastien.lussier

[CL 15138037 by julien lheureux in ue5-main branch]
2021-01-19 14:50:23 -04:00
marc audy
60903075ff Create a Diff against Workspace option in the source control history right click context menu
Disable Diff against Previous revision if right clicking the oldest revision
Fix file items not doing anything when diffing against previous or diffing via drag/drop by making them behave as if they are the most recent revision at that location.
#rb Chris.Gagnon
#jira UE-86293


#ROBOMERGE-SOURCE: CL 10883994 via CL 10884811 via CL 10884851
#ROBOMERGE-BOT: (v626-10872990)

[CL 10884888 by marc audy in Main branch]
2020-01-06 18:53:52 -05:00
ryan durand
627baf970a Updating copyright for Engine Editor.
#rnx
#rb none


#ROBOMERGE-SOURCE: CL 10869241 via CL 10869527 via CL 10869904
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870586 by ryan durand in Main branch]
2019-12-26 15:33:43 -05:00
marc audy
dbcf07a558 Use new inline versions of substring functions
Fix up nearby cases where ESearchCase::CaseSensitive should have been used
#jira
#rnx
#rb

#ROBOMERGE-OWNER: marc.audy
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 10309793 via CL 10309818
#ROBOMERGE-BOT: (v593-10286020)

[CL 10309932 by marc audy in Main branch]
2019-11-19 13:27:07 -05:00
Chris Gagnon
930e33cb48 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.23 From CL 6837861
#rb none

[CL 6838042 by Chris Gagnon in Main branch]
2019-06-04 15:42:48 -04:00
Ben Zeigler
fcb7011543 #jira UE-23260 Fix it so all methods of loading a package for diffing pass the correct load flag
#rb none

[CL 6142571 by Ben Zeigler in Dev-Framework branch]
2019-04-29 15:32:15 -04:00
Marc Audy
82e0666ce7 Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 5450266
#rb
#rnx

[CL 5459329 by Marc Audy in Dev-Framework branch]
2019-03-19 16:16:11 -04:00
Chris Gagnon
8fc25ea18e Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4676797 by Chris Gagnon in Dev-Editor branch]
2019-01-02 14:54:39 -05:00
SRombauts
cd7b43e04b PR #5268: Source Control History Window do not display Changelist title if not available (Contributed by SRombauts)
Switched the visibility to SelfHitTestInvisible


#rb Chris.Gagnon

[CL 4559278 by Chris Gagnon in Dev-Editor branch]
2018-11-12 11:52:31 -05:00