Commit Graph

1591 Commits

Author SHA1 Message Date
Jake Leonard
5066eeafde End the async loading thread loop on core uobject shutdown. This causes games to not crash on exit after changes from CL 8321295
#JIRA: UE-79704
#rb: Sam.Zamani, Josh.Markiewicz

[CL 8558911 by Jake Leonard in Main branch]
2019-09-06 16:47:56 -04:00
arciel rekman
d20a07ec2a Fix a compile issue (missing semicolon).
#rnx
#rb none
#jira none
[FYI] Ben.Marsh
#lockdown Cristina.Riveron

#ROBOMERGE-SOURCE: CL 8374691 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v406-8472469)

[CL 8497937 by arciel rekman in Main branch]
2019-09-04 15:42:32 -04:00
ben marsh
fb4078d777 More IncludeTool fixes.
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 8374228 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v406-8472469)

[CL 8497914 by ben marsh in Main branch]
2019-09-04 15:40:51 -04:00
Marc Audy
181b245591 Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 8417635
#rb
#rnx

[CL 8420815 by Marc Audy in Dev-Framework branch]
2019-09-03 10:41:02 -04:00
marc audy
c48ebb4d45 Make virtual UObject::Modify WITH_EDITOR. UObject::Modify remains defined as a forceinlined noop without editor to avoid having to fixup all existing code that exists in non-editor that calls Modify.
#rb Michael.Noland
#jira


#ROBOMERGE-SOURCE: CL 8293866 via CL 8353802
#ROBOMERGE-BOT: (v401-8057353)

[CL 8354009 by marc audy in Main branch]
2019-08-27 17:20:03 -04:00
Josh Markiewicz
d79515867d Copying //UE4/Dev-Online to Dev-Main (//UE4/Dev-Main)
- Up to CL8320930 from DevOnline and 8311605 Merge Down from Main
- skipped some Fortnite content/plugins/code where it tried to reintegrate files that had been moved pending investigation
#rb none

[CL 8321295 by Josh Markiewicz in Main branch]
2019-08-26 18:35:22 -04:00
Marc Audy
a7459b1afc Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 8292949
#rb
#rnx

[CL 8293622 by Marc Audy in Dev-Framework branch]
2019-08-26 10:30:04 -04:00
jeanfrancois dube
a600d2156e Fix static analysis warning.
#rb none
#rnx


#ROBOMERGE-SOURCE: CL 8210612 via CL 8211301
#ROBOMERGE-BOT: (v401-8057353)

[CL 8211406 by jeanfrancois dube in Main branch]
2019-08-22 10:03:32 -04:00
jeanfrancois dube
bbe2a77c0f Fix Linux compile warning ('&&' within '||').
#rb richard.malo
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: jeanfrancois.dube
#ROBOMERGE-SOURCE: CL 8096583 via CL 8097023 via CL 8097036
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v401-8057353)

[CL 8146371 by jeanfrancois dube in Dev-Build branch]
2019-08-20 23:04:42 -04:00
jeanfrancois dube
89f9b0d1b3 Introduce owned packages:
- Owned packages can reference private objects in their owner package.
 - Owned packages can reference private objects in other packages sharing the same owner.
 - Owner package can reference private objects in it�s owned packages.

Note: UE4 object version changed.

#rb robert.manuszewski, jamie.dale, richard.malo
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: jeanfrancois.dube
#ROBOMERGE-SOURCE: CL 8089997 via CL 8095845 via CL 8095932
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v401-8057353)

[CL 8143804 by jeanfrancois dube in Dev-Build branch]
2019-08-20 22:53:11 -04:00
Marc Audy
ba98a11d57 const parameters to ultimately make NewObject able to take a const UClass*
#rb
#rnx

[CL 8101031 by Marc Audy in Dev-Framework branch]
2019-08-16 16:58:43 -04:00
jeanfrancois dube
24cfa56288 Fix Linux compile warning ('&&' within '||').
#rb richard.malo
#rnx


#ROBOMERGE-SOURCE: CL 8096583 via CL 8097023
#ROBOMERGE-BOT: (v401-8057353)

[CL 8097036 by jeanfrancois dube in Main branch]
2019-08-16 15:04:58 -04:00
jeanfrancois dube
6c79ec7645 Introduce owned packages:
- Owned packages can reference private objects in their owner package.
 - Owned packages can reference private objects in other packages sharing the same owner.
 - Owner package can reference private objects in it�s owned packages.

Note: UE4 object version changed.

#rb robert.manuszewski, jamie.dale, richard.malo
#rnx


#ROBOMERGE-SOURCE: CL 8089997 via CL 8095845
#ROBOMERGE-BOT: (v401-8057353)

[CL 8095932 by jeanfrancois dube in Main branch]
2019-08-16 13:52:30 -04:00
marc audy
a6b5d44ae5 Copying //UE4/Dev-Framework to Dev-Main (//UE4/Dev-Main) [at] 7987668
#rb
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 7988574 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v399-8035122)

[CL 8039505 by marc audy in Dev-Build branch]
2019-08-14 13:20:31 -04:00
Marc Audy
95a36b7df4 Allow blueprint users to override the component class of a native introduced component.
#jira UE-26970
#rb Phillip.Kavan

[CL 8037286 by Marc Audy in Dev-Framework branch]
2019-08-14 12:44:32 -04:00
uriel doyon
7c52f5473d Part 2 of async loading stall workaround when post-loading async textures.
#jira none
#rb robert.manuszewski

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: uriel.doyon
#ROBOMERGE-SOURCE: CL 7951766 in //UE4/Release-4.23/... via CL 7951770
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v399-8035122)

[CL 8036866 by uriel doyon in Dev-Build branch]
2019-08-14 12:38:07 -04:00
Marc Audy
307e2e8d66 Store a function pointer on UDynamicClass to the custom class initialization (in much the same way that AddReferencedObjects pointer is stored) to ensure the class is initialized before beginning to construct the CDO rather than code embedded in the constructor
#rb Phillip.Kavan
#rnx

[CL 8034012 by Marc Audy in Dev-Framework branch]
2019-08-14 11:50:43 -04:00
Marc Audy
2ae81698c3 Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 7985126
#rb
#rnx

[CL 7987668 by Marc Audy in Dev-Framework branch]
2019-08-13 12:59:27 -04:00
martin wilson
df4545d5ff Back out changelist 7879411 until EngineTest issue can be debugged / fixed
#Jira none
#rb Benn.Gallagher

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: martin.wilson
#ROBOMERGE-SOURCE: CL 7925653 in //UE4/Release-4.23/... via CL 7935803
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v396-7974030)

[CL 7980496 by martin wilson in Dev-Build branch]
2019-08-13 11:16:35 -04:00
allan bentham
bb7532071e When checking if additional GC time is required on ios/android dont check platform time with each iteration.
#rnx
#rb none
[FYI] Robert.Manuszewski

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: allan.bentham
#ROBOMERGE-SOURCE: CL 7924438 via CL 7924443 via CL 7924447 via CL 7925734 via CL 7925763
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v396-7974030)

[CL 7980076 by allan bentham in Dev-Build branch]
2019-08-13 11:14:00 -04:00
martin wilson
625ab817a4 Fix sub object reinstancing when serialized sub object type does not match CDO object type
#jira UE-74873
#rb Gil.Gribb

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: martin.wilson
#ROBOMERGE-SOURCE: CL 7879411 in //UE4/Release-4.23/... via CL 7879415
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v396-7974030)

[CL 7976221 by martin wilson in Dev-Build branch]
2019-08-13 10:32:06 -04:00
uriel doyon
fde7103bd8 Part 2 of async loading stall workaround when post-loading async textures.
#jira none
#rb robert.manuszewski

#ROBOMERGE-SOURCE: CL 7951766 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v392-7949540)

[CL 7951770 by uriel doyon in Main branch]
2019-08-12 15:07:43 -04:00
Marc Audy
1c3be81dca Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 7950634
#rb
#rnx

[CL 7950994 by Marc Audy in Dev-Framework branch]
2019-08-12 12:52:39 -04:00
Marc Audy
e14f4a7ccf Move IsLegalOverride in to FOverrides subclass and make it non fatal. Give proper error messages when the override is not legal.
#rb Robert.Manuszewski

[CL 7950880 by Marc Audy in Dev-Framework branch]
2019-08-12 12:28:32 -04:00
Marc Audy
519a38e35e const correct Outers and Classes for object hash functions
#rb Michael.Noland

[CL 7936954 by Marc Audy in Dev-Framework branch]
2019-08-09 15:25:59 -04:00