Commit Graph

24660 Commits

Author SHA1 Message Date
Max Chen
59e0d4e85b Sequencer: Add expand/collapse nodes to menu.
[CL 2652204 by Max Chen in Main branch]
2015-08-11 21:59:06 -04:00
Jeff Campeau
6e5b895a54 Disable DualShock and Morpheus support for VS2015
[CL 2651897 by Jeff Campeau in Main branch]
2015-08-11 17:29:08 -04:00
Jeff Campeau
35d4842420 Disable some warnings for VS2015
[CL 2651883 by Jeff Campeau in Main branch]
2015-08-11 17:19:03 -04:00
Sam Zamani
75cbd59830 [merge]
#xmpp
- removed unused shadow var

[CL 2651868 by Sam Zamani in Main branch]
2015-08-11 17:14:15 -04:00
Daniel Lamb
01fb1e902c Added support for diffing generated cooked content against supplied cooked pak file.
[CL 2651863 by Daniel Lamb in Main branch]
2015-08-11 17:11:41 -04:00
David Ratti
5f7c504854 Integration from development branch:
CL 2651151
Fix GameplayCues being invoked from ActiveGameplayEffectsContainer::NetDeltaSerialize when there are unmapped objects, which can cause GCs to be invoked with incomplete information in their EffectContext.
- Fixes Phase link GC not having SourceObject info to link from volume to caster

CL 2649496
Fix OptionalExternalTarget for WaitGameplayTag* tasks

CL 2644908
AbilityTask_WaitGameplayEvent. Allows abilities to explicitly listen for Gameplay Events (previously could only be activated from them).

CL 2644751
Tracking cases where AGameplayAbilityTargetActor fails to remove delegates from the ASC it applied them to - hoping to track down cause of #OR-5548 crash (that was fixed with nullptr checks)

CL 2643962
Fix occasional crash in AGameplayAbilityTargetActor - added nullptr checks, can't assume we have a valid OwningAbility pointer. #OR-5548

CL 2643797
GameplayEffect GrantedAbilities respect Effect inhibition (ongoing tag requirements) - abilities are applied/removed/cancelled based on whether the ongoing tags are met or not.
Previously, if application tags passed, target would have the granted ability for full duration of effect application, even if the ongoing tags weren't met
Fixes Rampage's E (which applies Juggernaut tag) not granting CC immunity after already being affected by the CC effects #OR-4019

CL 2643360
Fix ensures on exiting PIE - trying to spawn new instanced cue during level cleanup #OR-5521
Level being cleaned up, TravelMode triggering a GC removal that tries to spawn an instanced cue actor to handle the cue
ASC now are marked as unregistered during the unregistration process - previously they would DestroyActiveState() and then mark themselves as unregistered. There was nothing during DestroyActiveState() that allowed any system to know that they were in the process of being unregistered.
GameplayCues are now not handled by OrionChars that are pending kill or have ASCs that are pending kill or unregistered (or do not have ASCs)

CL 2642415
GetModfiedAttributeMagnitude - support for getting amount attribute changes from an applied GE spec

CL 2642414
Add support for periodic effects to WaitGameplayEffectApplied/Self

CL 2642413
Added delegate for periodic effects executing on target/self
Move PruneModifierAttributes to the constructor of FGameplayEffectSpecForRPC. This is to allow server code to look at the modified attribute list even if the GC doesn't need it.
Remove ApplyStackingLogicPostApplyAsSource function since it wasn't doing anything.

CL 2641147
Added DestroyActiveState to ASC so unregistering the component while in-flight abilities are active do not crash.
Added option for reusing player states when they become inactive instead of duplicated them.
Fixed crash for returning players during JIP.

CL 2637792
Temp fix for simulated ability tasks not having valid AbilitySystemComponents and crashing

CL 2637461
Orion game code fixes to go along with Integration from UE4-Stable @ CL 2634937. This includes all 4.9 revisions up to CL 2633546, which includes all UE4 (main) revisions up to CL 2613150. Note: many fixes were spot integrated after CL 2613150.

CL 2637431
Integration from UE4-Stable @ CL 2634937. This includes all 4.9 revisions up to CL 2633546, which includes all UE4 (main) revisions up to CL 2613150. Note: many fixes were spot integrated after CL 2613150.

CL 2635403
Add support for AbilitySystemComponent end debug display to flood to new columns to avoid cases where there's too much info to fit on one screen

CL 2635282
Added title text to AbilitySystemComponent end debug key cycling - contains category of debug information along with avatar and owner info and their respective roles. Saves brain cycles on figuring out what you're looking at (and if you're on local player vs simulated, etc.)

CL 2634858
Ability system debug component draw debug
Added view "Attributes" to only show attributes
Don't draw attributes in "aggregator view" if they have no active aggregators (inhibited still draw)
Show level on GEs with level > 1

[CL 2651831 by David Ratti in Main branch]
2015-08-11 17:01:31 -04:00
David Ratti
d0ccb689e2 Merging changes to gameplay tags and gameplay cue editor.
[CL 2651830 by David Ratti in Main branch]
2015-08-11 17:01:12 -04:00
David Ratti
2d17a08372 Integrate CL 2641147 and CL 2641326. This adds virtual functions and does not change existing functionality: allows games to override the APlayerState replacement/duplication/restore code in game modes when a player disconnects.
[CL 2651799 by David Ratti in Main branch]
2015-08-11 16:49:22 -04:00
Max Chen
038429262b Sequencer: Fix assign actor for components.
[CL 2651748 by Max Chen in Main branch]
2015-08-11 16:33:21 -04:00
Bart Bressler
1af2fc9220 Merge 2651680 from UE4-Orion
Add console commands demoscrub and demopause

[CL 2651687 by Bart Bressler in Main branch]
2015-08-11 15:59:43 -04:00
Ori Cohen
62e2fada96 Fix bad merge of create_projects stomping the custom logic for generating projects in main.
[CL 2651598 by Ori Cohen in Main branch]
2015-08-11 15:19:37 -04:00
Ori Cohen
e9dcf03cab Fix c style cast warning on ps4 and missing params on xbonx one
[CL 2651594 by Ori Cohen in Main branch]
2015-08-11 15:18:39 -04:00
Aaron McLeran
072d2d7d7c UE-18444 Making an audio component's attenuation settings accessible from blueprint callable function
#codereview marc.audy dan.oconner

[CL 2651583 by Aaron McLeran in Main branch]
2015-08-11 15:13:42 -04:00
Ori Cohen
2dc7b17192 Remove per scene deletion buffers. This fixes out of order deletion.
#JIRA UE-19387
#codereview Benn.Gallagher

[CL 2651576 by Ori Cohen in Main branch]
2015-08-11 15:13:05 -04:00
Peter Sauerbrei
ff140cba7f fixes to build against IOS 9 beta 4 SDK
#ios9

[CL 2651551 by Peter Sauerbrei in Main branch]
2015-08-11 15:00:24 -04:00
Dmitry Rekman
e2314bbb8b Linux: added missing FPlatformProcess::UserName() implementation.
(Merging CL 2651396 from FN to main).

[CL 2651542 by Dmitry Rekman in Main branch]
2015-08-11 14:54:30 -04:00
Martin Mittring
2d7dcaef1b fixed typo
[CL 2651531 by Martin Mittring in Main branch]
2015-08-11 14:47:37 -04:00
Martin Mittring
198a9a1f04 fixed typo
[CL 2651530 by Martin Mittring in Main branch]
2015-08-11 14:46:57 -04:00
Martin Mittring
cc01a15e68 fixed UE-18724 Reflection environment CVar should exist for scalability purposes
from CL2459480: ReflectionEnvironment is no longer a cheat CVAR and is available in shipping builds. If you set the cvar to 2 (debug visualization) then it will be assumed to be the same as 1 in shipping builds.

[CL 2651529 by Martin Mittring in Main branch]
2015-08-11 14:46:30 -04:00
Timothy Reynolds
af632c0c81 Several aspects of Spline Meshes were not being implemented in place of the generic Static Mesh code:
- Allowed for spline mesh painting by overriding the color vertices like static meshes do.
- Fixed improperly placed vertices, used the modified vertices of the splined mesh rather than the vertices of the base static mesh.
- Fixed splined mesh initialization issue.

UE-18511

#codereview Matt.Kuhlenschmidt

[CL 2651504 by Timothy Reynolds in Main branch]
2015-08-11 14:33:30 -04:00
Mark Satterthwaite
69ba516ab8 Correctly determine whether to enable Mac GPU timestamp emulation in OpenGL based on whether we are running on Yosemite or later, running on an Nvidia GPU or forcing the feature on for testing.
#jira UE-15220

[CL 2651464 by Mark Satterthwaite in Main branch]
2015-08-11 14:12:59 -04:00
Cody Haskell
540bcdbf91 [AUTOMERGE]
#UE4

- Null guard in SetBrushFromTexture

--------
Integrated using branch UE4-To-UE4-Orion (reversed) of change#2651458 by Cody.Haskell on 2015/08/11 14:10:25.

[CL 2651460 by Cody Haskell in Main branch]
2015-08-11 14:11:21 -04:00
Ben Zeigler
a446aa1604 #UE4 Change it so PropertyHandles do not acount as being valid if the UProperty they point to has been invalidated due to BP recompilation. This fixes some crashes in editor UI
#codereview matt.kuhlenschmidt

--------
Integrated using branch Ue4-To-UE4-Fortnite-Simple (reversed) of change#2651439 by Ben.Zeigler on 2015/08/11 14:04:41.

[CL 2651446 by Ben Zeigler in Main branch]
2015-08-11 14:05:33 -04:00
Mark Satterthwaite
d0e5c59013 Remove unnecessary variable declaration to silence unused warning.
[CL 2651432 by Mark Satterthwaite in Main branch]
2015-08-11 14:02:16 -04:00
Rolando Caloca
6b9824849f UE4 - D3D12 - Integrate SRV renaming fix and backbuffer format
[CL 2651354 by Rolando Caloca in Main branch]
2015-08-11 13:18:54 -04:00