Commit Graph

1953 Commits

Author SHA1 Message Date
Matt Kuhlenschmidt
375a2f18a6 Added support for materials to be used on Slate based fonts.
[CL 2588529 by Matt Kuhlenschmidt in Main branch]
2015-06-16 09:30:13 -04:00
Jamie Dale
44ba3d1815 Fixed some issues using collections with SVN or Git as your SCC provider
UE-17109 - Collections cannot be created when using SVN as your SCC provider

The collection was trying to add itself to source control before the file had been created. Perforce allows this, but SVN and Git do not.

Additionally, SVN was trying to recursively commit any added parent folders when committing a file within those folders (required to avoid the commit operation failing), however that was failing to get the current SVN status of anything but the most immediate parent folder, causing the recusive check to fail.

[CL 2588523 by Jamie Dale in Main branch]
2015-06-16 09:25:36 -04:00
Mieszko Zielinski
67bf486145 Updated Gameplay Tasks's unit tests category #UE4
Now in System.Engine.AI

[CL 2588370 by Mieszko Zielinski in Main branch]
2015-06-16 05:32:28 -04:00
Nicholas Davies
26fce7ca58 [INTEGRATE] merge UE4-LauncherDev > UE4 CL 2588345
#jira n/a
Fix Friends appearing as offline in chat window. View Model was not getting returned.

[CL 2588351 by Nicholas Davies in Main branch]
2015-06-16 05:02:36 -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
Josh Adams
73dd6e7cd3 - Added the non-POT error texture to Android when using PVRTC [UE-8923]
[CL 2587930 by Josh Adams in Main branch]
2015-06-15 17:48:18 -04:00
Josh Adams
a5e6d4f1eb - Handling non-power of two errors in the cooker with an "error texture" with a message of what to do to the texture [UE-8923]
[CL 2587756 by Josh Adams in Main branch]
2015-06-15 15:39:57 -04:00
Antony Carter
d463111320 Merging
//depot/UE4-LauncherDev/Engine/Source/Developer/FriendsAndChat/Private/Layers/UI/SChatWindow.cpp

to D:\\Perforce\\Epic\\UE4\\Engine\\Source\\Developer\\FriendsAndChat\\Private\\Layers\\UI\\SChatWindow.cpp

[CL 2587628 by Antony Carter in Main branch]
2015-06-15 14:10:37 -04:00
Dmitry Rekman
f3d947f929 Fix clang error; unclear if properly.
#codereview Antony.Carter

(Merging CL 2587348 from LauncherDev to main).

[CL 2587355 by Dmitry Rekman in Main branch]
2015-06-15 10:43:39 -04:00
Matt Kuhlenschmidt
c62dc3001a Added an option to not use MikkTSpace for tangent generation on import.
[CL 2587313 by Matt Kuhlenschmidt in Main branch]
2015-06-15 09:55:18 -04:00
Dmitry Rekman
e8be8d38d2 OpenGL: fix StandaloneRenderer on Linux and Mac.
#codereview Nick.Darnell

[CL 2586633 by Dmitry Rekman in Main branch]
2015-06-12 19:13:24 -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
Dmitry Rekman
04756a16ca Linux: larger limits for absolute DDC paths.
#codereview Bob.Tellez, Josh.Adams, Robert.Manuszewski

[CL 2586047 by Dmitry Rekman in Main branch]
2015-06-12 14:05:08 -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 Rodham
ac6ad9ec5c Sequencer improvements:
- Reworked UI hierarchy to better afford input on its constituent panels
 - Added scroll-zoom/pan support to the track area and curve editor (using CTRL and SHIFT mouse wheel modifiers)
 - View range no longer zooms when changing the size of the sequencer window

[CL 2585565 by Andrew Rodham in Main branch]
2015-06-12 08:55:27 -04:00
Dmitry Rekman
818c607842 SlateViewer: fix compilation on Linux.
- Still broken in runtime.

#codereview Justin.Sargent

[CL 2585300 by Dmitry Rekman in Main branch]
2015-06-11 22:35:23 -04:00
Frank Fella
59dbef1cee Sequencer - Fix shadowed variable warnings.
[CL 2585004 by Frank Fella in Main branch]
2015-06-11 17:40:27 -04:00
Joe Graf
81c2b7efcd Changed the UDeveloperSettings auto discovery to ignore all abstract classes instead of just specifically UDeveloperSettings so that shared base classes don't generate blank spots in the settings list
#CodeReview nick.darnell, michael.noland

[CL 2584999 by Joe Graf in Main branch]
2015-06-11 17:35:28 -04:00
John Abercrombie
0bacc967eb Merging using UE4-Fortnite-To-UE4 @ CL 2578109
[CL 2584863 by John Abercrombie in Main branch]
2015-06-11 16:25:03 -04:00
Sam Zamani
da111fcc2d Merging using UE4-To-UE4-LauncherDev
2584013 #friends+chat, analytics
- fix for not sending private chat counts

2584233 #friends+chat
- fix for analytics events not being flushed on shutdown
- fix for analytics events not being sent due to nullptr provider

[CL 2584258 by Sam Zamani in Main branch]
2015-06-11 11:03:29 -04:00
Marc Audy
a916b98145 Put back the bAutoActivates = true. While most are unnecessary, working out the fallout from a fairly cosmetic change isn't worth it.
[CL 2584181 by Marc Audy in Main branch]
2015-06-11 10:20:48 -04:00
sebastian kowalczyk
ac74f84d72 Bunch of fixes to have better control over Visual Logger tool with keyboard.
[CL 2584112 by sebastian kowalczyk in Main branch]
2015-06-11 09:51:31 -04:00
Matt Kuhlenschmidt
e45a27eb40 Guard against source control crashes if a provider becomes null
[CL 2584035 by Matt Kuhlenschmidt in Main branch]
2015-06-11 08:24:31 -04:00
Nicholas Davies
577a014497 [INTEGRATE] merge UE4-LauncherDev > UE4 CL 2583896
#jira OPP-3108 Add autocomplete and hinting
Remove set chat tips when we remove slash markup

[CL 2583904 by Nicholas Davies in Main branch]
2015-06-11 04:33:40 -04:00
Nicholas Davies
0cdf7e4512 Fix Linux Mono build - remove unused expression result
[CL 2583881 by Nicholas Davies in Main branch]
2015-06-11 04:02:10 -04:00