Commit Graph

19 Commits

Author SHA1 Message Date
Carlos Cuello
3d1660ea6d [INTEGRATE] UE4-LauncherRelease->UE4 integrate integrate latest from LauncherReleases, including fixes for various issues that we've released the past month, and the new engine slot and notification systems
[CL 2248562 by Carlos Cuello in Main branch]
2014-08-08 11:33:23 -04:00
Michael Trepka
5bd6255fde More Clang compile warning fixes
[CL 2237347 by Michael Trepka in Main branch]
2014-07-30 14:51:27 -04:00
Carlos Cuello
d2f797b853 [INTEGRATE] Merging using UE4-LauncherReleasesTo-UE4 all up to cl 2111815
[CL 2111984 by Carlos Cuello in Main branch]
2014-06-20 13:37:52 -04:00
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
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
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
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
Ben Marsh
4b37f14c76 Incorporate support for non-foreign project handling into scheme used by UnrealVersionSelector et al, and automatically register engine installations whenever necessary.
Whenever a blank engine association is read from a .uproject via GetEngineIdentifierForProject(), it checks up the directory hierarchy for an engine capable of loading it via its .uprojectdirs search directories. If found, it will use that engine's local identifier from the registry, or register it if it doesn't exist.

Setting a project's engine association to an engine which is capable of loading it via it's .uprojectdirs will cause it to write a blank engine association string into the .uproject (and triggering the behaviour above on open).

#codereview Michael.Trepka

[CL 2064463 by Ben Marsh in Main branch]
2014-05-06 10:27:35 -04:00
Michael Trepka
5d88ab6122 Updated UE4EditorServices binaries and compile fix
[CL 2054391 by Michael Trepka in Main branch]
2014-04-23 20:16:56 -04:00
Michael Trepka
df037b2070 Changed the path for temp project created by UE4EditorServices
[CL 2054390 by Michael Trepka in Main branch]
2014-04-23 20:16:45 -04:00
Max Preussner
c0a2d304b4 fixed UnrealEngineLauncher overwriting local P4 workspace files with files downloaded from the internet if launched through an Editor that was started with -Dev
[CL 2046896 by Max Preussner in Main branch]
2014-04-23 19:02:27 -04:00
Michael Trepka
5b646dd288 New version of UE4EditorServices (Mac tool for opening uproject files etc.)
[CL 2046760 by Michael Trepka in Main branch]
2014-04-23 18:59:02 -04:00
Ben Marsh
5fd0385b6d CIS fix for mac.
[CL 2045899 by Ben Marsh in Main branch]
2014-04-23 18:48:24 -04:00
Ben Marsh
ec684822c3 Updates to version selector.
* Lots of code moved into IDesktopPlatform for sharing with Launcher and Mac (including setting up file associations, querying project versions, etc...)
* Hack to enumerate all the known launcher engine installations. Does not use registry keys any more. Will probably change to use a list of installations generated by the launcher at some point soon.
* List of registered GitHub builds is stored in HKEY_CURRENT_USER
* Switching engine versions is now done through a dialog rather than through the context menu.
* VersionSelector includes a version number for shell integration, allowing it to defer to an existing installation of the same version if necessary.

#codereview Michael.Trepka

[CL 2045845 by Ben Marsh in Main branch]
2014-04-23 18:46:48 -04:00
Ben Marsh
8835780db3 Move functions for querying engine installations from Core to DesktopPlatform.
[CL 2044626 by Ben Marsh in Main branch]
2014-04-23 18:32:52 -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