Commit Graph

26674 Commits

Author SHA1 Message Date
Dmitry Rekman
a8a01b962d UBT: do not try to access registry unnecessarily.
- Can error out on Linux.

#codereview Ben.Marsh, Jeff.Campeau

[CL 2712630 by Dmitry Rekman in Main branch]
2015-10-01 08:53:52 -04:00
Martin Wilson
b4446dc373 Fix crash when retargeting an asset that has a NULL Skeleton.
#codereview Lina.Halper

[CL 2712572 by Martin Wilson in Main branch]
2015-10-01 07:00:40 -04:00
Nicholas Davies
ac1c22b714 [INTEGRATE] merge UE4-LauncherDev >UE4 CL 2712469 & 2712499
Another attempt at adding the blocked players OSS changes. This time with the stubbed out platform code
#jira OPP-1694 As a user I would like to be able to block a user in the social system

[CL 2712543 by Nicholas Davies in Main branch]
2015-10-01 05:52:36 -04:00
Nicholas Davies
ba696e65ee Back out changelist 2712470
Forgot to add the default implementation for other platforms

[CL 2712491 by Nicholas Davies in Main branch]
2015-10-01 04:22:57 -04:00
Nicholas Davies
5291814d8e [INTEGRATE] merge UE4-LauncherDev >UE4 CL 2712469
OSS changes to support blocked players
#jira OPP-1694 As a user I would like to be able to block a user in the social system

[CL 2712470 by Nicholas Davies in Main branch]
2015-10-01 03:51:29 -04:00
Max Chen
1642a6a2a4 Sequencer: Set time or frame popup for keys.
#jira UETOOL-508

[CL 2712403 by Max Chen in Main branch]
2015-10-01 00:20:23 -04:00
Michael Noland
741c5e1b11 Editor: Added the ability to type in a path for the reference viewer, which makes it much easier to track down broken assets due to missing assets (paste in the missing asset path to view the assets that referenced it)
#jira UE-21660
[INTEGRATE] Change 2712391 by Michael.Noland@mnoland-T2784-HDepot on 2015/09/30 23:53:02

[CL 2712392 by Michael Noland in Main branch]
2015-09-30 23:54:11 -04:00
Michael Noland
6297fc9a33 Core: Switched GHitchThreshold to be GHitchThresholdMS (now set via t.HitchFrameTimeThreshold, rather than the old t.HitchThreshold) so everything is using the same values on the same scale
[INTEGRATE] Change 2712345 by Michael.Noland@mnoland-T2784-HDepot on 2015/09/30 22:04:15

[CL 2712356 by Michael Noland in Main branch]
2015-09-30 22:19:03 -04:00
Michael Noland
1809be9f8b Engine: Changed a failure to set a cvar due to a previous set via system settings ini to be displayed as Display instead of Warning
- Rationale: There is no way in a game to prevent the project settings or scalability from trying to set the value and failing with the message, and a user had to go out of their way to add one and intended them to exist (there's no UI way to set them in this manner in the editor)

[INTEGRATE] Change 2712339 by Michael.Noland@mnoland-T2784-HDepot on 2015/09/30 22:00:34

[CL 2712352 by Michael Noland in Main branch]
2015-09-30 22:11:19 -04:00
Michael Noland
cf00adf10e Gameplay Abilities: Added the ability to flag a pin as requiring a connection on a latent ability call (meta=(RequiresConnection=true) on the delegate property)
#jira OR-1532
[INTEGRATE] Change 2711735 by Michael.Noland@mnoland-T2784-HDepot on 2015/09/30 15:56:26

[CL 2712349 by Michael Noland in Main branch]
2015-09-30 22:06:03 -04:00
Bob Tellez
86e350d317 [AUTOMERGE]
#UE4 Changing usage of INSTANT_APPLICATION to Def->DurationPolicy == EGameplayEffectDurationType::Instant. Duration value should not be used when the policy is instant.
Also initialized a few FGameplayEffectSpec properties in the commonly used constructor.

#rb Billy.Bramer, Ben.Zeigler, Fred.Kimberley

#codereview David.Ratti

--------
Integrated using branch Ue4-To-UE4-Fortnite-Simple (reversed) of change#2712277 by Bob.Tellez on 2015/09/30 20:45:15.

[CL 2712327 by Bob Tellez in Main branch]
2015-09-30 21:53:17 -04:00
Zak Middleton
063d49042e #ue4 - Tweak formatting in Collision.ListComponentsWithResponseToProfile output for overlaps.
--------
[AUTOMERGE] Integrated using branch ue4-orion-to-ue4 of change#2712285 by Zak.Middleton on 2015/09/30 20:57:48.

[CL 2712289 by Zak Middleton in Main branch]
2015-09-30 20:59:17 -04:00
Zak Middleton
60ae1e8d93 #ue4 - Add console commands to list components/actors with a given response to any specified profile, and to list profiles with a given response to any specified collision channel. This processes only those assets which have been loaded in to memory so far.
New commands are:

- Collision.ListProfiles
- Collision.ListChannels
- Collision.ListComponentsWithResponseToProfile <Response> <Profile>
- Collision.ListProfilesWithResponseToChannel <Response> <Channel>

Response is one of: Ignore, Overlap, Block.
Profile is either an index or name from the ListProfiles command.
Channel is either an index or name from the ListChannels command.

--------
[AUTOMERGE] Integrated using branch ue4-orion-to-ue4 of change#2712247 by Zak.Middleton on 2015/09/30 19:53:23.

[CL 2712250 by Zak Middleton in Main branch]
2015-09-30 19:54:17 -04:00
Chris Babcock
1deb3dca09 Merging using UE4-To-UE4-Releases-4.10
Replace escaped characters in Android application display name
#jira UE-21658
#ue4
#android

[CL 2712236 by Chris Babcock in Main branch]
2015-09-30 19:44:29 -04:00
John Pollard
9cd9546264 #merge: Add ability to update existing named event
[CL 2712204 by John Pollard in Main branch]
2015-09-30 19:25:41 -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
Jeff Farris
21c7e096dd Further hardening of GameSession::InitOptions against potential crashes.
[CL 2711969 by Jeff Farris in Main branch]
2015-09-30 17:42:50 -04:00
Ori Cohen
c4bbe47877 Fix nan check only returning true if ALL nans in a transform row are nans.
[CL 2711913 by Ori Cohen in Main branch]
2015-09-30 17:12:20 -04:00
John Barrett
751d98f762 Compile fix - virtual destructor for PacketHandler's.
[CL 2711910 by John Barrett in Main branch]
2015-09-30 17:10:37 -04:00
Jeff Farris
a343da586a Integrated PR #1453: Fixed potential startup crash in GameSession if PlayerStateClass is null. (thanks EverNewJoy!)
[CL 2711867 by Jeff Farris in Main branch]
2015-09-30 16:53:49 -04:00
Jeff Farris
634fc3c7a8 Integrated PR #1495: Added Pawn::IsPlayerControlled() to compliment IsLocallyControlled() (thanks EverNewJoy!)
[CL 2711848 by Jeff Farris in Main branch]
2015-09-30 16:43:48 -04:00
Ben Marsh
326101127e Remove input dependency on WaitToMakeRocketBuild trigger; we only care about the order of that trigger firing, and don't want to build all its dependencies.
[CL 2711842 by Ben Marsh in Main branch]
2015-09-30 16:41:24 -04:00
Ben Marsh
1cc0be0a06 Separate all the project specific settings for a platform into a separate class (derived from UEBuildPlatformContext), and remove the last few references to the global .uproject file path. Checks for SupportsWindowsXP() are now done inside the toolchain.
#codereview Peter.Sauerbrei

[CL 2711835 by Ben Marsh in Main branch]
2015-09-30 16:40:04 -04:00
Daniel Lamb
1b1357a577 Fixed unity build.
[CL 2711819 by Daniel Lamb in Main branch]
2015-09-30 16:34:36 -04:00
Daniel Lamb
8ca86b2e3c Fixed compilation error.
[CL 2711818 by Daniel Lamb in Main branch]
2015-09-30 16:33:48 -04:00