Commit Graph

146 Commits

Author SHA1 Message Date
Josh Adams
01c4d45e38 - Renamed Desktop target platform to AllDesktop to reduce conflicts with Desktop directories [UEPLAT-894]
#codereview peter.sauerbrei,ben.marsh

[CL 2588676 by Josh Adams in Main branch]
2015-06-16 11:09:27 -04:00
Dmitry Rekman
eae52c65aa Linux: switch from LinuxNativeDialogs to SlateFileDialogs.
- Still experimental at this point.

#codereview Nick.Atamas, Matthew.Lewis, Josh.Adams

[CL 2587983 by Dmitry Rekman in Main branch]
2015-06-15 18:14:07 -04:00
Justin Sargent
bdce0fd5fe Updating Mac editor behavior to take into the account the newly renamed launcher exe.
[CL 2586382 by Justin Sargent in Main branch]
2015-06-12 16:57:25 -04:00
Bob Tellez
5d2fd8b7fb [AUTOMERGE]
#UE4 Reducing dependencies on Version.h

#platformnotify Josh.Adams

--------
Integrated using branch Ue4-To-UE4-Fortnite-Simple (reversed) of change#2585810 by Bob.Tellez on 2015/06/12 11:30:33.

[CL 2585846 by Bob Tellez in Main branch]
2015-06-12 12:01:23 -04:00
Andrew Brown
0a09f97f20 [INTEGRATE] merge ue4<-ue4-launcherDev cl 2582701
#change Aalternate solution discussed with Ben.Marsh

#platformnotify Josh.Adams

[CL 2582776 by Andrew Brown in Main branch]
2015-06-10 11:21:05 -04:00
Andrew Brown
59c10c5f50 [INTEGRATE] merge ue4<-ue4-launcherDev cl 2582631
#change Rollback of accidental merge 2581810. Discussed alternate solution with Ben.Marsh

#platformnotify Josh.Adams

[CL 2582768 by Andrew Brown in Main branch]
2015-06-10 11:14:19 -04:00
Justin Sargent
273cde1704 Merging using UE4-To-UE4-LauncherDev
#platformnotify Josh.Adams

[CL 2581810 by Justin Sargent in Main branch]
2015-06-09 16:41:53 -04:00
Daniel Lamb
0d0485b4de Fix compilation error on mac.
[CL 2565471 by Daniel Lamb in Main branch]
2015-05-26 15:22:25 -04:00
Daniel Lamb
260d2861ff Fixed up mac not converting paths to relative paths when saving filenames.
[CL 2564954 by Daniel Lamb in Main branch]
2015-05-26 10:51:18 -04:00
Ben Marsh
570c0df105 Disable UBT makefiles when compiling projects from the editor. It's more important to be robust than fast, since we're automating something for the user.
[CL 2547042 by Ben Marsh in Main branch]
2015-05-12 08:01:00 -04:00
Dmitry Rekman
187fa3c94e LinuxNativeDialogs: fix for a crash (UE-15091) and other improvements.
- LND will init/tear down backend DSOs cleanly.
- LND will attempt to detect the desktop environment and use appropriate backend class.
- Filters are fixed so GTK backend can parse them.
- LC_NUMERIC is forced to en_US to prevent comma vs. dot problems when parsing configs.
- Qt4 is tried before Qt5 as the latter can still crash on shutdown.

[CL 2546195 by Dmitry Rekman in Main branch]
2015-05-11 18:30:57 -04:00
Josh Adams
54b9c26f22 - Removed DesktopTargetPlatform from editor (File | Package) [UE-14993]
[CL 2545340 by Josh Adams in Main branch]
2015-05-11 09:47:18 -04:00
Dmitry Rekman
9781796a59 Rocket: disable packaging for projects that need libs which aren't bundled (UE-7114).
- Rocket doesn't bundle Linux libs, making code-based projects (and projects with third-party plugins) fail during compilation.
- Updated messaging to reflect this.
- Also added a SDK check for Linux and a 'getting' started UDN page.
- Updated Linux README for 4.8.

#codereview Peter.Sauerbrei, Ben.Marsh, Jeff.Wilson

[CL 2543338 by Dmitry Rekman in Main branch]
2015-05-08 14:31:12 -04:00
Mike Fricker
a3443c81d5 Fixed C++ variable shadowing in Windows-specific code
- Two actual bugs were fixed (GitSourceControlUtils.cpp, VisualStudioSourceCodeAccessor.h)
- (These errors were found by using the Clang compiler on Windows platform)

#codereview marc.audy

[CL 2532216 by Mike Fricker in Main branch]
2015-04-30 13:50:55 -04:00
salamanderrake
27ccfbd723 PR #806: KDevelop Project Generation (UE-9427).
- Contributed by salamanderrake.
- Cosmetic differences from the PR.
- Also removed filtering out Windows/Mac/etc directories when generating a qmake project since it makes code navigation worse.

[CL 2532165 by Dmitry Rekman in Main branch]
2015-04-30 13:15:34 -04:00
Dmitry Rekman
1ea672a041 LND: Fix FBX import (UE-13581).
- Lumps all filters into one to work around current limitiations of the third party lib.

[CL 2531403 by Dmitry Rekman in Main branch]
2015-04-30 02:01:04 -04:00
Justin Sargent
75f4981862 Merging using UE4-To-UE4-LauncherDev
[CL 2517983 by Justin Sargent in Main branch]
2015-04-20 14:30:09 -04:00
Andrew Rodham
8ff0d8b98b Added config migration path for newer versions of the engine.
Newly installed versions of the engine will now attempt to copy the project-agnostic config settings from a previous engine installation. This happens by way of a versioned manifest that copies old versions when the manifest does not exist, or is a different version. This code path is benign for non-installed versions of the engine (or FPaths::ShouldSaveToUserDir() is false).

EditorGameAgnosticSettings and EditorUserSettings ini paths have been renamed to EditorSettings and EditorPerProjectUserSettings respectively to better convey their purpose. In general, most settings should be saved in EditorSettings (project-agnostic) so that they apply regardless of which project is open. We have some way to go migrating existing settings for this to be the case, however.

Some previously per-project configuration files are now project-agnostic (such as Editor.ini, EditorKeyBindings.ini, and EditorLayout.ini)

GEditor->Access...Settings and GEditor->Get...Settings have been removed in favor of direct access of the CDO through GetMutableDefault<> and GetDefault<> respectively. Global config ini filenames that are not set up are now neither loaded nor saved on build machines, to handle the problem of indeterminate state more generically.

This addresses UETOOL-270 (Most editor preferences should be project-agnostic)

[CL 2517558 by Andrew Rodham in Main branch]
2015-04-20 10:12:55 -04:00
Richard TalbotWatkin
0eac4346bf Added code to abort opening a project if the project's PackageFileUE4Version is higher than the current engine's.
#jira UE-8407 - Trying to open project from Newer version to older version of the Editor
#reviewedby Ben.Marsh

[CL 2515634 by Richard TalbotWatkin in Main branch]
2015-04-17 06:35:39 -04:00
Josh Adams
3433e6bb52 - Changed DesktopPlatform to be (Win+Mac+Linux) instead of (Win/Mac/Linux). Hopefully more clear it is all 3 combined
[CL 2505837 by Josh Adams in Main branch]
2015-04-08 16:43:55 -04:00
Josh Adams
ed509b3c2d - Fixed paths to documentation for missing SDK when doing File | Package on HTML5, PS4, XB1 [UE-13252]
#codereview peter.sauerbrei

[CL 2501595 by Josh Adams in Main branch]
2015-04-03 16:21:10 -04:00
Ben Marsh
fee619181a Make sure initial compile forwards -Rocket flag to UBT when running from source with the -Rocket argument.
#codereview Matthew.Griffin

[CL 2498804 by Ben Marsh in Main branch]
2015-04-01 13:23:00 -04:00
Mike Fricker
114458bf0f Clang warning fixes: Fixed missing 'override' specifiers
- Also removed some unreferenced functions that adding 'override' revealed

PR #1002 -- Thank you, Omar007!

[CL 2498415 by Mike Fricker in Main branch]
2015-04-01 07:20:55 -04:00
Dmitry Rekman
f3953ad462 Changes to building the UBT.
- Incorporates PR #934 (fix a broken path to RunXBuild.sh when building UBT for Linux) contributed by amigo (3dluvr).
- Moved more code out of #ifdef-s to make compiler see it when compiling on all platforms.

#codereview Ben.Marsh, Jaroslaw.Palczynski

[CL 2482335 by Dmitry Rekman in Main branch]
2015-03-17 18:47:43 -04:00
Jaroslaw Palczynski
6c305898e0 UE-8578: Slate Widget fails to compile once added to a new project
Slate Widget was failing, because of missing Slate dependencies. Testing introduced a couple of problems which all was fixed by this CL:
1. I introduced AdditionalDependencies in .uproject file and change "Add Code To Project..." procedure to fill this array if needed. UBT reads this field and builds the project with required modules. Needed for Slate classes.
2. Changed UHT to #include missing headers in generated.h files if it was missing an include for it's super class. It was causing problems if we were trying to add a subclass of BrushShape -- BrushShape.h didn't have #include "Brush.h" and UBrushShape was inheriting from UBrush.
3. Above problems also occured for Slate classes, but not all of them was UCLASSes, so I had to fixed that manually.
4. "Add Code To Project..." functionality was not invalidating UBT makefiles, which lead to omitting new source files during hot-reloading (even thought it was reporting a success). This change also should improve a bit performance, cause right now there is no "gathering" step -- there is only invalidate step which is a lot quicker.
5. Fixed "Selected Class Source" link to source class in Slate Widget and Slate Widget Style class.

#codereview Robert.Manuszewski

[CL 2481488 by Jaroslaw Palczynski in Main branch]
2015-03-17 09:34:18 -04:00