Commit Graph

1980 Commits

Author SHA1 Message Date
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
Marc Audy
55aa743ad5 Buildwatcher - Fix shadow variables
#codereview Justin.Sargent, John.Abercrombie

[CL 2593659 by Marc Audy in Main branch]
2015-06-19 12:01:28 -04:00
Nick Darnell
d287c6143f More Gamma Correction - Didn't catch this on the previous pass, apparently there was an implicit constructor allowing FLinearColor to FColor that was doing pow(2.2) gamma conversion inversion. Rather than leave the implicit constructor, I'm making it private and making people use ToFColor(true). Which is slightly more expensive, but performs the proper sRGB conversion. While fixing this, I found several terrible uses of the implicit constructor, when Hashing FLinearColors we were converting them to FColors first, when clearing FCanvas we were manually gamma correcting but leaving it as an FLinearColor, then implicitly converting to FColor, double gamma corrrecting. Neither of which should even be required as the RHI Clear command expects an FLinearColor. Additionally fixing a myriad of Slate widgets that were all doing FColor conversions needlessly only to convert back to FLinearColor when queuing slate draw commands.
#codereview nick.penwarden, martin.mittring, andrew.brown, gareth.martin

[CL 2593605 by Nick Darnell in Main branch]
2015-06-19 11:17:11 -04:00
Antony Carter
ecbf64c7a2 Merging
//depot/UE4-Fortnite/Engine/Source/Developer/FriendsAndChat/Private/FriendsAndChatManager.cpp

to //depot/UE4/Engine/Source/Developer/FriendsAndChat/Private/Layers/DataAccess/FriendsAndChatManager.cpp

[CL 2593565 by Antony Carter in Main branch]
2015-06-19 10:58: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
Jamie Dale
b36a494aeb Added support for nested collections
UETOOL-332 - Collections 2.0
UETOOL-369 - Want nested collections with collapsing

We now have version 2 collections which maintain a persistent GUID for each collection. Existing collections will be lazily updated to this version when they need to be re-saved.

This GUID is used by child collections to keep track their parents, and the collections view (as well as the quick asset management) now show a tree of collections. Collections in the main collection view tree can be re-parented via drag and drop.

Performing Content Browser searches against a given collection will also test to see if an object exists in child collections, and the asset view will now show you folder entries for child collections when viewing a parent (if folders are enabled in your Content Browser view settings).

[CL 2593321 by Jamie Dale in Main branch]
2015-06-19 07:33:02 -04:00
Mieszko Zielinski
4b7cafa8af Fixed FunctionalTestingManager multi-registering for PIE End notification #UE4
While at it added instant-finish tests handling

[CL 2593297 by Mieszko Zielinski in Main branch]
2015-06-19 06:39:41 -04:00
Jaroslaw Surowiec
c572e90e90 CrashReport - Better callstacks for crashes in runnable threads
[CL 2593278 by Jaroslaw Surowiec in Main branch]
2015-06-19 06:00:12 -04:00
Dmitry Rekman
93818641c7 SlateFileDialogs: updated from 6/17 code drop.
- Uses separate style and not Core.
- A new button to create the directory.

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

[CL 2592945 by Dmitry Rekman in Main branch]
2015-06-18 19:27:23 -04:00
Rolando Caloca
8b34bd48af UE4 - Fix Precision output for ES platforms
#codereview Dmitry.Rekman, Michael.Trepka, Chris.Babcock

[CL 2592355 by Rolando Caloca in Main branch]
2015-06-18 14:24:11 -04:00
Max Chen
a7939e2040 Sequencer: Camera locked to viewport now gets keyframes when moved.
[CL 2592274 by Max Chen in Main branch]
2015-06-18 13:56:38 -04:00
Antony Carter
9c4cdb17a5 Merging
//depot/UE4-Fortnite/Engine/Source/Developer/FriendsAndChat/Private/FriendsAndChatManager.cpp

to D:\\Perforce\\Epic\\UE4\\Engine\\Source\\Developer\\FriendsAndChat\\Private\\Layers\\DataAccess\\FriendsAndChatManager.cpp

[CL 2592085 by Antony Carter in Main branch]
2015-06-18 11:51:12 -04:00
Jurre DeBaare
b83b0dc15c ADDED GeometryCache files
ADDED Support for importing GeometryCache assets from Alembic files
ADDED CalculateRawMeshTangets function that only calculates the tangents without building the RawMesh

[CL 2591762 by Jurre DeBaare in Main branch]
2015-06-18 06:59:14 -04:00
Nicholas Davies
1995ebcbd3 [INTEGRATE] merge UE4-LauncherDev > UE4
Friends & Chat changes up to 2588351

[CL 2591733 by Nicholas Davies in Main branch]
2015-06-18 06:37:43 -04:00
Dmitry Rekman
589cd3c091 SlateFileDialogs: fix improper concatenation (UE-17255).
- Authored by Matthew.Lewis.

#codereview Matthew.Lewis

[CL 2591016 by Dmitry Rekman in Main branch]
2015-06-17 17:42:08 -04:00
David Ratti
a9094cf63e [AUTOMERGE]
Add friendly reminder to Editor Preferences -> Set As Default messages that checking in the default editor settings file will affect other developers. Meant  to help prevent accidental stomping of other people's settings.

--------
Integrated using branch UE4-To-UE4-Orion (reversed) of change#2492063 by Dan.Youhon on 2015/03/26 10:35:55.

[CL 2590872 by David Ratti in Main branch]
2015-06-17 16:28:15 -04:00
David Ratti
3920f8da3c [AUTOMERGE]
Increase limit on maximum size of index buffer sections to cache optimize
#codereview Brian.Karis

--------
Integrated using branch UE4-To-UE4-Orion (reversed) of change#2548128 by Marcus.Wassmer on 2015/05/12 18:35:46.

[CL 2590837 by David Ratti in Main branch]
2015-06-17 16:14:57 -04:00
Matt Kuhlenschmidt
5c18949db7 Fix typo
[CL 2590444 by Matt Kuhlenschmidt in Main branch]
2015-06-17 13:40:18 -04:00
Chris Babcock
b6df0fec88 Android x86_64 support - pr #914 (also adds support for ndk-r10e clang 3.6)
#ue-11650
#ue4
#android
#codereview Josh.Adams

[CL 2590354 by Chris Babcock in Main branch]
2015-06-17 12:56:56 -04:00
Chris Bunner
8ff51ce5f7 Use previously imported/calculated tangents as initial value during skeletal fbx import smoothing step (better matches static behaviour). UE-16898
[CL 2590014 by Chris Bunner in Main branch]
2015-06-17 09:50:07 -04:00
Jaroslaw Surowiec
e055519b12 CrashReport - UE-17082/Project debug symbols are no longer included in crash reporter callstacks
[CL 2589892 by Jaroslaw Surowiec in Main branch]
2015-06-17 06:47:31 -04:00
Mieszko Zielinski
73eba3be6d Made FunctionalTest::LogMessage put the message to Message Log as well #UE4
Used to log stuff into vlog alone
UE-17169

[CL 2589824 by Mieszko Zielinski in Main branch]
2015-06-17 05:09:01 -04:00
Rolando Caloca
18a2547b25 UE4 - Remove opengl precision modifiers from non-es platforms
[CL 2589093 by Rolando Caloca in Main branch]
2015-06-16 14:56:48 -04:00