Lina Halper
0d91c29a77
Merging
...
//depot/UE4-Orion/Engine/Source/Runtime/Engine/Private/Animation/AnimMontage.cpp
to //depot/UE4/Engine/Source/Runtime/Engine/Private/Animation/AnimMontage.cpp
#lockdown : Ben.Marsh
Talked to Marc Auidy w.r.t. merging this change to Fortnite
[CL 2721274 by Lina Halper in Main branch]
2015-10-08 10:06:46 -04:00
Keli Hlodversson
b9398c898e
WebBrowser: Set CEF log file path explicitly to a path under GameLogDir, as by default it is placed next to the executable.
...
OPP-3920: Chromium integration creates log file next to UnrealCEFSubProcess.exe
Merging CL#2717950 using UE4-To-UE4-LauncherDev
#lockdown ben.marsh
[CL 2720344 by Keli Hlodversson in Main branch]
2015-10-07 18:26:00 -04:00
Keli Hlodversson
92911b2b29
WebBrowser: Automatically reload the current page if render subprocess is killed or crashes.
...
OPP-4409
Merging CL#2717757 using UE4-To-UE4-LauncherDev
#lockdown ben.marsh
[CL 2720332 by Keli Hlodversson in Main branch]
2015-10-07 18:22:36 -04:00
Marc Audy
02cba58cb2
Merge build fixes back from //UE4/Main to //depot/UE4
...
#lockdown Ben.Marsh
#platformnotify Josh.Adams
[CL 2720261 by Marc Audy in Main branch]
2015-10-07 17:46:58 -04:00
Marc Audy
6183efcc36
Integrate Engine/Config, Engine/Plugins, Engine/Programs, Engine/Shaders and remaining Engine/Source from UE4-Orion to UE4 at CL# 2716634
...
#lockdown Ben.Marsh
#platformnotify Josh.Adams
[CL 2718314 by Marc Audy in Main branch]
2015-10-06 16:47:09 -04:00
Marc Audy
e5bb9b4d0d
Integrate all non-branch Engine/Source changes from //depot/UE4-Orion to //depot/UE4
...
#lockdown Ben.Marsh
#platformnotify Josh.Adams
[CL 2718236 by Marc Audy in Main branch]
2015-10-06 15:59:09 -04:00
Aaron McLeran
679aa4eac1
Merging CL 2715246 and 2715172 from UE4-Orion to UE4-Main
...
[CL 2715285 by Aaron McLeran in Main branch]
2015-10-02 18:05:52 -04:00
Michael Trepka
a73e7fff11
Fix for Mac window activation
...
#jira OPP-4374
[CL 2715228 by Michael Trepka in Main branch]
2015-10-02 17:35:37 -04:00
John Pollard
1f4bf3a202
#merge: Null checks
...
[CL 2715192 by John Pollard in Main branch]
2015-10-02 17:12:25 -04:00
Lina Halper
46b0d42de0
Fix compile error.
...
#code.review : Marc.Audy
[CL 2715182 by Lina Halper in Main branch]
2015-10-02 17:08:15 -04:00
Dmitry Rekman
0e9ad63878
Linux: cache thread id in monolithic builds only.
...
- Alleviates static TLS usage. Proper way to solve is to cache in TLS dynamically.
[CL 2715149 by Dmitry Rekman in Main branch]
2015-10-02 16:59:47 -04:00
Ori Cohen
2f787b5916
Unshelved from pending changelist '2683851':
...
Fix point wind source setting incorrect weight
[CL 2715107 by Ori Cohen in Main branch]
2015-10-02 16:34:14 -04:00
Sam Zamani
51c5237e7b
[AUTOMERGE]
...
#online,identity,mcp
- Added account creation APIs
- primarily used for creating "headless" account
- can provide external auth credentials to associate with an external account at creation time
--------
Integrated using branch UE4-Orion-To-UE4 of change#2709388 by Sam.Zamani on 2015/09/29 10:23:30.
[CL 2715046 by Sam Zamani in Main branch]
2015-10-02 16:03:10 -04:00
Sam Zamani
0e251eb6ce
[AUTOMERGE]
...
#online,mcp,json
- json serializer better handling of inline objects
--------
Integrated using branch UE4-Orion-To-UE4 of change#2704481 by Sam.Zamani on 2015/09/24 11:05:31.
[CL 2715041 by Sam Zamani in Main branch]
2015-10-02 16:01:10 -04:00
Daniel Wright
5807db0207
Integrate - Two new translucency lighting modes that fetch lighting from the volume textures per-vertex and interpolate them to the pixel shader.
...
[CL 2714997 by Daniel Wright in Main branch]
2015-10-02 15:44:29 -04:00
Daniel Wright
b7debff48d
Integrate - The static shadow depth map used to shadow translucency from Stationary lights is now saved properly during a blueprint construction script
...
[CL 2714995 by Daniel Wright in Main branch]
2015-10-02 15:43:59 -04:00
Daniel Wright
4b91fb016c
Integrate - Material inputs are now greyed based on translucency lighting mode
...
[CL 2714993 by Daniel Wright in Main branch]
2015-10-02 15:43:45 -04:00
Max Chen
3eef8ede2f
Sequencer: Add IMovieScenePlayer to RestoreState and SaveState and ensure that master tracks are also stored and restored. This fixes the fade track so that it restores the fade when closing out.
...
#jira UE-21746
[CL 2714960 by Max Chen in Main branch]
2015-10-02 15:27:58 -04:00
Peter Sauerbrei
33c786b48a
Merging PR-1578 from 4.10
...
[CL 2714901 by Peter Sauerbrei in Main branch]
2015-10-02 14:52:00 -04:00
Lina Halper
9d8325e687
Support Base LOD for simplygon ops
...
Merging
//depot/UE4-Orion/Engine/Source/...
to //depot/UE4/Engine/Source/...
[CL 2714866 by Lina Halper in Main branch]
2015-10-02 14:40:40 -04:00
Lina Halper
b7bb87c947
Added rebuilding index buffer for static LOD model
...
Merging
//depot/UE4-Orion/Engine/Source/...
to //depot/UE4/Engine/Source/...
[CL 2714862 by Lina Halper in Main branch]
2015-10-02 14:40:00 -04:00
Lina Halper
71f5e9a732
Added nan for noninitialized transform
...
Merging
//depot/UE4-Orion/Engine/Source/Runtime/Core/Public/Math/...
to //depot/UE4/Engine/Source/Runtime/Core/Public/Math/...
[CL 2714856 by Lina Halper in Main branch]
2015-10-02 14:38:40 -04:00
Lina Halper
3d647b773b
Fix resave message
...
CL 2710016
[CL 2714851 by Lina Halper in Main branch]
2015-10-02 14:37:17 -04:00
Peter Sauerbrei
80b99fb67f
Merging mobile provision selection from 4.10
...
[CL 2714831 by Peter Sauerbrei in Main branch]
2015-10-02 14:24:38 -04:00
Zak Middleton
fe9df75708
#ue4 - Add ability to match by channel displayname in Collision.ListProfilesWithResponseToChannel
...
--------
[AUTOMERGE] Integrated using branch ue4-orion-to-ue4 of change#2714809 by Zak.Middleton on 2015/10/02 14:16:13.
[CL 2714815
2015-10-02 14:17:06 -04:00
