Commit Graph

22 Commits

Author SHA1 Message Date
Matthew Griffin
bb70b349ce Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update
#lockdown Nick.Penwarden

[CL 2819020 by Matthew Griffin in Main branch]
2016-01-07 08:17:16 -05:00
Richard TalbotWatkin
b6fbc40050 Fixed issues where assets pending delete were sometimes not showing up in the list of files to commit.
#jira UE-19982 - Deleted assets don't appear on the list of assets to submit to SVN

[CL 2656297 by Richard TalbotWatkin in Main branch]
2015-08-14 13:07:16 -04:00
Thomas Sarkanen
cb1ff57300 Fixed SVN status updates taking a long time
Added a hint flag to prevent us from needing to perform whole-repo updates for every multi-file status update (such as those in the content browser). This also keeps the performance improvements we get form querying the workign copy root when 'Submit to source control...' is clicked.

Also added a temp fix for a crash when initializing the file list in the submit dialog where plugin content would not resolve package names correctly. Right now we just display the filename. A proper fix is hopefully incoming from Rob M (listed as UE-11493) which measn we can revert back to using package names.

From this UDN:
https://udn.unrealengine.com/questions/238672/potential-threading-issue-using-subversion-in-edit.html

UE-11466 - SVN status can take a very long time in certain circumstances, and possibly crash

[CL 2473604 by Thomas Sarkanen in Main branch]
2015-03-10 07:41:56 -04:00
Jamie Dale
7acb1b77bd Fixed some new code that was providing text to Slate as FString rather than FText
UETOOL-213 - Minimize Slate FString -> FText conversion (remove SLATE_TEXT_ATTRIBUTE)

[CL 2455943 by Jamie Dale in Main branch]
2015-02-23 06:32:47 -05:00
Richard TalbotWatkin
44e15875cd Added the ability to commit file deletions from the editor.
#jira UE-6304 - Source Control: Add the ability to commit file deletions from the editor
#reviewedby Thomas.Sarkanen

[CL 2446774 by Richard TalbotWatkin in Main branch]
2015-02-16 05:11:32 -05:00
Richard TalbotWatkin
045ca38692 Moved Source Control actions button into level toolbar.
#jira UE-1512 - NUX: Move Source Control button somewhere more discoverable

[CL 2405840 by Richard TalbotWatkin in Main branch]
2015-01-14 06:59:46 -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
Richard TalbotWatkin
9857379fb9 Fixed resizable source control submit widget on Mac.
#jira UE-6004 - Submit Files window cannot be resized, can cut off paths

[CL 2383461 by Richard TalbotWatkin in Main branch]
2014-12-10 10:07:46 -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
Richard TalbotWatkin
5817c35ebe Made Source Control Submit window user-resizable.
#jira UE-6004 - Submit Files window cannot be resized, can cut off paths

[CL 2374575 by Richard TalbotWatkin in Main branch]
2014-12-03 04:26:39 -05:00
Richard TalbotWatkin
885836511e Made Error message in submit to source control dialog stand out more.
#jira UE-5758 - "Submit Files" dialog doesn't explain why the "Ok" button is disabled

[CL 2374540 by Richard TalbotWatkin in Main branch]
2014-12-03 02:58:15 -05:00
Richard TalbotWatkin
cec2305ea1 Config files are now presented in the "Check in files" dialog along with package files.
#jira UE-5250 - Submit to Source Control does not see edited project settings
#reviewedby Matt.Kuhlenschmidt

[CL 2364638 by Richard TalbotWatkin in Main branch]
2014-11-19 03:23:44 -05:00
Wes Hunt
31e2bb00ac Removed a bunch of stuff from Slate standard include, created SlateBasics.h
* Moved Slate.h into SlateBasics.h and began shifting less commonly used headers into SlateExtras.h.
* Slate.h now simply includes SlateBasics.h and SlateExtras.h.
* Slate.h includes a deprecated warning now to indicate that SlateBasics.h + specific includes should be used instead.
* Moved dozens of inlined functions using Slate widgets into .cpp files to avoid header dependencies.
* All code samples now include SlateBasics.h and SlateExtras.h so future shifts will not break most those projects, but not trigger the deprecation warning of including Slate.h.
#BUN

[CL 2329610 by Wes Hunt in Main branch]
2014-10-14 22:50:06 -04:00
Jamie Dale
0015c5bd10 Converted the source control commit comment to use a multi-line editable text control
ReviewedBy Thomas.Sarkanen
#codereview Max.Preussner

[CL 2223250 by Jamie Dale in Main branch]
2014-07-18 10:10:04 -04:00
Nick Darnell
2e2dcaa6b2 UMG - ESlateCheckBoxState is now an actual Enum. This required updating a lot of code that was using auto conversion from bool to int. Fixing a lot of issues with garbage collecting and circular references, old button/border widgets will be broken by this checkin. No longer crashing on exit of PIE.
[CL 2111919 by Nick Darnell in Main branch]
2014-06-20 12:37:24 -04:00
Richard TalbotWatkin
cae2251bba Changed all instances of notifications with a "Show Log" hyperlink to be more precise about which log they will open.
#ttp 338544 - EDITOR: Update Notifications "Show Log" to "Show Output Log"
#branch UE4
#change Changed hyperlink text to be more specific in individual instances of FNotificationInfo objects.
#reviewedby Chris.Wood

[CL 2108221 by Richard TalbotWatkin in Main branch]
2014-06-17 12:05:50 -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
Thomas Sarkanen
06466ce255 Added CanCheckIn() to ISourceControlProvider
To allow for further abstraction & extension using DVCS systems like Git & Mercurial, we expose a new CanCheckIn() function that is used when determing 'modifed' files to check in.

#github https://github.com/EpicGames/UnrealEngine/pull/151

TTP# 335099 - [GitHub] 151 : Add ISourceControlState::CanCheckIn()

reviewed by Max.Preussner

[CL 2073950 by Thomas Sarkanen in Main branch]
2014-05-15 04:14:04 -04:00
Thomas Sarkanen
8c30db8697 Submit message icon is no longer a 'stop' symbol
Changed the message log direct notify to a custom notification so the icon gets set to something less aggressive (message log uses the 'worst' message on the current log page for the icon).

TTP# 333620 - Editor: Source Control: Error icon displayed when submitting to source control

reviewed by Andrew.Rodham

[CL 2060917 by Thomas Sarkanen in Main branch]
2014-05-01 06:07:37 -04:00
Barnabas McManners
8f4029c81c #TTP 332496 - EDITOR: Submit files dialog does not use the standard dialog button sizes.
#branch UE4

#proj Editor.SourceControlWindows

#summary The submit files dialog now follows the same style as the rest of the engine.

#change Change the buttons to use the established method of crating uniformly sized buttons.

#reviewedby Chris.Wood

[CL 2053199 by Barnabas McManners in Main branch]
2014-04-23 20:04:28 -04:00
UnrealBot
db494a6e69 Engine source (Main branch up to CL 2037954) 2014-04-02 18:09:23 -04:00
Tim Sweeney
324683ce78 Engine source (Main branch up to CL 2026164) 2014-03-14 14:13:41 -04:00