Commit Graph

995 Commits

Author SHA1 Message Date
Peter Sauerbrei
6051ef19e5 switch to min IOS version of 6.1
removed cook compression from IOS settings as they are already in rendering settings
UE-5083
UE-5081
#ios

[CL 2351663 by Peter Sauerbrei in Main branch]
2014-11-06 15:20:03 -05:00
Nicholas Davies
4ef5cfe24d Merging from UE4-Fortnite - update to Friends and Chat system
CL 2351579 & 2351597

[CL 2351620 by Nicholas Davies in Main branch]
2014-11-06 15:19:23 -05:00
Nicholas Davies
c023b935b3 Merging from UE4-Fortnite - update to Friends and Chat system
CL 2340958 to 2350247

[CL 2351555 by Nicholas Davies in Main branch]
2014-11-06 15:17:11 -05:00
Dan Oconnor
811b484786 Fixed graph view not allowing you to iterate differences when there were no local or no remote changes
[CL 2350387 by Dan Oconnor in Main branch]
2014-11-05 14:04:10 -05:00
Nick Atamas
a0e6281f98 Slate : Slate Stats now show measurements using a monospaced font with fixed numbers of digits.
Text : FNumberFormattingOptions now provides method-chainable settings for easily creating a static const instance.

#codereview Justin.Sargent,Jamie.Dale

[CL 2350380 by Nick Atamas in Main branch]
2014-11-05 13:58:58 -05:00
Nick Atamas
fe50b7005c Slate : Added stat visualization to the widget reflector. Slate can now be easily profiled in SlateViewer. Requires adding <bCompileWithStatsWithoutEngine>true</bCompileWithStatsWithoutEngine> to a local BuildConfiguration.xml.
[CL 2350283 by Nick Atamas in Main branch]
2014-11-05 13:13:07 -05:00
Jamie Dale
588dfdfcf0 Removed some redundant focus switching code from the output log
This was causing the focus to ultimately switch back to the widget that was already focused, however it was also causing IMEs to lose their current context. This force focus isn't needed, as the suggestions list is already set to not take focus when it's spawned.

[CL 2350270 by Jamie Dale in Main branch]
2014-11-05 13:12:41 -05:00
Ryan Gerleve
140cfcd734 Add const qualifiers to some networking functions
AActor::IsNetRelevantFor is now const and takes const parameters
UNetDriver::IsLevelInitializedForActor is now const and takes const parameters
UNetConnection::ClientHasInitializedLevelFor is now const
FNetGUIDCache::SupportsObject is now const

#codereview john.pollard

[CL 2350109 by Ryan Gerleve in Main branch]
2014-11-05 13:09:51 -05:00
Dmitry Rekman
1c54499008 Fix inconsistent case.
#codereview Nick.Darnell

[CL 2349528 by Dmitry Rekman in Main branch]
2014-11-04 23:10:35 -05:00
Dan Oconnor
5f4d2fe1c8 Conflict detection and diff highlighting fixed for the tree view. Also fixed Native Components not being checked. And an off by one error in HasNextDifference
[CL 2349504 by Dan Oconnor in Main branch]
2014-11-04 22:25:35 -05:00
Dmitry Rekman
02bd8563a2 Improvements to code projects on Linux.
- Changes from PR #560 (contributed by salamanderrake).
- KDevelop accessor plugin added (switched to it in settings).
- Closes UE-4724.

[CL 2348971 by Dmitry Rekman in Main branch]
2014-11-04 16:37:36 -05:00
Rolando Caloca
ebd19fccee UE4 - HlslParser
[CL 2348754 by Rolando Caloca in Main branch]
2014-11-04 14:12:02 -05:00
Nick Darnell
258685b4dc UMG - The Widget Reflector can detect UMG widgets as being different than normal slate widgets, and the source link is replaced by a link back to the blueprint asset. This enables the functionality, another coming changelist will hookup the asset loading binding in the editor.
[CL 2348470 by Nick Darnell in Main branch]
2014-11-04 11:11:50 -05:00
Dmitriy Dyomin
dac8101f75 Fixed GC issues in MeshMergin tool with source meshes that use dynamic materials
[CL 2347981 by Dmitriy Dyomin in Main branch]
2014-11-04 01:52:41 -05:00
Dmitriy Dyomin
95ee1a2255 Updated MeshMerging UI to use new lightmap generation method, also uses channel 0 as lightmap source UV
[CL 2347975 by Dmitriy Dyomin in Main branch]
2014-11-04 01:52:29 -05:00
Michael Trepka
78ef2936af Fixed Clang compile errors in SCW
#codereview Rolando.Caloca

[CL 2347413 by Michael Trepka in Main branch]
2014-11-03 15:49:51 -05:00
Ankit Khare
c93f7b8614 Fix for compiling UFE w/HTML5.
[CL 2347348 by Ankit Khare in Main branch]
2014-11-03 15:47:43 -05:00
Ben Zeigler
02a9e1dd4e Merging Dev -> Main using UE4-Fortnite-To-UE4 from CL 2340802
Includes following engine changes:

Getting display metrics only once at construct time when using SSafeZone. GetDisplayMetrics is expensive in Windows so it is impractical to call it every frame.
- Some AI API improvements, mostly switchig pointer function parameters to references.
- minor refactor of UCrowdFollowingComponent's queryinf functions:
    - IsCrowd*Enabled functions refactored to  IsCrowd*Active
    - implemented IsCrowd*Enabled that return acrual values of relevant properties
- Added a function to CrowdManager to query for location of agents neighbouring given agent
Added support for PS4 touchpad-based cursor
You can now choose to skip synchronously scanning for asset data in object libraries and just use the data that is currently in the asset registry. The data will be refereshed automatically later once the global scan completes. The only applies to non-commandlet editor instances.
Crash fixes for trying to access NULL Metal surfaces on IOS
Slate: Cleaned up some atlas code related to padding and corrected some comments

[CL 2347323 by Ben Zeigler in Main branch]
2014-11-03 15:47:28 -05:00
Rolando Caloca
4ca487cbb0 UE4 - Hlsl parser; precedence operator expression parser
[CL 2347171 by Rolando Caloca in Main branch]
2014-11-03 11:36:09 -05:00
Ben Marsh
64dca4fac0 Fix for UFE compiling under Rocket.
[CL 2347010 by Ben Marsh in Main branch]
2014-11-03 10:41:38 -05:00
Ankit Khare
55d2e28ba4 Allow html sdk path to be set using ini file.
- takes preference over EMSCRIPTEN env variable
   - editor can now detect sdk on yosemite.
   - refactor and simplyfy emscripten sdk access in .cs files.

#corereview james.moran

[CL 2345958 by Ankit Khare in Main branch]
2014-10-31 04:31:19 -04:00
Dan Oconnor
5730043362 Moved Blueprint Merge tool toggle to experimental editor settings
[CL 2345631 by Dan Oconnor in Main branch]
2014-10-30 20:04:18 -04:00
Dan Oconnor
673bdfc9cb Fixes for non-unity
[CL 2345618 by Dan Oconnor in Main branch]
2014-10-30 19:54:16 -04:00
Robert Manuszewski
e3203338d5 TSubobjectPtr removal, phase II. Making sure we're not breaking licensee projects by making subobjects TEMPORARILY public and deprecated (but only for game modules).
#change Made subobjects public again
#change Added temporary privat_subobject macro (defaults to public keyword) to help with changing eveything back later
#change TEMPORARILY moved subobject accessors to cpp fiels so that we don't get deprecation warnings when compiling the engine headers
#change Added DEPRECATED_FORGAME macro which is empty for the engine modules and reverts back to DEPRECATED for game modules

[CL 2345437 by Robert Manuszewski in Main branch]
2014-10-30 17:10:56 -04:00
Ben Marsh
7869ecb2b5 Build UnrealBuildTool if it doesn't exist when we need to generate project files.
[CL 2345334 by Ben Marsh in Main branch]
2014-10-30 17:07:40 -04:00