Commit Graph

26 Commits

Author SHA1 Message Date
SRombauts
b39e2d7f00 PR #1096: (Git plugin) restore connect error popup message (Contributed by SRombauts)
[CL 2526806 by Matt Kuhlenschmidt in Main branch]
2015-04-27 08:48:50 -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
SRombauts
7a0a7f0e5c PR #1056: (Git plugin) Option to initialize new local repository for current project (Contributed by SRombauts)
[CL 2514888 by Matt Kuhlenschmidt in Main branch]
2015-04-16 16:13:48 -04:00
SRombauts
69d26a1d3a PR #1043: Git plugin merge support (Contributed by SRombauts)
[CL 2514847 by Matt Kuhlenschmidt in Main branch]
2015-04-16 15:51:35 -04:00
Dmitry Rekman
18adb27627 Temporarily disable Git plugin on Linux until UE-13628
[CL 2509677 by Dmitry Rekman in Main branch]
2015-04-11 18:49:08 -04:00
Marc Audy
4562acb429 Fix shadow variables
[CL 2507160 by Marc Audy in Main branch]
2015-04-09 15:23:52 -04:00
Matt Kuhlenschmidt
3ed7a4fed3 Remove Git source control plugin log spam
[CL 2506757 by Matt Kuhlenschmidt in Main branch]
2015-04-09 09:59:26 -04:00
SRombauts
5f3b859e81 PR #1029: (Git Plugin) improved status with user name and e-mail (Contributed by SRombauts)
[CL 2506709 by Matt Kuhlenschmidt in Main branch]
2015-04-09 09:14:58 -04:00
SRombauts
4bae6ad230 PR #966: (Git Plugin) shearch more paths for git executable if not found in standard path (Contributed by SRombauts)
[CL 2506700 by Matt Kuhlenschmidt in Main branch]
2015-04-09 08:55:39 -04:00
PaulEremeeff
3d878d5a79 PR #996: Fixing PVS-Studio warnings (Contributed by PaulEremeeff)
I have reviewed each change carefully, but it is a large change and I could have missed something! Here is a summary of the types of changes in this CL:
 * Made nullptr checks consistent (the plurality of the changes are of this type)
 * Completed switch statements (IE, switch did not explicitly handle default case, but had unhandled enum entries - this is the second most popular type of fix)
 * Removed unused variables
 * Removed redundant initializations
 * WidgetNavigationCustomization.cpp was fixed by the owner
 * integers converted to floats where result was stored in a float
 * Removed redundent null checks (e.g. before delete statements)
 * Renamed variables to prevent non-obvious shadowing
 * Fixed use of bitwise & when checking for equality to an enum entry (which is often 0)
 * Fixes for some copy paste errors (e.g. FoliageEdMode.cpp)

[CL 2498053 by Dan Oconnor in Main branch]
2015-03-31 20:12:31 -04:00
Chris Gagnon
f19a0c65b1 Fix for crash if you don't have Git.
#codereview Matt.Kuhlenschmidt

[CL 2488160 by Chris Gagnon in Main branch]
2015-03-23 14:51:25 -04:00
Matt Kuhlenschmidt
f900cc9b03 PR #958: Fix git commit batching (commit could have failed for large number of files) (Contributed by SRombauts)
[CL 2487736 by Matt Kuhlenschmidt in Main branch]
2015-03-23 09:49:22 -04:00
Matt Kuhlenschmidt
02f9df1643 PR #956: (Git Plugin) Search for the git executable into the GitHub folder if not found as standalone installation path (Contributed by SRombauts)
[CL 2487732 by Matt Kuhlenschmidt in Main branch]
2015-03-23 09:46:54 -04:00
Dmitry Rekman
de842c0fda Fix for double pipe calls in DesktopPlatform/GitSCC.
- PR #873 contributed by yaakuro

https://github.com/EpicGames/UnrealEngine/pull/873

[CL 2472497 by Dmitry Rekman in Main branch]
2015-03-09 11:45:35 -04:00
Max Preussner
52e12116c2 Rollback //depot/UE4/Engine/Content/Editor/Slate/Icons/AssetIcons/TileMap_64x.png to revision 1
These files were accidentally deleted as a result of a failed integration between Main and LauncherDev.

[CL 2466855 by Max Preussner in Main branch]
2015-03-02 16:08:07 -05: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
Marc Audy
daf220d485 Fix shadowed variables
[CL 2466748 by Marc Audy in Main branch]
2015-03-02 15:12:31 -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
Max Preussner
256933f5ab Merging using UE4-To-UE4-LauncherDev, up to CL 2431138
#CodeReview: carlos.cuello

[CL 2431178 by Max Preussner in Main branch]
2015-02-04 00:28:16 -05:00
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
Max Preussner
9a2cef9933 Fixed deprecation warning
[CL 2420715 by Max Preussner in Main branch]
2015-01-27 13:28:42 -05:00
Ben Marsh
e8f1de377b [INTEGRATE] Change 2412228 by Matt.Kuhlenschmidt@matt_kuhlenschmidt_main on 2015/01/20 10:40:35
Fix compile errors

	#codereview matthew.griffin, thomas.sarkanen

[CL 2419434 by Ben Marsh in Main branch]
2015-01-26 18:35:48 -05:00
Thomas Sarkanen
91a7cbbc2a Fixed Git 'Submit to source control' always failing
Added RemoveRedundantErrors (similar to SVN and P4) so thats erors we dont care about can be rectified.

[CL 2412011 by Thomas Sarkanen in Main branch]
2015-01-20 06:37:25 -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
Thomas Sarkanen
9b4fc8c7d0 Git source control plugin is now experimental
Added setting and wrapped registration of modular feature in the flag.

[CL 2411975 by Thomas Sarkanen in Main branch]
2015-01-20 05:30:21 -05:00