Commit Graph

39 Commits

Author SHA1 Message Date
Matt Kuhlenschmidt
cb140c07dc Merged GitHub pull request #202 to main.
refactored tga code to allows use outside of EditorFactories.cpp
added support for grayscale jpeg
fix memory leak in jpeg code
changes in AssetTools to allow to specify precise factory when multiple factories support the same filetype
changes in Plugin.cs to allow binary only plugins
exposed parts of engine API to other modules

[CL 2108453 by Matt Kuhlenschmidt in Main branch]
2014-06-17 16:16:40 -04:00
Mark Satterthwaite
3ef0bac6a7 Track and reset the key window when using the OS X open/save dialog otherwise it will steal focus and not return it.
#codereview michael.trepka

[CL 2104618 by Mark Satterthwaite in Main branch]
2014-06-13 11:09:48 -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
Jamie Dale
442cef0469 Fix Android flavor UAT commands
They need to specify -targetplatform=android as well as the -cookflavor

ReviewedBy Daniel.Lamb

[CL 2102054 by Jamie Dale in Main branch]
2014-06-11 13:24:14 -04:00
Ben Marsh
bbb50ed66f Prevent log spam when scanning for projects from the project browser, and .uproject files have missing or empty EngineAssociation entries.
[CL 2100376 by Ben Marsh in Main branch]
2014-06-10 10:27:47 -04:00
Dmitry Rekman
bee33dee86 Linux: add (stubbed) DesktopPlatform class.
Part of PR 140 (with mods), contributed by sbc100 and #ue4linux community.

#codereview Jamie.Dale

[CL 2096282 by Dmitry Rekman in Main branch]
2014-06-05 17:01:39 -04:00
Ben Marsh
980c593f55 Fix paths search for projects. FindFiles does not return names including the search path stem.
#codereview Nicholas.Davies

[CL 2095994 by Ben Marsh in Main branch]
2014-06-05 16:39:57 -04:00
Jamie Dale
0cfe5f0651 Added PlatformInfo to DesktopPlatform and improved the editors Supported Platform UI
TTP# 337136 - SETTINGS: Target Platform settings polish
TTP# 337652 - EDITOR: Limit Project supported Android icons down to 1
TTP# 337650 - EDITOR: There is only 1 icon for Apple for Project Supported Platforms

DesktopPlatform now contains a static array of FPlatformInfo. This can be used to query UE4 about its available platforms, even when they're not available as a target platform.

FPlatformInfo contains the information required by the editor (such as a localized display name and icon), as well as whether a platform is a variation ("flavor") of another, and if so, whether the flavor affects the build output (eg, Win32 or Win64), or the cook output (eg, Android_XYZ). This lets the editor build up nested menus for the "Package Project" and "Cook Project" options, rather than just showing everything as a flat list.

ReviewedBy Thomas.Sarkanen, Max.Preussner

[CL 2095796 by Jamie Dale in Main branch]
2014-06-05 12:13:44 -04:00
Ben Marsh
2778867d5c Add a utility function for getting an engine's description from its identifier.
[CL 2095104 by Ben Marsh in Main branch]
2014-06-04 19:07:11 -04:00
Ben Marsh
034f01c732 Add a single codepath to enumerate projects for an engine installation, which can be shared with the launcher.
#codereview Nicholas.Davies

[CL 2095028 by Ben Marsh in Main branch]
2014-06-04 18:06:57 -04:00
Ben Marsh
89668b5397 [INTEGRATE] Everything from 4.2 branch back into main.
[CL 2088526 by Ben Marsh in Main branch]
2014-05-29 17:45:17 -04:00
Ben Marsh
7aa5f3825c Move the feedback context window to the front when it's first displayed.
[CL 2077835 by Ben Marsh in Main branch]
2014-05-19 13:08:20 -04:00
Ben Marsh
bf6db427fe Fix generating project files for non-foreign projects.
[CL 2077834 by Ben Marsh in Main branch]
2014-05-19 13:08:08 -04:00
Ben Marsh
4cc9c102b6 Change detection of default engine for projects; just look for any valid engine directory up the hierarchy.
[CL 2074365 by Ben Marsh in Main branch]
2014-05-15 13:07:56 -04:00
Ben Marsh
25264358fd Fix updates not writing out to the log in FWindowsNativeFeedbackContext.
[CL 2073609 by Ben Marsh in Main branch]
2014-05-14 19:56:42 -04:00
Ben Marsh
39ddb49221 Clean binaries and intermediates before upgrading projects. Prevents stale build products, and allows detecting missing binaries on startup.
[CL 2073589 by Ben Marsh in Main branch]
2014-05-14 19:11:30 -04:00
Ben Marsh
b4d4fe3f07 Add a Mac FFeedbackContext which shows the log window during slow tasks. Windows version displays a nice status message and progress bar, but this will do for now. Will be used to recompile out-of-date binaries on startup.
#codereview Michael.Trepka

[CL 2073573 by Ben Marsh in Main branch]
2014-05-14 18:56:27 -04:00
Ben Marsh
9154520358 CIS fix for Win32.
[CL 2073374 by Ben Marsh in Main branch]
2014-05-14 16:20:51 -04:00
Ben Marsh
661056258e Don't re-read launcher installation list if the timestamp hasn't changed.
[CL 2073301 by Ben Marsh in Main branch]
2014-05-14 15:20:39 -04:00
Ben Marsh
45ebc11eb9 Add native feedback context for Windows, and use it to display project file generation progress in UnrealVersionSelector. Also generate project files when switching versions.
[CL 2073201 by Ben Marsh in Main branch]
2014-05-14 14:53:19 -04:00
Ben Marsh
5b0771bf78 Improve project discovery in the project browser.
- All projects referenced by .uprojectdirs are included, rather than using a separate hard-coded list of paths.
- Samples installed by the launcher are included.

[CL 2072300 by Ben Marsh in Main branch]
2014-05-13 19:34:00 -04:00
Ben Marsh
6251d1c57e Change project 'upgrades' to be based on the format of the project file and nothing to do with engine version or association, and allow the UpdateGameProject commandlet to always write latest version information to the file.
[CL 2072245 by Ben Marsh in Main branch]
2014-05-13 18:23:53 -04:00
Michael Trepka
13d3f5bac7 Implemented FDesktopPlatformMac::RegisterEngineInstallation()
#codereview Ben.Marsh

[CL 2071541 by Michael Trepka in Main branch]
2014-05-13 10:10:18 -04:00
Jamie Dale
8df82f10d1 Fixed UnrealVersionSelector failing to add UE4 installation paths
FDesktopPlatformWindows::RegisterEngineInstallation was checking that creating the registry key had failed (rather than succeeded) before trying to add the value to the key.

ReviewedBy Ben.Marsh

[CL 2070177 by Jamie Dale in Main branch]
2014-05-12 08:39:57 -04:00
Ben Marsh
7c98d27edb Add engine support for the launcher installation list rather than manually parsing manifests.
#codereview Leigh.Swift, Michael.Trepka

[CL 2066876 by Ben Marsh in Main branch]
2014-05-08 08:20:34 -04:00