Commit Graph

9 Commits

Author SHA1 Message Date
Timothy Reynolds
96520a68db Confirmed that source control revert works on unreferenced assets, they get reloaded. Added warning for when the asset is in use and referenced.
UE-16722

#codereview Matt.Kuhlenschmidt

[CL 2600734 by Timothy Reynolds in Main branch]
2015-06-25 12:22:51 -04:00
Jamie Dale
a569f6b356 Fixed code relying on SLATE_TEXT_ATTRIBUTE for STextBlock.
UETOOL-213 - Minimize Slate FString -> FText conversion (remove SLATE_TEXT_ATTRIBUTE)

This fixes any editor/engine specific code that was passing text to Slate as FString rather than FText.

[CL 2399803 by Jamie Dale in Main branch]
2015-01-07 09:52:40 -05:00
Nick Darnell
90e793745c Slate - ESlateCheckBoxState has been renamed to ECheckBoxState.
[CL 2384008 by Nick Darnell in Main branch]
2014-12-10 14:24:09 -05:00
Ben Marsh
149375b14b Update copyright notices to 2015.
[CL 2379638 by Ben Marsh in Main branch]
2014-12-07 19:09:38 -05:00
Mark Satterthwaite
1f0d83fb44 Fix a memory corruption bug in FSourceControlWindows::PromptForRevert - after calling PackageTools::UnloadPackages the UPackage*'s may be invalid if they have been GC'd, so iterate over their names again and only flag those that are still valid.
#codereview michael.trepka, thomas.sarkanen

[CL 2307059 by Mark Satterthwaite in Main branch]
2014-09-23 12:49:41 -04:00
Matt Kuhlenschmidt
74424650c9 Fix crash reverting source control
[CL 2291038 by Matt Kuhlenschmidt in Main branch]
2014-09-09 12:35:19 -04:00
Thomas Sarkanen
e27e005773 Source control copies now integrate/copy instead of Delete + Add
TTP# 334923 - EDITOR: Perforce Integration (Move -> Delete + Add instead of Integrate)

New API: Added ISourceControlRevision::GetBranchSource.
Made sure the P4 and SVN providers perform integrates/copies so that history is maintained across file copies & moves.
Also fixed SCC icons not refreshing sometimes until source control operation has completed.
Added new branch icon.
Fixed date display in history.
This required some fairly nasty fixup to get it all working within the Editor copy code path, but the majority of the changes are in the source control providers.

reviewed by Andrew.Brown

[CL 2095604 by Thomas Sarkanen in Main branch]
2014-06-05 12:10:47 -04:00
Barnabas McManners
5c9c346ce7 Updated the revert window to use Revert Unchanged Only correctly.
#TTP 334818 - Editor: Source Control: Revert files dialog checkboxes not behaving properly
#branch UE4

#proj Editor.SourceControlWindows

#change Changed the behaviour of the revert window as follows:
Previously:
Clicking revert unchanged only attempted to disable the changed files, all disabling did at this point was to make it seem as if the item was not selected even if it was. This meant that this check box did not fulfil its actual description

Now:
Checking revert unchanged only disables all of the file items as well as the checkbox to enable or disable all of the file items. It then enables the revert button and if pressed it will only send the unchanged files for reversion, this means it fulfills the buttons description.

#change Misc changes: Updated the buttons to use the standardized button layout, and changed "revert files" button to "revert" as this lead to a nicer layout. Added icons to show which of the selected files have been modified.

#reviewedby Thomas.Sarkanen

[CL 2093142 by Barnabas McManners in Main branch]
2014-06-03 10:41:50 -04:00
Tim Sweeney
324683ce78 Engine source (Main branch up to CL 2026164) 2014-03-14 14:13:41 -04:00