Commit Graph

49 Commits

Author SHA1 Message Date
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
Jeff Campeau
e72d53724e Fix a typo in build.cs for perforce
Enable P4 libs for VS2015

[CL 2653680 by Jeff Campeau in Main branch]
2015-08-12 18:07:33 -04:00
Jeff Campeau
22f2f3421f Enable 2015 p4 lib disable
[CL 2653316 by Jeff Campeau in Main branch]
2015-08-12 15:22:32 -04:00
Jeff Campeau
d8e7e194ff Perforce library support switch.
Allows PerforceSourceControl plugin to be built without the P4API libraries (will not function of course).
Perforce plugin build switched off for VS2015 until we can get libs in place.

[CL 2652386 by Jeff Campeau in Main branch]
2015-08-12 03:39:42 -04:00
buildmachine
ce42430211 Code documentation from CL#2636592
[CL 2636758 by buildmachine in Main branch]
2015-07-29 07:47:34 -04:00
Jamie Dale
6028f866b5 Prevented Perforce being able to mark files for add that don't currently exist on disk
UE-17117 - The Perforce SCC allows you to add files that don't exist

This also allows us to remove the ShouldForceBinaryAdd function, as that was to fix bad behavior when Perforce was addding an asset file that didn't yet exist.

ReviewedBy Thomas.Sarkanen

[CL 2634101 by Jamie Dale in Main branch]
2015-07-27 13:21:21 -04:00
Steve Robb
cbac34aabd Deprecated delegate code removed.
Some fixes for deprecated code.

#codereview robert.manuszewski

[CL 2617562 by Steve Robb in Main branch]
2015-07-11 05:10:03 -04:00
Marc Audy
1a12e9cffe Add a matching PRAGMA_ENABLE_SHADOW_VARIABLE_WARNINGS for PRAGMA_DISABLE_SHADOW_VARIABLE_WARNINGS instead of using basic PRAGMA_POP
[CL 2548029 by Marc Audy in Main branch]
2015-05-12 17:41:47 -04:00
Ben Marsh
cbf8b979ed First pass on tidying up all the plugin categories. Reduced everything to a single-level hierarchy, and attempt to group things by broad categories rather than implementation details.
[CL 2521430 by Ben Marsh in Main branch]
2015-04-22 14:40:16 -04:00
Marc Audy
6fbd586187 Disable shadow variable warnings around third party includes that throw warnings
[CL 2510513 by Marc Audy in Main branch]
2015-04-13 13:43:25 -04:00
Saul Abreu
79a26091bf Fixed behavior on FString::ParseIntoArray (muliple delimiters overload) functionality to support optionally culling empty strings. Greatly simplified implementation logic. Output parameter now properly named and taken by reference.
#codereview Steve.Robb, Robert.Manuszewski

[CL 2466824 by Saul Abreu in Main branch]
2015-03-02 15:51:37 -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
141f8a1b3d Fixed Checked Out filter in Content Browser.
#jira UE-8369 - The checked out content browser filter doesn't work

[CL 2425323 by Richard TalbotWatkin in Main branch]
2015-01-30 03:09:43 -05:00
Thomas Sarkanen
be75fe1eca Updated revision display to display strings rather than revision indices
API break: added new pure virtual ISourceControlProvider::UsesChangelists()
API break: added new pure virtual ISourceControlState::FindHistoryRevision(const FString&)
API break: added new pure virtual ISourceControlRevision::GetRevision()

Implementing a Git provider requires us to be able to display revisions that are not indices as Git revisions are hashes. This updates the relvant code to allow us to display these revisions correctly.

[CL 2411986 by Thomas Sarkanen in Main branch]
2015-01-20 05:48:14 -05:00
Max Preussner
7795e44c00 Core: Renamed FQueuedWork to IQueuedWork
#CodeReview: robert.manuszewski

[CL 2404137 by Max Preussner in Main branch]
2015-01-12 19:53:59 -05:00
Steve Robb
0756ef15b9 Delegate comparisons deprecated, lots of other associated code deprecated, and lots of warning fixups:
* Multicast delegate Add* calls now return FDelegateHandles, and Remove* calls are now all deprecated, except for a new Remove function which takes a FDelegateHandle.
* New FConsoleManager::RegisterConsoleVariableSink_Handle and UnregisterConsoleVariableSink_Handle functions which work in terms of FConsoleVariableSinkHandle.
* Timer calls which don't take FTimerHandles are deprecated.
* FTicker::AddTicker now returns an FDelegateHandle and is removed by an overloaded Remove function.
* DEFINE_ONLINE_DELEGATE* macros now define _Handle variants of the Add/Remove functions which return/take handles.
* Various other handle-based registration changes.
* Some unity build fixes.
* Some simplification of delegate code.
* Fixes for lots of existing code to use handle-based registration and unregistration.

#codereview robert.manuszewski

[CL 2400883 by Steve Robb in Main branch]
2015-01-08 09:29:27 -05: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
Ben Marsh
149375b14b Update copyright notices to 2015.
[CL 2379638 by Ben Marsh in Main branch]
2014-12-07 19:09:38 -05:00
Ben Marsh
5fb9cedd02 Fix missing or misplaced header guards.
[CL 2371047 by Ben Marsh in Main branch]
2014-11-26 14:46:13 -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
Mike Fricker
2c6f571a5d Various compilation fixes for Clang on Windows platform
- Fixed some warnings and errors in Windows code when bCompileWithClang=true

[CL 2284753 by Mike Fricker in Main branch]
2014-09-04 13:15:42 -04:00
Michael Trepka
3293117f09 More fixes for Clang warnings
[CL 2238624 by Michael Trepka in Main branch]
2014-07-31 15:43:08 -04:00
Michael Trepka
62e7793fa0 Another batch of fixes for Clang compile warnings
[CL 2237490 by Michael Trepka in Main branch]
2014-07-30 16:16:46 -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
Thomas Sarkanen
155bd251e4 Added ISourceControlLabel::Sync() overload that takes multiple files
API-breaking change (although I dont think that any other 3rd-party provider plugins are using it at the moment).

Kept old single-filename call & added new version that takes array of files. Re-implemented this for internal source control providers (just a patch on the old version).

Added automation tests for label syncing.

TTP# 340899 - SourceControl: Need Sync() overloads that accept multiple files

[CL 2190291 by Thomas Sarkanen in Main branch]
2014-07-11 04:28:12 -04:00