Commit Graph

56 Commits

Author SHA1 Message Date
Zousar Shaker
fc2ad21a5e Prototype Wrapped Object Pointers (ObjectHandle/ObjectPtr)
Call-site changes for non-scalar wrapped object pointer upgrades in Engine + Shootergame

#rb devin.doucette

[CL 14996467 by Zousar Shaker in ue5-main branch]
2021-01-05 19:16:25 -04:00
Marc Audy
ada7c144fa Merge //UE5/Release-Engine-Staging @14903491 to //UE5/Main
[CL 14906022 by Marc Audy in ue5-main branch]
2020-12-11 14:21:20 -04:00
Marc Audy
50a3d7d368 Merge Release-Engine-Staging to Main @ CL# 14467590
This represents UE4/Main @ 14432125 + some cherrypick fixes

[CL 14468207 by Marc Audy in ue5-main branch]
2020-10-09 22:42:26 -04:00
Marcus Wassmer
3b81cf8201 Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -04:00
Marc Audy
7379fa99c5 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14229157
[CL 14233282 by Marc Audy in ue5-main branch]
2020-09-01 14:07:48 -04:00
Marc Audy
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -04:00
Max Chen
1193fe7612 Sequencer: Clear transient flags on spawnable template components. This fixes a bug where adding components to an empty actor would not save those components.
#jira UE-90939
#rb andrew.rodham

[CL 12392942 by Max Chen in 4.25 branch]
2020-03-24 16:00:25 -04:00
Max Chen
26fd4f9913 Fix editor only
#rb none
#rnx
#jira UE-90793

[CL 12235938 by Max Chen in 4.25 branch]
2020-03-17 16:57:46 -04:00
Max Chen
7e8a59f5c8 Sequencer: Rename the director blueprint when the level sequence is renamed. This fixes a bug where if the level sequence is renamed, event tracks would stop working.
#jira UE-84852
#rb andrew.rodham

[CL 12234342 by Max Chen in 4.25 branch]
2020-03-17 14:34:02 -04:00
Max Chen
b4881d8bf8 Copying //UE4/Dev-Editor to Dev-Tools-Staging (//UE4/Dev-Tools-Staging) @11123875
#rb none
#jira none

[CL 11123880 by Max Chen in Dev-Tools-Staging branch]
2020-01-27 20:11:15 -05:00
ryan durand
0f0464a30e Updating copyright for Engine Runtime.
#rnx
#rb none


#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869210 via CL 10869511 via CL 10869900
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870549 by ryan durand in Main branch]
2019-12-26 14:45:42 -05:00
andrew rodham
271db2e76f Sequencer: Wipe precompiled template data on director BP recompilation
This prevents us from tagging templates that reference old compiled data for export.

#jira UE-84302
#rb Max.Chen, Matt.Hoffman

#ROBOMERGE-SOURCE: CL 10120556 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v587-10111126)

[CL 10120559 by andrew rodham in Main branch]
2019-11-12 21:52:56 -05:00
andrew rodham
9914c9cd98 Editor: Various fixes relating to deleting assets with editors open for subobjects of those assets
This change comprises 3 changes:
  1. Added handling of blueprints contained within assets to BlueprintActionDatabase. When an asset containing a blueprint was to be deleted, it's inner BP would not get added to the PendingDelete array resulting in the BP actions showing up as references during the delete.
  2. Changed UAssetEditorSubsystem::CloseAllEditorsForAsset to close all editors that relate to the specified asset (including editors for subobjects of the asset)
  3. Reverted change made in 6836393 as this is now handled more generically by CloseAllEditorsForAsset
  4. Ensure that LevelSequence SequenceDirector blueprints do not have RF_Standalone as this cases them to be missed by UObject::TagSubobjects, and subsequently considered an external reference when deleting the object

#jira UE-80972
#jira UE-72689
#rb Jamie.Dale, Phillip.Kavan, Matt.Hoffman

#ROBOMERGE-SOURCE: CL 9732290 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v539-9700858)

[CL 9732291 by andrew rodham in Main branch]
2019-10-21 11:03:48 -04:00
Max Chen
b40c16115c Sequencer: Fix log
#rb none

[CL 5406928 by Max Chen in Dev-Sequencer branch]
2019-03-14 20:55:31 -04:00
Max Chen
fd89c0a6b7 Merging //UE4/Dev-Main to Dev-Sequencer (//UE4/Dev-Sequencer)
#rb none

[CL 4957863 by Max Chen in Dev-Sequencer branch]
2019-02-10 00:20:33 -05:00
Max Chen
de6b0db2fe Merging //UE4/Dev-Main to Dev-Sequencer (//UE4/Dev-Sequencer)
#rb none

[CL 4736915 by Max Chen in Dev-Sequencer branch]
2019-01-16 16:56:38 -05:00
andrew rodham
6f1c48e7f2 Sequencer: Bindings that exist within instance sub levels now work correctly
- On playback we now cache off both the original asset path name, and the level ptr if we're playing back within a level that has a ULevelStreaming associated with it
  - When resolving bindings, we compare the original binding's asset path name to the one we're playing back within. If it matches, we resolve using the ULevel ptr provided, rather than the UWorld.
  - Ultimately we would like to change this all to make the context _always_ a ULevel rather than a UWorld, but that is a high risk change to make since a lot of code (mostly editor code) heavily relies on the playback context being a UWorld.

#rb Max.Chen


#ROBOMERGE-SOURCE: CL 4729768 via CL 4729775

[CL 4729792 by andrew rodham in Main branch]
2019-01-15 17:59:36 -05:00
Max Chen
b1e8f8d75d Merging //UE4/Dev-Main to Dev-Sequencer (//UE4/Dev-Sequencer)
#rb none

[CL 4716961 by Max Chen in Dev-Sequencer branch]
2019-01-13 13:35:38 -05:00
Francis Hurteau
57c677da93 Copying //UE4/Dev-Enterprise@4705006 to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

[CL 4705151 by Francis Hurteau in Main branch]
2019-01-10 17:26:53 -05:00
Andrew Rodham
3fbf174b6c Sequencer: Fixed some cases where the director class could become detatched from its blueprint (for example, on duplication of a level sequence
#jira UE-66454
#rb Mike.Zyracki

[CL 4687939 by Andrew Rodham in Dev-Sequencer branch]
2019-01-08 07:51:32 -05:00
Max Chen
edcab9950f Merging //UE4/Dev-Main to Dev-Sequencer (//UE4/Dev-Sequencer)
#rb none

[CL 4664858 by Max Chen in Dev-Sequencer branch]
2018-12-15 23:56:00 -05:00
Ben Marsh
7598af0532 Update copyright notices to 2019.
#rb none
#lockdown Nick.Penwarden

[CL 4662404 by Ben Marsh in Main branch]
2018-12-14 13:41:00 -05:00
Ben Marsh
ea340d3fbf Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

[CL 4567513 by Ben Marsh in Main branch]
2018-11-14 19:05:13 -05:00
max chen
b35366e2f8 Sequencer: Removed derived blueprint type for level sequence director blueprints
#jira UE-64258
#rb andrew.rodham

#ROBOMERGE-SOURCE: CL 4408662 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4408665 by max chen in Staging-4.21 branch]
2018-09-29 02:28:54 -04:00
Max Chen
4f4c37e16a Merging //UE4/Dev-Main to Dev-Sequencer (//UE4/Dev-Sequencer)
#rb none

[CL 4292303 by Max Chen in Dev-Sequencer branch]
2018-08-16 10:47:07 -04:00