Commit Graph

39 Commits

Author SHA1 Message Date
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
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
Mark Satterthwaite
b77517426f Updated Mac to p4api-2014.1 so that we may support SSL connections.
This adds the necessary new libraries and changes the Perforce build script to use them on OS X. The Perforce source control module will also include the OpenSSL dependencies on Mac too.
#codereview michael.trepka, thomas.sarkanen

[CL 2175780 by Mark Satterthwaite in Main branch]
2014-07-08 10:18:46 -04:00
Ben Marsh
e35719b0b4 Store whether a plugin is enabled by default in the uplugin file (rather than in the INI file). Simplifies checks for what is enabled in UE4Game and decentralizes everything.
[CL 2119957 by Ben Marsh in Main branch]
2014-06-27 16:38:50 -04:00
Dan Oconnor
0595bcda24 #ue4 comment update, thanks Thomas S.
[CL 2114143 by Dan Oconnor in Main branch]
2014-06-23 12:38:32 -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
Andrew Copland
9bff45fa47 Set the code accessor plugins to be Developer plugins rather than Editor only since Slate can be used within game now.
TTP #333675 - SLATE: WidgetReflector code reference hyperlinks don't work anymore
reviewer Steve.Robb

[CL 2096930 by Andrew Copland in Main branch]
2014-06-06 05:07:37 -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
Marc Audy
83dcc2fe11 Shadow variable fixes
[CL 2094759 by Marc Audy in Main branch]
2014-06-04 15:11:29 -04:00
Ben Marsh
113608cb66 [GitHub] Updated all *.uplugin files to descriptor file format version 3, fixed a few categories for display in the plugins browser. (SRombauts)
https://github.com/EpicGames/UnrealEngine/pull/196

[CL 2093311 by Ben Marsh in Main branch]
2014-06-03 13:33:02 -04:00
Mark Satterthwaite
3e31a54bed Fix opening functions in Xcode 5.1.1 on OS X.
For atos specify the architecture and properly escape the path. When parsing the results read all the digits from the line number, not just the first. Don't abandon opening the file when only a filename is specified as atos only returns filenames, not filepaths.
#codereview michael.trepka

[CL 2093090 by Mark Satterthwaite in Main branch]
2014-06-03 09:36:45 -04:00
Dan Oconnor
018f84a495 #UE4 we don't currently detect that p4 submit commands can fail due to needing to resolve...
#codereview Thomas.Sarkanen

[CL 2089792 by Dan Oconnor in Main branch]
2014-05-30 12:08:29 -04:00
Wes Hunt
7df3d23274 SComboBox fixes
* SComboRow uses a SLATE_DEFAULT_SLOT() instead of SLATE_ARGUMENT called RowContent.
* If OnGenerateWidget is not bound, a default STextBlock is generated reminding the user to bind that delegate instead of failing to compile.
#BUN SComboRow RowContent is now replaced by a default slot as it matches Slate convention better.
#codereview:nick.atamas

[CL 2085621 by Wes Hunt in Main branch]
2014-05-29 17:11:49 -04:00
Dmitry Rekman
8878620adb Source control changes from PR 185.
This is a subset of changes (warning fixes needed to compile Linux editor) from pull request 185 by sbc100, 3dluvr, wshearn, abarbu et al: https://github.com/EpicGames/UnrealEngine/pull/185

#codereview Thomas.Sarkanen

[CL 2085557 by Dmitry Rekman in Main branch]
2014-05-29 17:09:06 -04:00
Steve Robb
e78e096889 TSet is constructible from a TArray.
#add New explicit constructors which append.
#add Move support for TSet::Append.
#add Move operators for TSetElement.
#change Some ranged-for loop changes.
#change Some existing code changed for testing (PluginManager, Subversion plugin).

#codereview robert.manuszewski,gareth.martin

[CL 2080362 by Steve Robb in Main branch]
2014-05-21 10:35:57 -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
Michael Trepka
2f52cea518 Fixed XcodeSourceCodeAccessor compile error
#codereview Jamie.Dale

[CL 2059169 by Michael Trepka in Main branch]
2014-04-29 21:56:21 -04:00
Jamie Dale
a3928adc10 Fixed VS_OPEN logspam caused by a deferred command being constantly requested until VS had finished opening
TTP# 331398 - EDITOR: Logspam when opening Visual Studio

Deferring a VS file open request used to use a deferred command to wait until VS had finished opening before opening the requested files, however, this command was essentially simulating a Tick, as if the command was not yet ready to be processed it was simply deferred again, leading to spammed output.

Rather than do this, I've added a Tick function which will attempt to open the entire list of pending files as a single call, rather than try each file individually like the command would.

ReviewedBy Thomas.Sarkanen, Chris.Wood, Max.Preussner

[CL 2058815 by Jamie Dale in Main branch]
2014-04-29 11:36:21 -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
Thomas Sarkanen
1cf26e7b0d Added OpenSSL 1.0.1g for use with Perforce.
Added OpenSSL 1.0.1g alongside the new Perforce libs & updated build script to link against them, rather than the stub.
Also added debug versions of the Perforce libs so bDebugBuildsActuallyUseDebugCRT works again.
Added delay-loading of the OpenSSL dlls on Windows 64-bit.
Added OpenSSL dlls to the Rocket distillation script.

TTP# 331132 - LIVE: Editor: Source Control: Request to support SSL connections to Perforce servers

reviewed by Andrew.Brown

[CL 2055257 by Thomas Sarkanen in Main branch]
2014-04-24 04:33:15 -04:00