Commit Graph

12671 Commits

Author SHA1 Message Date
John Pollard
7b9ad057ea Fix crash that could occur while scrubbing in replays
[CL 2586571 by John Pollard in Main branch]
2015-06-12 18:16:26 -04:00
Jaroslaw Surowiec
44aac5751a Stats - Temp compile fix
[CL 2586559 by Jaroslaw Surowiec in Main branch]
2015-06-12 18:10:26 -04:00
Keli Hlodversson
e3a9403422 [INTEGRATE] Merging CL#2586385 using UE4-To-UE4-LauncherDev
Don't require NSApp boiler plate code in order to use SWebBrowser on Mac
Jira OPP-3500

[CL 2586448 by Keli Hlodversson in Main branch]
2015-06-12 17:23:08 -04:00
Jamie Dale
6394c466be Changed the text filter to inject AND tokens at spaces (rather than OR tokens) as this matches the old behavior of the filter.
[CL 2586412 by Jamie Dale in Main branch]
2015-06-12 17:07:29 -04:00
Peter Knepley
df469ecfb0 Change 2586270 by Matt.Oelfke@matt.oelfke_T4219 on 2015/06/12 15:45:41
Made UCharacterMovementComponent::CheckFall() virtual

#codereview Zak.Middleton

Merging 2586270

//depot/UE4-UT/...

to //depot/UE4/...

[CL 2586409 by Peter Knepley in Main branch]
2015-06-12 17:06:52 -04:00
Zak Middleton
cc8ee6a838 #ue4 - Fix bReturnPhysMat not being respected for heightfields. Also make sure to init Hit.FaceIndex to INDEX_NONE when it's not filled in.
[CL 2586321 by Zak Middleton in Main branch]
2015-06-12 16:11:41 -04:00
Ben Zeigler
c37bb37ebb #UE4 Fix crash when UWidgetBlueprintLibrary::Create is called on an Player Controller that is in the middle of transioning maps, return NULL instead
--------
Integrated using branch Ue4-To-UE4-Fortnite-Simple (reversed) of change#2586287 by Ben.Zeigler on 2015/06/12 15:56:20.

[CL 2586306 by Ben Zeigler in Main branch]
2015-06-12 16:04:14 -04:00
Phillip Kavan
87e04c49f8 [UE-15598] Fix crash on reload of maps saved with constructed component instances that match archetypes by name but no longer by type.
change summary:
- modified UBlueprintGeneratedClass::FindArchetype() to also check matched SCS component template types against the given archetype class

[CL 2586255 by Phillip Kavan in Main branch]
2015-06-12 15:40:16 -04:00
Phillip Kavan
f794f4e947 [UE-16281] Fix stale components persisting in a Blueprint class asset after changing a native parent class's inheritance hierarchy.
change summary:
- modified FLinkerLoad::ResolveDeferredExports() to ensure that all default subobjects in the export map for a Blueprint class asset package have been constructed and registered prior to class/CDO regeneration during compile-on-load.

#codereview Mike.Beach, Marc.Audy

[CL 2586252 by Phillip Kavan in Main branch]
2015-06-12 15:38:18 -04:00
Max Chen
f0834db2b7 Sequencer: Get audio playing.
#codereview matt.kuhlenschmidt

[CL 2586198 by Max Chen in Main branch]
2015-06-12 15:15:45 -04:00
Zak Middleton
b29d0dec18 #ue4 - 30% Faster FQuat::Normalize() and FQuat::GetNormalized() when vector intrinsics are enabled, and surrounding code has the quat in a VectorRegister (the common case).
[CL 2586176 by Zak Middleton in Main branch]
2015-06-12 15:03:04 -04:00
Ben Marsh
ed83ab0cca [INTEGRATE] Change 2574438 by Ben.Marsh@Ben.Marsh_T3245_Fortnite on 2015/06/02 16:37:58
Add a define for whether the current engine version is a promoted build. UnrealGameSync will override this and force it to 0.

	#codereview Ben.Zeigler

[CL 2586168 by Ben Marsh in Main branch]
2015-06-12 15:00:54 -04:00
John Pollard
9a9a46df36 Clamp demo time when scrubbing
[CL 2586151 by John Pollard in Main branch]
2015-06-12 14:55:26 -04:00
Wes Fudala
22c9856fe5 [OPP-3051] Add support for multiple browser windows.
Merging CL#2582871 LauncherDev->Main
change summary:
- Web browser modified to allow users to pass in a callback function that will handle window creation.

[CL 2586148 by Wes Fudala in Main branch]
2015-06-12 14:55:16 -04:00
Jaroslaw Surowiec
a840dc4262 Stats - Minor optimization (Added stats for wait/trigger in events)
[CL 2586026 by Jaroslaw Surowiec in Main branch]
2015-06-12 13:55:35 -04:00
Josh Adams
7ff0070a83 - Basic support for compiling Xcode 7 (iOS9, MacOS 10.11)
- Marked some overrides properly, then gave up and added -Wno-inconsistent-missing-override)
- Improved Xcode selection process for Mac and iOS (no more hardcoding Xcode path - it uses the currently running Xcode, or xcode-select when using commandline)
   - Added AppleToolchain.cs, to start sharing code between Mac and IOS Toolchains (Compile functionality and params to clang could be shared pretty easily)
   -
- Some Utility functions:
   - Added UBT utility to run a commandline and get its output, self-contained (Utils.RunLocalProcessAndReturnStdOut)
   - Added Log.TraceInformationOnce (and Error, Warning, etc) to print out a message only one time, without a bunch of static bools everywhere
#codereview michael.trepka,peter.sauerbrei,mark.satterthwaite

[CL 2586000 by Josh Adams in Main branch]
2015-06-12 13:45:19 -04:00
Gil Gribb
137c5a625a UE4 - flush the RHI thread and RHI resources in the movie loop
[CL 2585981 by Gil Gribb in Main branch]
2015-06-12 13:40:07 -04:00
Ori Cohen
e1db1e4c1b Refactor welding code so that the original body is stored in a map instead of the shape userData. This is needed for shapes to easily get at their original UE counterpart.
[CL 2585979 by Ori Cohen in Main branch]
2015-06-12 13:39:05 -04:00
John Pollard
14dff4c372 Merge: Report replay streamer errors + stop demo when it fails
[CL 2585964 by John Pollard in Main branch]
2015-06-12 13:33:52 -04:00
Mieszko Zielinski
087862b613 Made GetSenseClassForStimulus's WorldContext param default to self #UE4
[CL 2585963 by Mieszko Zielinski in Main branch]
2015-06-12 13:33:43 -04:00
John Pollard
ae3a95556c Merge: More HTTP replay streamer debug info/logging
[CL 2585959 by John Pollard in Main branch]
2015-06-12 13:32:54 -04:00
John Pollard
515b37d884 Merge: Handle when live replays timeout when first connecting
[CL 2585951 by John Pollard in Main branch]
2015-06-12 13:31:53 -04:00
Mieszko Zielinski
1e607ba53f Added a dedicated broadcast delegate to notify blueprints about single perception target's single sense stimulus #UE4
[CL 2585946 by Mieszko Zielinski in Main branch]
2015-06-12 13:31:09 -04:00
John Pollard
c4be59dbea Merge: Fix issue where the last checkpoint wouldn't load if there wasn't any stream info after it
[CL 2585938 by John Pollard in Main branch]
2015-06-12 13:29:54 -04:00
John Pollard
2e959ee141 Merge: Assume failed downloads with live streams are ok + clamp scrubbing to last checkpoint if no stream is available after it
[CL 2585937 by John Pollard in Main branch]
2015-06-12 13:27:53 -04:00