Commit Graph

48 Commits

Author SHA1 Message Date
Thomas Sarkanen
a758fdcb30 Do not include BOM signature in non-ASCII commit messages to subversion.
Commit messages now do not include ? leading character as BOM is no longer included.

GitHub pull request #472

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

reviewed by steve.robb

[CL 2317249 by Thomas Sarkanen in Main branch]
2014-10-02 10:51:56 -04:00
Thomas Sarkanen
3522037b79 Source code access now works in SlateViewer and Launcher
Made sure to manually load the appropriate modules for source code access.
The hot reload dependency that VisualStudioSourceCodeAccess had was bringing in the whole editor as a dependency, so this is now restricted to editor builds.
SlateViewer now compiles in CoreUObject as the source code accessor module requires it for its settings.

TTP# 333675 - CHECKIN: SLATE: WidgetReflector code reference hyperlinks don't work anymore

#codereview Nick.Atamas,Frank.Fella

[CL 2292278 by Thomas Sarkanen in Main branch]
2014-09-10 06:43:48 -04:00
Ben Marsh
774bd540b2 Fix crash on shutdown if hot reload module hasn't been loaded yet
[CL 2286821 by Ben Marsh in Main branch]
2014-09-05 17:50:29 -04:00
Ben Marsh
d591804587 Move hot reload functionality from Core into the HotReload module. Precursor to removing assumptions about IS_MONOLITHIC and supporting hybrid monolithic configurations.
[CL 2286426 by Ben Marsh in Main branch]
2014-09-05 12:46:22 -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
Mark Satterthwaite
f09c8ef537 Implemented FXCodeSourceCodeAccessor::SaveAllOpenDocuments using Applescript.
#codereview michael.trepka

[CL 2281263 by Mark Satterthwaite in Main branch]
2014-09-02 06:49:47 -04:00
Ben Marsh
abd570b7a9 Move GetSolutionFilepath() out of Core and into DesktopPlatform.
[CL 2278050 by Ben Marsh in Main branch]
2014-08-29 15:31:27 -04:00
Mark Satterthwaite
23d7554768 Fix Xcode source code accessor name.
#codereview michael.trepka

[CL 2262637 by Mark Satterthwaite in Main branch]
2014-08-19 11:56:44 -04:00
Ben Marsh
236fec9667 Fix clicking on source links from blueprint projects in Rocket builds. Was not correctly handling no solution file being present. Also fix formatting from merges.
[CL 2256580 by Ben Marsh in Main branch]
2014-08-14 15:48:44 -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
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