Commit Graph

50 Commits

Author SHA1 Message Date
george rolfe
e92e7071dd JsonObjectWrapper initialization without loading from string
#jira none

#preflight 61f9bda51d7ca8ed2d5e7998

#rb none

#ROBOMERGE-AUTHOR: george.rolfe
#ROBOMERGE-SOURCE: CL 18818435 in //UE5/Release-5.0/... via CL 18818457 via CL 18822877
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v910-18824042)

[CL 18824727 by george rolfe in ue5-main branch]
2022-02-02 07:59:56 -05:00
george rolfe
89a0cd9030 JsonObjectWrapper DisplayName set to JsonObject. Purely cosmetic.
#jira none

#rb Simon.Therriault

#ROBOMERGE-AUTHOR: george.rolfe
#ROBOMERGE-SOURCE: CL 18320450 in //UE5/Release-5.0/... via CL 18320467
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18320479 by george rolfe in ue5-release-engine-test branch]
2021-11-29 21:43:30 -05:00
aurel cordonnier
7f517562d5 Merge from Release-Engine-Staging @ 17438845 to Release-Engine-Test
This represents UE4/Main @17430120 and Dev-PerfTest @17437669

[CL 17439044 by aurel cordonnier in ue5-release-engine-test branch]
2021-09-06 12:23:53 -04:00
Marc Audy
01b7c9f4f5 Merge UE5/RES @ 15958325 to UE5/Main
This represents UE4/Main @ 15913390 and Dev-PerfTest @ 15913304

[CL 15958515 by Marc Audy in ue5-main branch]
2021-04-08 14:32:07 -04:00
Marc Audy
0cbbc781ca Merge UE5/Release-Engine-Staging @ 15740152 to UE5/Main
This represents UE4/Main @ 15709114

[CL 15740605 by Marc Audy in ue5-main branch]
2021-03-18 15:20:03 -04:00
Marc Audy
a7f9391231 Merge UE5/Release-Engine-Staging @ 14811410 to UE5/Main
This represents UE4/Main @ 14768117

For ReleaseObjectVersion.h
#lockdown Marcus.Wassmer

[CL 14811440 by Marc Audy in ue5-main branch]
2020-11-24 18:42:39 -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
steve robb
a8621a2bb0 Deprecation of FJsonObjectConverter::ObjectJsonCallback(), which is unused and can cause problems because of a lack of null check, infinite recusion and the wrong transient flag being tested.
#rb chris.gagnon


#ROBOMERGE-OWNER: steve.robb
#ROBOMERGE-AUTHOR: steve.robb
#ROBOMERGE-SOURCE: CL 11116255 via CL 11116275
#ROBOMERGE-BOT: (v640-11091645)

[CL 11117015 by steve robb in Main branch]
2020-01-27 13:21:11 -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
Robert Manuszewski
7b6f840f7f Copying //UE4/Dev-Core @ 10708550 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 10708666 by Robert Manuszewski in Main branch]
2019-12-13 11:07:03 -05:00
james hopkin
4797d300db #json Separated out serialisation functions
#ROBOMERGE-SOURCE: CL 10357128 via CL 10359424 via CL 10359928
#ROBOMERGE-BOT: (v594-10333955)

[CL 10362141 by james hopkin in Main branch]
2019-11-21 17:21:11 -05:00
james hopkin
bb3af1bd86 #json Make setting a null sharedptr work as would probably be expected, i.e. null JSON value
#ROBOMERGE-SOURCE: CL 10126129 via CL 10126176
#ROBOMERGE-BOT: (v587-10111126)

[CL 10126265 by james hopkin in Main branch]
2019-11-13 11:40:05 -05:00
justin marcus
8ff987e4db Use MakeShared instead of MakeShareable(new FJsonObject())
#ROBOMERGE-SOURCE: CL 8573849 via CL 8573850 via CL 8614977
#ROBOMERGE-BOT: (v409-8614070)

[CL 8616490 by justin marcus in Main branch]
2019-09-10 13:42:56 -04:00
james hopkin
86a205f641 #json Added AsJsonObject accessor to FJsonDomBuilder::FObject
#rnx


#ROBOMERGE-SOURCE: CL 7786180 via CL 7787252
#ROBOMERGE-BOT: (v388-7785529)

[CL 7787301 by james hopkin in Main branch]
2019-08-06 10:03:22 -04:00
david nikdel
4aa4dd2379 JsonObjectConverter:
- Adding GetTextFromField
- Changed GetTextFromObject to use this internally
#JIRA: FORT-196017


#ROBOMERGE-SOURCE: CL 7708627 via CL 7708632 via CL 7708635 via CL 7710107
#ROBOMERGE-BOT: (v385-7708028)

[CL 7710753 by david nikdel in Main branch]
2019-08-02 18:45:40 -04:00
james hopkin
5ce23a0d1e #json Added Num accessors for dom builder
#rb none


#ROBOMERGE-SOURCE: CL 4857951 via CL 4858351

[CL 4858991 by james hopkin in Main branch]
2019-01-31 11:57:03 -05:00
james hopkin
ca3f0b3a26 #json Dom builder improvements
#ROBOMERGE-SOURCE: CL 4743217 via CL 4743219

[CL 4743229 by james hopkin in Main branch]
2019-01-17 11:02:13 -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
Marc Audy
af90b7bcd4 Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main) @ 4395008
#rb
#rnx
#lockdown Nick.Penwarden

[CL 4395058 by Marc Audy in Main branch]
2018-09-25 10:11:35 -04:00
Marc Audy
d90da4ab1a Merge to Dev-Main for 4.20 @ 4090813
#rb
#rnx
#lockdown Nick.Penwarden

[CL 4091081 by Marc Audy in Main branch]
2018-05-23 21:04:31 -04:00
Ben Marsh
13d012685f Merging copyright update from 4.19 branch.
#rb none
#rnx
#jira

[CL 3818977 by Ben Marsh in Staging-4.19 branch]
2018-01-02 15:30:26 -05:00
Peter Sauerbrei
547f9cd31c Copying //UE4/WEX-Staging/... to //UE4/Main (Source: //WEX/Main @ 3580612)
#rb none
#lockdown nick.penwarden

=================================================================================================
MAJOR FEATURES + CHANGES
=================================================================================================

Change 3526838 by David.Nikdel

	#WEX: make map elements support TitleProperty on their values in the editor
	#JIRA: none

Change 3517937 by Ben.Zeigler

	#jira UE-46574 Deprecate IPlatformChunkInstall::SetChunkInstallDelgate as it was spelled wrong, was only half implemented, and did not support success vs failure
	Replace with AddChunkInstallDelegate, which supports a bool error code and is bound once instead of separately for each chunk. All implementations support this delegate at a basic level, although several could be improved to call the failure delegate in more cases

Change 3498765 by David.Nikdel

	#WEX: Added a way to bind a delegate that fires whenever an analytics event is queued.
	- Bind this delegate and use it to log analytics events (for now)
	#JIRA: none

Change 3495796 by Josh.May

	#WEX
	#JIRA: None
	- Reworked the LoadTimes.DumpReport console command to accept command arguments and added options for alphanumeric sorting (-alphasort), tweakable asset time cutoff (lowtime=X), and file output to the Saved/Profiling directory (file).
	- Added hooks for automatically generating load time reports for every map load (enabled using the DUMP_LOAD_REPORT_PER_MAP #define).

Change 3489241 by Josh.Markiewicz

	#UE4 - First unfinished pass to GoogleIOS
	- SDK auth token data needs to copy auth into TMap properly
	#jira none

Change 3487767 by David.Nikdel

	#Analytics: Make FAnalyticsEventAttribute support typed values
	- This makes sure the value types in the resultant JSON reflect the code.
	- Added support for Number (double), Boolean, Null, and JsonFragment types
	- This should make it so we don't have to whitelist everything to be converted to number on the Grafana processing side.
	- Made all attributes on FAnalyticsEventAttribute immutable
	#JIRA: WEX-6696, WEX-6706

Change 3478818 by Chris.Babcock

	Add detection of Houdini (running on Intel Android CPU)
	#jira WEX-5009
	#ue4
	#android

	#robomerge R1.2

Change 3475449 by Allan.Bentham

	Add disable force inline option for iOS build, enabled for WEX.
	#jira UEMOB-167

[CL 3588553 by Peter Sauerbrei in Main branch]
2017-08-15 16:16:21 -04:00
Ben Zeigler
15e82e0d29 Copying //UE4/Fortnite-Staging to //UE4/Dev-Main (Source: //UE4/Fortnite-Staging @ 3503438)
#lockdown Nick.Penwarden
#rb None

[CL 3503486 by Ben Zeigler in Main branch]
2017-06-21 17:09:40 -04:00