Commit Graph

160 Commits

Author SHA1 Message Date
Josh Adams
4eb7f7aaf1 - Removed AllDesktop from the "SupportedPlatforms" dialog [UE-18907]
[CL 2646985 by Josh Adams in Main branch]
2015-08-06 16:43:26 -04:00
Bart Bressler
5315f3f637 Build fix
#codereview justin.sargent

[CL 2643924 by Bart Bressler in Main branch]
2015-08-04 15:31:33 -04:00
Justin Sargent
a76b7cc9dc Updated code that checks for the launcher's existence, opens it and issues navigation commands to use Uri's.
#platformnotify Josh.Adams

[CL 2643701 by Justin Sargent in Main branch]
2015-08-04 14:03:25 -04:00
Michael Trepka
9b346b6d19 Check for com.epicgames.EpicGamesLauncher bundle identifier when detecting if the Mac launcher is already running.
[CL 2640284 by Michael Trepka in Main branch]
2015-07-31 10:13:42 -04:00
Michael Trepka
8f7b1394ed UE4EditorServices fixes:
- Fixed a mismatch in engine ID GUID formatting between ID stored in uproject file and engine installation ini on Mac
- Added an error message when user tries to generate Xcode project for blueprint-only project
- Updated version number to 1.7

[CL 2635970 by Michael Trepka in Main branch]
2015-07-28 16:24:16 -04:00
Ben Marsh
a5f534451b Remove the ENGINE_VERSION define from Version.h and ObjectVersion.cpp; it's superceded by GEngineVersion. EngineVersion.cpp now defines the constants GEngineVersionChangelist and GCompatibleWithEngineVersionChangelist, which are used to construct GEngineVersion and GCompatibleWithEngineVersion. Modifying those constants allows updating the engine version separately to the defines used for resource files (allowing UGS to update the version number without triggering all files to be relinked).
[CL 2625344 by Ben Marsh in Main branch]
2015-07-18 16:57:53 -04:00
yaakuro
1c630d59b1 Add CodeLite support (on Linux) - UE-18561, UE-18564.
- Includes PR #1378 and #1379 (both contributed by yaakuro)
  * Adds CodeLite project generator to UBT (can be invoked on all platforms).
  * Adds CodeLite source accessor plugin (whitelisted for Linux only).
  * Desktop platform/game project generation switched to use .workspace on Linux.
- Minor cleanup (do not recompile UAT and its modules when generating Linux projects).

#codereview Josh.Adams, Robert.Manuszewski, Mike.Fricker

[CL 2621060 by Dmitry Rekman in Main branch]
2015-07-14 18:17:55 -04:00
Ben Marsh
9be95b3c51 Add a function to IDesktopPlatform to query the version of an engine (either from the new JSON build.version file, or from Version.h if that fails). Make UE4Build.cs update it during builds.
[CL 2617067 by Ben Marsh in Main branch]
2015-07-10 15:21:32 -04:00
Ben Marsh
e330a9b065 Coding standards fixes.
[CL 2615375 by Ben Marsh in Main branch]
2015-07-09 13:54:46 -04:00
Ben Marsh
b4e25c6613 Fix hot reload not working correctly with UnrealGameSync; having a build changelist does not necessarily mean that the build is promoted any more. Renamed FEngineVersionBase::IsPromotedBuild() to FEngineVersionBase::HasChangelist(), and use FApp::GetEngineIsPromotedBuild() instead.
#codereview Robert.Manuszewski, Bob.Tellez

[CL 2602096 by Ben Marsh in Main branch]
2015-06-26 09:25:56 -04:00
Justin Sargent
39950a8c41 Merging using UE4-To-UE4-LauncherDev
[CL 2593947 by Justin Sargent in Main branch]
2015-06-19 14:22:08 -04:00
Justin Sargent
e9377b4f03 Merging using UE4-To-UE4-LauncherDev
[CL 2593804 by Justin Sargent in Main branch]
2015-06-19 13:26:10 -04:00
Justin Sargent
3facd1a709 Fixed missing logic from bad integrate.
[CL 2593452 by Justin Sargent in Main branch]
2015-06-19 10:12:02 -04:00
Justin Sargent
b6b6ce97c9 Fixing backwards compatibility issues with project and engine handling in DasktopPlatformBase
Merging using UE4-To-UE4-LauncherDev

#codereview Ben.Marsh

[CL 2593420 by Justin Sargent in Main branch]
2015-06-19 09:54:12 -04:00
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