Commit Graph

40 Commits

Author SHA1 Message Date
Ben Marsh
7e445df208 [INTEGRATE] Change 2420845 by Mike.Fricker@MFRICKER_G3686_Alpha on 2015/01/27 14:53:16
Enabled Git SCC plugin
	- Marked the Git plugin as "Beta" in the UI
	- Fixed Git.exe folder not using correct path separators
	- Added missing icon for SCC plugin
	- Removed experimental setting for Git SCC plugin (the plugin itself is still 'beta' though)
	- Moved README contents into the source code, cleaned it up a bit

[CL 2425776 by Ben Marsh in Main branch]
2015-01-30 10:30:56 -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
Richard TalbotWatkin
b047ebfd79 Removed source control icon from top-right of MainFrame.
#codereview Matt.Kuhlenschmidt

[CL 2411057 by Richard TalbotWatkin in Main branch]
2015-01-19 12:52:01 -05:00
Thomas Sarkanen
09720d569e Correctly sorted default (None) source control provider to the top of list
https://jira.ol.epicgames.net/browse/UE-7754

[CL 2410740 by Thomas Sarkanen in Main branch]
2015-01-19 06:43:28 -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
Dan Hertzka
1ce19a5ffa Full rename of the Slate "active tick" system to "active timer"
[CL 2394301 by Dan Hertzka in Main branch]
2014-12-19 17:44:49 -05:00
Dan Hertzka
c042ddcb94 ---- Merging with SlateDev branch ----
Introduces the concept of "Active Ticking" to allow Slate to go to sleep when there is no need to update the UI.

While asleep, Slate will skip the Tick & Paint pass for that frame entirely.
- There are TWO ways to "wake" Slate and cause a Tick/Paint pass:
    1. Provide some sort of input (mouse movement, clicks, and key presses). Slate will always tick when the user is active.
        - Therefore, if the logic in a given widget's Tick is only relevant in response to user action, there is no need to register an active tick.
    2. Register an Active Tick. Currently this is an all-or-nothing situation, so if a single active tick needs to execute, all of Slate will be ticked.

- The purpose of an Active Tick is to allow a widget to "drive" Slate and guarantee a Tick/Paint pass in the absence of any user action.
    - Examples include animation, async operations that update periodically, progress updates, loading bars, etc.

- An empty active tick is registered for viewports when they are real-time, so game project widgets are unaffected by this change and should continue to work as before.

- An Active Tick is registered by creating an FWidgetActiveTickDelegate and passing it to SWidget::RegisterActiveTick()
    - There are THREE ways to unregister an active tick:
        1. Return EActiveTickReturnType::StopTicking from the active tick function
        2. Pass the FActiveTickHandle returned by RegisterActiveTick() to SWidget::UnregisterActiveTick()
        3. Destroy the widget responsible for the active tick

- Sleeping is currently disabled, can be enabled with Slate.AllowSlateToSleep cvar
- There is currently a little buffer time during which Slate continues to tick following any input. Long-term, this is planned to be removed.
    - The duration of the buffer can be adjusted using Slate.SleepBufferPostInput cvar (defaults to 1.0f)

- The FCurveSequence API has been updated to work with the active tick system
    - Playing a curve sequence now requires that you pass the widget being animated by the sequence
    - The active tick will automatically be registered on behalf of the widget and unregister when the sequence is complete
    - GetLerpLooping() has been removed. Instead, pass true as the second param to Play() to indicate that the animation will loop. This causes the active tick to be registered indefinitely until paused or jumped to the start/end.

[CL 2391669 by Dan Hertzka in Main branch]
2014-12-17 16:07:57 -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
Eric Newman
65fa5864ff Fortnite Dev > Main Integration
Merged CL# 2352617 using UE4-Fortnite-To-UE4

[CL 2355906 by Eric Newman in Main branch]
2014-11-11 10:35:51 -05:00
Dmitry Rekman
fc4578d1b4 More headless crash reporter fixes.
[CL 2330736 by Dmitry Rekman in Main branch]
2014-10-15 17:08:46 -04:00
Dmitry Rekman
ebb70652b0 Fixing headless SourceControl build.
#codereview Wes.Hunt

[CL 2330421 by Dmitry Rekman in Main branch]
2014-10-15 13:42:50 -04: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
Michael Trepka
6de96b021a FSourceControlModule::ShowLoginDialog will now properly show the window as modal if needed when RootWindow is NULL
[CL 2322621 by Michael Trepka in Main branch]
2014-10-08 09:58:56 -04:00
Max Preussner
1e9be52f74 SCC: Source control login UI polish
[CL 2299746 by Max Preussner in Main branch]
2014-09-16 13:46:07 -04:00
Matt Kuhlenschmidt
fb76f6393e Fix constant FName initialization in places that execute often
[CL 2294154 by Matt Kuhlenschmidt in Main branch]
2014-09-11 16:48:17 -04:00
Mark Satterthwaite
d8011b6dba Fix from Thomas Sarkanen for CRITICAL: EDITOR: Mac: CRASH: Creating a new collection while connented to Source Control (TTP #345087) - make sure that the scoped source control progress window is created as a modal window.
#codereview michael.trepka, thomas.sarkanen

[CL 2277714 by Mark Satterthwaite in Main branch]
2014-08-29 11:20:13 -04:00
Dmitry Rekman
1a5fe3e22a Make SourceControl module work (better) w/o Slate.
[CL 2255258 by Dmitry Rekman in Main branch]
2014-08-13 17:39:56 -04:00
kevin hamilton
aeaff7a2e2 Automation: Milestone 2 - Editor build promotion tests
[CL 2254064 by kevin hamilton in Main branch]
2014-08-12 22:05:52 -04:00
Jamie Dale
ee3213c7df Fixed crash closing the editor with SVN source control enabled
TTP# 342872 - EDITOR: Regression: CRASH: FSourceControlModule::ShutdownModule

The SVN source control provider module was being shutdown before the main source control module, leading to a crash.

The source control module now watches for its active provider module being unloaded, and will gracefully reset itself to the default (dummy) provider if that happens.

I also added these same checks to the source code access module, as it uses the same provider modules mechanism.

#codereview Thomas.Sarkanen, Max.Preussner

[CL 2244286 by Jamie Dale in Main branch]
2014-08-05 10:29:53 -04:00
Justin Hair
f432484c0f SourceControlTests.cpp and EditorAutomationTests.cpp were using an asset that has moved to the NotForLicensee folder.
EditorAutomationTest.cpp -- Just changed the reference to the cube mesh in the engine folder.
SourceControlTests.cpp -- updated the SourceControlTest location to the new one.

[CL 2230126 by Justin Hair in Main branch]
2014-07-24 12:05:05 -04:00
Mike Fricker
a5726a4743 Fixed source control module not reporting circular dependency on UnrealEd module
[CL 2225621 by Mike Fricker in Main branch]
2014-07-21 11:29:53 -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
Thomas Sarkanen
f42f5d0781 Fix branching creating multiple files
Branching of files needed to be removed (by Bob Tellez) as it was causing crashes and mutiple duplicate files to show up in the content browser. This fix re-instates working branches in the Editor.
The idea is that we now do the copy/duplicate/rename operations first, then perform the 'branch' once the files are finished with by the Editor. This keeps the asset registry & directory watcher systems happy & leaves the issue of branching to source control alone.
Because of the way SVN copy works, the SVN verison of this is slightly icky. SVN copy does not allow a branch-copy over an existing file in the workspace (even if not under source control), so we have to move the file into a temp directory, do the copy, then re-move the file back over the top of its old location.

TTP# 334923 - EDITOR: Perforce Integration (Move -> Delete + Add instead of Integrate)

reviewed by Max.Preussner,Bob.Tellez,Matt.Kuhlenschmidt

[CL 2180124 by Thomas Sarkanen in Main branch]
2014-07-09 06:31:13 -04:00
Dan Oconnor
79165ed057 #UE4 First iteration on the merge module.. Changes to diff panel reviewed by Mike Beach, driver disabled by [AssetMerge] EnableAssetMerge
[CL 2116875 by Dan Oconnor in Main branch]
2014-06-25 13:25:21 -04:00
Dan Oconnor
be25e93db6 #ue4 modificatiosn to source control plugins to better handle files that are in a conflicted state, or are not at head and are going to enter a conflicted state when we sync
#codereview Thomas.Sarkanen

[CL 2111945 by Dan Oconnor in Main branch]
2014-06-20 12:57:45 -04:00