Commit Graph

2426 Commits

Author SHA1 Message Date
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
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
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
Mike Beach
34f210ab32 CIS fix: Non-Unity compile issue, was using class restricted to the implementation file.
[CL 2714852 by Mike Beach in Main branch]
2015-10-02 14:37:23 -04:00
Justin Sargent
cc4004031c Fixed an issue where we could get a shader compilation error and then continue executing just because the error didn't return a message.
rb: Wes.Fudala
Merging using UE4-To-UE4-LauncherDev

[CL 2714835 by Justin Sargent in Main branch]
2015-10-02 14:24:58 -04:00
Peter Sauerbrei
90d9a81fdf Merging missed file from 4.10
[CL 2714834 by Peter Sauerbrei in Main branch]
2015-10-02 14:24:49 -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
Mike Beach
b0599cdaa7 (WIP) Setting up the code generation backend so we can override the target PCH.
#codereview Maciej.Mroz

[CL 2714692 by Mike Beach in Main branch]
2015-10-02 12:42:26 -04:00
Richard TalbotWatkin
510aac2949 Added a horizontal scrollbar to Message Log list view so that very long lines can be seen in their entirety.
#jira UE-19559 - Text gets cut off in the Message Log

[CL 2714281 by Richard TalbotWatkin in Main branch]
2015-10-02 08:06:29 -04:00
Michael Trepka
d42a73f8bb Properly handle BGRA format in FIcnsImageWrapper
[CL 2713366 by Michael Trepka in Main branch]
2015-10-01 15:06:33 -04:00
Bob Tellez
33d639906e [AUTOMERGE]
#UE4 Hardware survey now calcualtes GPU perf index

#rb Martin.Mittring

#platformnotify josh.adams

--------
Integrated using branch Ue4-To-UE4-Fortnite-Simple (reversed) of change#2711526 by Bob.Tellez on 2015/09/30 14:50:03.

[CL 2712946 by Bob Tellez in Main branch]
2015-10-01 11:30:38 -04:00
Chris Babcock
3e9f98d61c Merging using UE4-To-UE4-Releases-4.10
Generate proper proguard-project.txt file with optional additions from Build/Android/ProguardAdditions.txt
#jira UE-21653
#ue4
#android

[CL 2712042 by Chris Babcock in Main branch]
2015-09-30 18:10:41 -04:00
Maciej Mroz
f98b8e6307 FEmitHelper::GenerateAutomaticCast detects unconverted classes.
[CL 2711152 by Maciej Mroz in Main branch]
2015-09-30 11:18:40 -04:00
Maciej Mroz
1d2d3748a8 #jira UE-21603 Blueprint interfaces not properly being converted into C++
[CL 2711023 by Maciej Mroz in Main branch]
2015-09-30 09:59:17 -04:00
Maciej Mroz
2d2131fd40 BlueprintCompilerCppBackend:
- Huge refectoring - no more Emit. FEmitterLocalContext is used everywhere.
- No more AddHighPriorityLine
- Various minor bugs were fixed.

[CL 2710894 by Maciej Mroz in Main branch]
2015-09-30 06:29:24 -04:00
Jaroslaw Palczynski
c145b6f959 CIS fix for CL2710850 for other platforms.
[CL 2710886 by Jaroslaw Palczynski in Main branch]
2015-09-30 06:20:40 -04:00
Jaroslaw Palczynski
9703d22f63 Major HotReload fix.
[CL 2710850 by Jaroslaw Palczynski in Main branch]
2015-09-30 05:26:51 -04:00
Dmitriy Dyomin
ed69c79ff7 Device output log window, currently implemented only for Android. Hidden under editor experimental settings
#jira UEMOB-39
#codereview Jack.Porter

[CL 2710794 by Dmitriy Dyomin in Main branch]
2015-09-30 03:39:09 -04:00
Jamie Dale
566a5af49e Added support for taking widget snapshots from remote targets (Epic Friday)
This utilizes the message bus to allow you to take widget snapshots from any remote target that hosts the WidgetSnapshotService.

[CL 2709439 by Jamie Dale in Main branch]
2015-09-29 10:47:38 -04:00
Maciej Mroz
897ce3a214 BlueprintCompilerCppBackend - unconverted blueprints:
- support for functions and delegates
- various fixes

#codereview Mike.Beach

[CL 2709166 by Maciej Mroz in Main branch]
2015-09-29 07:32:02 -04:00
Rolando Caloca
46909c0ede UE4 - hlslcc - Fix for atomic load/stores
#codereview Mark.Satterthwaite, Michael.Trepka

[CL 2708623 by Rolando Caloca in Main branch]
2015-09-28 18:59:51 -04:00
Rolando Caloca
2c7609d41d UE4 - CCT - Fix some cmd lines (atomic, packed globals into ub)
#codereview Mark.Satterthwaite, Michael.Trepka

[CL 2708321 by Rolando Caloca in Main branch]
2015-09-28 16:09:22 -04:00
Dan Oconnor
d6625b676d Changes required to support unicode (or otherwise invalid) class names for blueprints converted to native types. We now add a postfix (__pf) to native types generated for blueprints. We also overwrite invalid symbols (ie, +, - or unicode characters) found in blueprint asset names. All dynamic classes now need to explicitly specify a name.
#codereview Maciej.Mroz

[CL 2708146 by Dan Oconnor in Main branch]
2015-09-28 14:27:23 -04:00
Martin Mittring
ef56b989c2 fixed CIS - metal compile
[CL 2707026 by Martin Mittring in Main branch]
2015-09-25 19:04:15 -04:00