Commit Graph

362 Commits

Author SHA1 Message Date
Rex Hill
a592a28d1a Fix null pointer dereference in plastic source control
#rb none
#rnx

[CL 8675131 by Rex Hill in Dev-Editor branch]
2019-09-13 12:38:38 -04:00
Rex Hill
fed3b2d421 Copyright notice updated
#rb none
#rnx

[CL 8674490 by Rex Hill in Dev-Editor branch]
2019-09-13 11:28:28 -04:00
Rex Hill
6676b5d039 Fix compile errors with PlasticSourceControl
#rb none
#fyi chris.gagnon
#rnx

[CL 8673442 by Rex Hill in Dev-Editor branch]
2019-09-13 10:28:32 -04:00
SRombauts
ed02f25298 PR #5864: Plastic SCM Source Control provider plugin for Unreal Engine 4 (Contributed by SRombauts)
#rb Chris.Gagnon
#fyi Tim.Gautier

[CL 8640838 by Chris Gagnon in Dev-Editor branch]
2019-09-11 14:14:20 -04:00
Max Chen
61603c83e4 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) at CL#8390086
#rb none

[CL 8393238 by Max Chen in Dev-Editor branch]
2019-09-01 02:03:35 -04:00
Rex Hill
98fa31e0ab Updated open source code file in Editor to call MakePlatformFilename for Visual Studio.
#jira UE-79396
#rb none
#rnx

[CL 8335626 by Rex Hill in Dev-Editor branch]
2019-08-27 11:40:37 -04:00
Rex Hill
35b43ec9dc Convert file paths to use backslashes when opening source files in Visual Studio.
Fixes issues with plugins in Visual Studio prompting to re-open the file.

#jira UE-79396
#rb lauren.barnes
#fyi ben.marsh

[CL 8295453 by Rex Hill in Dev-Editor branch]
2019-08-26 13:11:01 -04:00
Max Chen
719222de61 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 8153426 by Max Chen in Dev-Editor branch]
2019-08-21 00:20:50 -04:00
rod bogart
028ca9d505 Fix allows ActorLayerUtilities in cooked Composure project
#jira UE-78777
#rb Patrick.Boutot

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: rod.bogart
#ROBOMERGE-SOURCE: CL 8041083 in //UE4/Release-4.23/... via CL 8041090
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v399-8035122)

[CL 8053836 by rod bogart in Dev-Build branch]
2019-08-14 23:23:09 -04:00
jamie dale
f5e85f109b Fixed localization gather warnings
#jira
[FYI] Michelle.Zhao
#rb none
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: jamie.dale
#ROBOMERGE-SOURCE: CL 8030368 in //UE4/Release-4.23/... via CL 8030370
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v399-8035122)

[CL 8053608 by jamie dale in Dev-Build branch]
2019-08-14 23:22:04 -04:00
rod bogart
39dbc36741 Fix allows ActorLayerUtilities in cooked Composure project
#jira UE-78777
#rb Patrick.Boutot

#ROBOMERGE-SOURCE: CL 8041083 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v399-8035122)

[CL 8041090 by rod bogart in Main branch]
2019-08-14 14:11:21 -04:00
jamie dale
d4ccda63a2 Fixed localization gather warnings
#jira
[FYI] Michelle.Zhao
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 8030368 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v398-8029740)

[CL 8030370 by jamie dale in Main branch]
2019-08-14 10:39:15 -04:00
Ben Marsh
beb4519169 Rename EBuildConfigurations::Type to EBuildConfiguration.
#rb none

[CL 7937697 by Ben Marsh in Dev-Build branch]
2019-08-09 17:35:36 -04:00
patrick laflamme
6c1d63ce26 #jira UE-78489 - Disaster recovery depends on delegate execution order to recover properly
- Ensured the disaster recovery finite state machine persisted the session changes at least one frame after completing workspace sync to get a end frame event in between.

#rb Francis.Hurteau

#ROBOMERGE-SOURCE: CL 7841615 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7841621 by patrick laflamme in Main branch]
2019-08-07 12:56:27 -04:00
patrick laflamme
4cfe8a8556 #jira UE-78403 - Assert restoring with DisasterRecovery after creating an Autosave
- Don't record saved package event if the long package name is invalid (/Temp for example)

#rb Francis.Hurteau, Jamie.Dale

#ROBOMERGE-SOURCE: CL 7839598 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7839602 by patrick laflamme in Main branch]
2019-08-07 08:36:44 -04:00
ludovic chabant
78fe4eefe2 Add level sequence setting for handling the aspect ratio constraint during play.
The new setting defaults to overriding the constraint to XFOV to preserve previous behaviour. It lets the user choose what kind of constraint to use during the sequence, or whether to not touch the constraint at all.

#jira UE-76517
#rb max.chen, matthoffman, andrew.rodham

[CL 7824809 by ludovic chabant in Dev-Editor branch]
2019-08-06 17:06:27 -04:00
Max Chen
e4d4965491 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 7774443 by Max Chen in Dev-Editor branch]
2019-08-05 15:48:51 -04:00
Lauren Ridge
28e6889f2f Adding includes for incremental compiles
#rb me

[CL 7773764 by Lauren Ridge in Dev-Editor branch]
2019-08-05 15:20:14 -04:00
Lauren Ridge
882abc56c8 Refactoring the majority of AssetEditorManager cases to AssetEditorSubsystem
#rb me

[CL 7765218 by Lauren Ridge in Dev-Editor branch]
2019-08-05 12:16:07 -04:00
Gines Hidalgo
646b8669ff Enhacement request from JIRA UE-77383: Deprecated GEditor->Layers (and the classes ILayers/FLayers) and replaced by GEditor->GetEditorSubsystem<ULayersSubsystem>() (and the class ULayersSubsystem). In addition, all TWeakObjectPtr functions in Layers have been deprecated and replaced by raw pointer versions. This exposes most LayersSubsystem functions to BluePrints.
#jira UE-77383
#rb chris.gagnon

[CL 7709177 by Gines Hidalgo in Dev-Editor branch]
2019-08-02 14:52:07 -04:00
francis hurteau
74f18f63c8 Added the possibility to annotate concert events with message bus annotations
Added a concert custom message flags to indicate that a concert messages should be uniquely identifiable acoss clients and uses annotations to do so.
Send snapshot transactions, presence and sequencer events are uniquely identifiable.
Merged from CL 7437409

#jira UE-78280
#rb none

#ROBOMERGE-SOURCE: CL 7708211 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v385-7708028)

[CL 7708213 by francis hurteau in Main branch]
2019-08-02 13:23:03 -04:00
francis hurteau
f511222ae9 Enabled Concert PresenceManager when in -game mode.
This allows -game client to see Multi-User presences if the Concert.EnablePresenceInGame console variable is true.
Merged from CL 7294055, CL 7294953, CL 7295479

#jira UE-78279
#rb none

#ROBOMERGE-SOURCE: CL 7708190 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v385-7708028)

[CL 7708199 by francis hurteau in Main branch]
2019-08-02 13:21:58 -04:00
patrick laflamme
a6a234bfcb #jira UE-78118 - Recovered changes are not saved unless the user explicitly open the recovered levels
- Persisted all restored session changes in the game content folder.

#rb Francis.Hurteau

#ROBOMERGE-SOURCE: CL 7673965 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v381-7673386)

[CL 7673968 by patrick laflamme in Main branch]
2019-07-31 14:11:25 -04:00
francis hurteau
58134bd2bc Fixed crash when calling PostTransacted on untracked matinee transaction
Fixed OngoingTransactions from never being removed from list

#jira UE-78076
#rb Jamie.Dale

#ROBOMERGE-SOURCE: CL 7669688 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v376-7668820)

[CL 7669692 by francis hurteau in Main branch]
2019-07-31 10:50:12 -04:00
patrick laflamme
b19937a236 #jira UE-78097 - Access Violation after Disaster Recovery completes restoring transactions from LaunchOn
- Ignored 'save' package events fired by the cooker by looking at 'GIsCookerLoadingPackage' global variable.

#rb Francis.Hurteau, Jamie.Dale

#ROBOMERGE-SOURCE: CL 7669364 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v376-7668820)

[CL 7669365 by patrick laflamme in Main branch]
2019-07-31 10:05:28 -04:00