Commit Graph

2268 Commits

Author SHA1 Message Date
sebastian kowalczyk
283672f9db Fixes for monolitic build.
[CL 2671050 by sebastian kowalczyk in Main branch]
2015-08-27 11:56:42 -04:00
Mark Satterthwaite
977542aeaa Merging general rendering & shader changes necessary to support desktop Metal.
reviewedby michael.trepka, rolando.caloca, lee.clark

[CL 2670859 by Mark Satterthwaite in Main branch]
2015-08-27 10:11:22 -04:00
Terence Burns
ad39e2d2e3 Fix for Shadow variable issue in LogVisualizer.
#CodeReview Sebastian.Kowalczyk

[CL 2670775 by Terence Burns in Main branch]
2015-08-27 08:50:21 -04:00
Terence Burns
7b04942a21 Fixing compiler issues in LogVisualizer.
#CodeReview Sebastian.Kowalczyk

[CL 2670766 by Terence Burns in Main branch]
2015-08-27 08:43:39 -04:00
sebastian kowalczyk
18a03fec98 CIS compilation fix.
[CL 2670751 by sebastian kowalczyk in Main branch]
2015-08-27 07:56:40 -04:00
sebastian kowalczyk
744de33fbd Next CIS compilation fix.
[CL 2670735 by sebastian kowalczyk in Main branch]
2015-08-27 06:48:49 -04:00
sebastian kowalczyk
e62ab9a730 Fixed CIS compilation for OSX.
[CL 2670728 by sebastian kowalczyk in Main branch]
2015-08-27 06:24:01 -04:00
sebastian kowalczyk
49aba11ae5 Optimizations to Visual Logger edytor tool:
Much faster filters due to Async framework, it's paraller now,
Optimizations to items rendered on sequencer,
Optimization to graphs rendered on canvas,
Changed as much as possible to event driven flot, to update data only when needed.

[CL 2670708 by sebastian kowalczyk in Main branch]
2015-08-27 05:21:28 -04:00
Chris Bunner
b3f5ba6c51 Merging back (experimental) tangent import work and fixes: 2649527, 2649599, 2652924, 2660845.
[CL 2670704 by Chris Bunner in Main branch]
2015-08-27 05:14:48 -04:00
Martin Mittring
fbd0e9c4ab added comments
[CL 2670167 by Martin Mittring in Main branch]
2015-08-26 18:13:37 -04:00
Nicholas Davies
6d5204739c [INTEGRATE] merge UE4-Fortnite > UE4 Friends and Chat fixes CL 2669144
[CL 2669162 by Nicholas Davies in Main branch]
2015-08-26 09:40:36 -04:00
Nicholas Davies
0fa0f95961 Fix build issues caused by changes to F&C Navigation service
[INTEGRATE] merge UE4-Fortnite > UE4 Friends and Chat fixes CL 2669072
#codereview Antony.Carter

[CL 2669076 by Nicholas Davies in Main branch]
2015-08-26 07:34:40 -04:00
Allan Bentham
e4a5934305 Fix FOpenGLCodeHeader serialisation for android. (where TCHAR == 4 bytes)
#codereview Mark.Satterthwaite

[CL 2669028 by Allan Bentham in Main branch]
2015-08-26 06:02:24 -04:00
Nicholas Davies
dfa2b36020 [INTEGRATE] merge UE4-Fortnite > UE4 CL up to 2667454
[CL 2669000 by Nicholas Davies in Main branch]
2015-08-26 05:34:10 -04:00
Antony Carter
bfabb38a75 Merging 2665897, 2667359, 2667826
//depot/UE4-LauncherDev/...

to //depot/UE4/...

[CL 2667846 by Antony Carter in Main branch]
2015-08-25 13:02:04 -04:00
Richard TalbotWatkin
7f95c9e26a Added toast prompt when making changes to language settings which require restart.
#jira UE-20120 - No toast prompt for restarting after language change

[CL 2667823 by Richard TalbotWatkin in Main branch]
2015-08-25 12:53:36 -04:00
Peter Sauerbrei
f0b94ddbec properly utilize the same editor as running in for cooking
UE-20061

[CL 2666816 by Peter Sauerbrei in Main branch]
2015-08-24 17:43:34 -04:00
Dan Oconnor
a31af70c57 Details customizations re-enabled for the diff (and merge) tool. Now relying on the list of displayed properties from the details view when performing a CDO diff. This allows us to display changes to reference member variables.
#jira UE-19958

[CL 2666619 by Dan Oconnor in Main branch]
2015-08-24 16:25:51 -04:00
umerov1999
28457c2218 PR #1492: Update PngImageWrapper.cpp (Contributed by umerov1999)
[CL 2666216 by Matt Kuhlenschmidt in Main branch]
2015-08-24 12:45:12 -04:00
Jurre deBaare
7b53973202 UE-19601 HLOD : Set up better default setting whenever adding new element
UE-18498 HLOD: Add functionality for choosing appropriate LOD from source StaticMesh when creating HLOD meshes
Fix for empty LOD actor not getting removed
Added context menu entry to remove SMA node from cluster and exclude from cluster generation in the future (setting the Auto LODGeneration flag on the actor to true)
Added feedback to Outliner when a Cluster contains less actors than the value of ôMin Number of Actors to buildö for the HLOD level it is in
Added option to create HLOD volume containing the selected clusters actors, for persistent changes in clustering generation
Added experimental slider for forcing the view Hierarchical LOD level

[CL 2665844 by Jurre deBaare in Main branch]
2015-08-24 06:21:05 -04:00
Mark Satterthwaite
027c88145a Remove the r.Shaders.AvoidFlowControl CVar introduced in 2662625 - setting this by default was causing problems on various platforms and it isn't sufficiently useful to retain. Instead just force the Mac OpenGL shader platform to retain flow-control statements and let everything else use the default as before 2662625.
[CL 2665840 by Mark Satterthwaite in Main branch]
2015-08-24 06:10:23 -04:00
Dmitry Rekman
a9221dfcb5 Matching LOCTEXT_NAMESPACE #def/#undef
- Also changed some #undef's to be more uniform

[CL 2665419 by Dmitry Rekman in Main branch]
2015-08-23 00:57:30 -04:00
Mike Beach
9561cf441a Switching the automation commandline exec to use GLog as its OutputDevice to prevent a crash when it is used later (as the command executes over multiple frames).
#codereview Justin.Hair, Jason.Bestimt, Ben.Salem

[CL 2664682 by Mike Beach in Main branch]
2015-08-21 13:53:18 -04:00
Maciej Mroz
fb4eac5733 UEBP-40 C++ code generation (WIP):
- Get Class Defaults is handled

[CL 2664426 by Maciej Mroz in Main branch]
2015-08-21 10:56:21 -04:00
Maciej Mroz
7979693c02 Early version of redirecting system for "Blueprints converted to C++".
It's supposed to be used while cooking to fix references to objects (BPGC, UDS, UDE), that where converted into a native code.
Converted items have "ReplaceConverted" meta data generated. The MD stores original object path (and all it's redirected paths).

#codereview Nick.Whiting, Mike.Beach, Robert.Manuszewski

[CL 2664247 by Maciej Mroz in Main branch]
2015-08-21 07:19:34 -04:00