Commit Graph

17 Commits

Author SHA1 Message Date
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
Jaroslaw Palczynski
ebce413232 UE4 Refactoring. Changed OVERRIDE and FINAL macros to keywords override and final.
[CL 2104397 by Jaroslaw Palczynski in Main branch]
2014-06-13 06:14:46 -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
ecaf01661c Prevented source control state from being fetched for every content browser widget
Instead of using the (cached) state, we cache the brush to use to display the state and only hit the state cache when state changes.
Also updated Execute() calls to providers to only do relative-path conversions if the path is already relative.
Added SourceControlHelpers::AbsoluteFilenames to aid conversion.

TTP# 335201  - ContentBrowser: Improve idle performance

#codereview Andrew.Brown

[CL 2075346 by Thomas Sarkanen in Main branch]
2014-05-16 06:46:44 -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
Mark Satterthwaite
81cc885bad Changes for running 'clang -E' to preprocess & then calling clang to compile the output in separate stages.
Necessary for using a distributed compiler on OS X. Updated for recent changes that caused more preprocess problems.
#codereview michael.trepka, jack.porter

[CL 2072853 by Mark Satterthwaite in Main branch]
2014-05-14 09:22:59 -04:00
Max Preussner
b63129a60c Slate: Refactored core Slate implementation into SlateCore module in preparation for UMG.
Other Updates:
- The WidgetReflector is now in its own module as well. It will be converted to a plug-in later.
- The Public API of both Slate and SlateCore has largely been reorganized for better discoverabilty. More cleanup work is needed.
- Added a lot of missing API documentation and fixed existing ones. More and better documentation is needed.
- Removed dead code, fixed a couple things I stubled upon, and conformed to coding guidelines (NULL vs nullptr, line breaks, etc.)

Upgrade Notes:
- The Slate Remote Server is currently disabled - will be re-enabled shortly!
- If your module previously had a module dependency to 'Slate', it now also needs a PrivateModuleDependency to 'SlateCore' in its Build.cs file.
- If your module exposes in any of its Public header files types that are now declared in SlateCore, it needs a PublicModuleDependency to 'SlateCore'
- The ToolTip property type on SWidget has changed from SToolTip to IToolTip; change local variables to TSharedPtr<IToolTip> instead of TSharedPtr<SToolTip> where needed
- IToolTip is not a widget. If you need access to the actual widget that represents the tool tip, use IToolTip::AsWidget(); If you need access to the tool tip's content, use IToolTip::GetContentWidget()

Troubleshooting:
- After syncing to this changelist you may have to clean your /Engine/Intermediate/Build/ directory and rebuild your entire project
- If in your project you are getting linker errors for unresolved types that are now declared in SlateCore, you may be missing a dependency to 'SlateCore'
- If in the Engine code you are getting linker errors for unresolved types that are now declared in SlateCore, you may need to rebuild the entire Engine

[CL 2057118 by Max Preussner in Main branch]
2014-04-26 15:07:24 -04:00
Michael Trepka
7dfe6b2dcc Switched SourceControlSettings code to use FPaths::GeneratedConfigDir() instead of trying to concat the path on its own.
[CL 2050902 by Michael Trepka in Main branch]
2014-04-23 19:49:11 -04:00
Thomas Sarkanen
ffc6451909 #summary Added P4 API 2014.2.
#ttp 331898 	EDITOR: Update Perforce SDK to Visual Studio 2013 compatible libraries
#note 	This a re-submission of the previous CL 2048699 minus the SSL lib changes that were causing problems for people with different SSL-enabled installed programs.
#add 	Added new Perforce API libraries & includes for version 2014.2.
#remove 	Deprecated the loading of the P4API.dll - we no longer use this in the Editor (however it must remain as it is used in the build system).
#fix 	Fixed source control tests to properly create temporary packages.
reviewed by 	Andrew.Brown

[CL 2049736 by Thomas Sarkanen in Main branch]
2014-04-23 19:32:18 -04:00
Thomas Sarkanen
a5274d1b18 #summary Fixed up issues found when creating a new source control provider.
#ttp 331349 	Editor: Source Control: Some issues with creating new source control provider
#change 	Fixed up conflation of enum with bool in if() blocks when calling Execute().
#fix 	Fixed QueueStatusUpdate not checking for NULL source control state.
reviewed by 	Andrew.Brown

[CL 2049714 by Thomas Sarkanen in Main branch]
2014-04-23 19:31:56 -04:00
Thomas Sarkanen
4c33b522f3 Back out changelist 2048699
[CL 2049209 by Thomas Sarkanen in Main branch]
2014-04-23 19:27:30 -04:00
Thomas Sarkanen
87bc4ac562 #summary Added P4 API 2014.2 with OpenSSL 1.0.1g.
#ttp 331898 	EDITOR: Update Perforce SDK to Visual Studio 2013 compatible libraries
#ttp 331132 	LIVE: Editor: Source Control: Request to support SSL connections to Perforce servers
#add 	Added new Perforce API libraries & includes for version 2014.2.
#add 	Added OpenSSL 1.0.1g alongside the new Perforce libs & updated build script to link against them, rather than the stub.
#remove 	Deprecated the loading of the P4API.dll - we no longer use this in the Editor (however it must remain as it is used in the build system).
#fix 	Fixed source control tests to properly create temporary packages.
reviewed by 	Andrew.Brown

[CL 2048699 by Thomas Sarkanen in Main branch]
2014-04-23 19:20:02 -04:00
Thomas Sarkanen
c9179dae1f #summary Prevented engine content from appearing in "Submit To Source Control..." dialog when it shouldnt.
#ttp 331118 	LIVE: Editor: Source Control: Engine content is displayed in Check In dialog
#add 	Added a CanAdd() function to the source control state API & implemented this for both providers.
#change 	Changed asset context menu to restrict operations that can be performed based on the new information provided by CanAdd().
#fix 	Fixed a terrible bug in the SVN provider where only the first batch of 50 files would have their status returned correctly.
reviewed by 	Andrew.Brown

[CL 2043041 by Thomas Sarkanen in Main branch]
2014-04-23 18:13:09 -04:00
Jamie Dale
c6f2ebcb97 #ttp 331133 - Editor: Source Control: Resize Bug in Setup Source Control Dialog
#proj UE4
#branch UE4
#summary The source control window is now sized 700px wide
#reviewedby Thomas.Sarkanen, Max.Preussner

[CL 2038534 by Jamie Dale in Main branch]
2014-04-23 16:38:19 -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