Commit Graph

15 Commits

Author SHA1 Message Date
camille gendreau
6c3ee19b3e Added string conversion for GeForceNow OsTypes
#rb bernard.lambert, Nicolas.Potvin, Michel.Champoux

#ROBOMERGE-AUTHOR: camille.gendreau
#ROBOMERGE-SOURCE: CL 19025221 via CL 19025254 via CL 19026645 via CL 19027465 via CL 19027646 via CL 19031953
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v917-18934589)

[CL 19032177 by camille gendreau in ue5-main branch]
2022-02-17 03:43:57 -05:00
Marc Audy
c43360f47c Eliminate whitespace only differences between Release-Engine-Staging and Release-Engine-Test
#[fyi] Aurel.Cordonnier

#ushell-cherrypick of 18448630 by Marc.Audy
#preflight none

[CL 18483677 by Marc Audy in ue5-main branch]
2021-12-17 03:41:59 -05:00
ionut matasaru
22b2bd82f4 Fixed usage of TCHAR_TO_ANSI in IoStoreUtilities.cpp, PakFileUtilities.cpp and in GeForceNOWWrapper.cpp.
Fixed usage of TCHAR_TO_UTF8 in FbxMainExport (ExportStaticMeshToFbx, ExportSplineMeshToFbx).

#rb CarlMagnus.Nordin
#preflight 61b7589bf42e2f02a8dbedaa

#ROBOMERGE-AUTHOR: ionut.matasaru
#ROBOMERGE-SOURCE: CL 18453463 in //UE5/Release-5.0/... via CL 18453474 via CL 18453477
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Test -> Main) (v898-18417669)

[CL 18453488 by ionut matasaru in ue5-main branch]
2021-12-14 06:54:21 -05:00
ionut matasaru
1c030f6852 Fixed usage of TCHAR_TO_ANSI in IoStoreUtilities.cpp, PakFileUtilities.cpp and in GeForceNOWWrapper.cpp.
Fixed usage of TCHAR_TO_UTF8 in FbxMainExport (ExportStaticMeshToFbx, ExportSplineMeshToFbx).

#rb CarlMagnus.Nordin
#preflight 61b7589bf42e2f02a8dbedaa

#ROBOMERGE-AUTHOR: ionut.matasaru
#ROBOMERGE-SOURCE: CL 18453463 in //UE5/Release-5.0/... via CL 18453474
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v898-18417669)

[CL 18453477 by ionut matasaru in ue5-release-engine-test branch]
2021-12-14 06:53:29 -05:00
Marc Audy
f512a6d461 Eliminate whitespace only differences between Release-Engine-Staging and Release-Engine-Test
#fyi Aurel.Cordonnier

[CL 18448630 by Marc Audy in ue5-release-engine-test branch]
2021-12-13 15:59:48 -05:00
aurel cordonnier
34f55d3a4a Merge from Release-Engine-Test @ 17946149 to UE5/Main
This represents UE4/Main @17911760, Release-5.0 @17915875 and Dev-PerfTest @17914035

[CL 17949667 by aurel cordonnier in ue5-main branch]
2021-10-27 15:14:40 -04:00
aurel cordonnier
a6e741e007 Merge from Release-Engine-Staging @ 17915896 to Release-Engine-Test
This represents UE4/Main @17911760, Release-5.0 @17915875 and Dev-PerfTest @17914035

[CL 17918595 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-25 20:05:28 -04:00
aurel cordonnier
a12d56ff31 Merge from Release-Engine-Staging @ 17791557 to Release-Engine-Test
This represents UE4/Main @17774255, Release-5.0 @17791557 and Dev-PerfTest @17789485

[CL 17794212 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-12 21:21:22 -04:00
aurel cordonnier
69fe095547 Merge from Release-Engine-Staging @ 17636544 to Release-Engine-Test
This represents UE4/Main @17638339 and Dev-PerfTest @17636504

[CL 17638842 by aurel cordonnier in ue5-release-engine-test branch]
2021-09-27 19:54:25 -04:00
andriy tylychko
6bf3101dcd deprecated FTicker and family and replaced by thread-safe FTSTicker
#jira UE-120090
#rb francis.hurteau


#ROBOMERGE-SOURCE: CL 17176325 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v855-17104924)

[CL 17176374 by andriy tylychko in ue5-release-engine-test branch]
2021-08-16 11:09:22 -04:00
aurel cordonnier
dc4bf61540 Merge from Release-Engine-Staging @ 17030559 to Release-Engine-Test
This represents UE4/Main @ 17030256 and Dev-PerfTest @ 17030553

[CL 17031509 by aurel cordonnier in ue5-release-engine-test branch]
2021-08-03 11:56:47 -04:00
aurel cordonnier
02c0f425e8 Copy up from Release-Engine-Staging @ 16738359
This represents UE4/Main @ 16738161 and Dev-PerfTest @ 16737719

[CL 16738582 by aurel cordonnier in ue5-release-engine-test branch]
2021-06-22 00:27:54 -04:00
Jamie Dale
5647cee81d Added UE_PUSH_MACRO/UE_POP_MACRO and deprecated PUSH_MACRO/POP_MACRO
PUSH_MACRO/POP_MACRO had issues with non-parameterized macros, as they would stringize the expanded macro value rather than the name of the macro itself. The UE_PUSH_MACRO/UE_POP_MACRO versions take the macro name as a string to avoid this issue.

#rb Steve.Robb
#preflight 6086dd303938bf0001e1a5cc

[CL 16115890 by Jamie Dale in ue5-main branch]
2021-04-26 13:07:03 -04:00
Marc Audy
8f73cd7fa9 Merge UE5/Release-Engine-Staging @ 15630841 to UE5/Main
This represents UE4/Main @ 15601601

[CL 15631170 by Marc Audy in ue5-main branch]
2021-03-05 19:27:14 -04:00
Marc Audy
9753392e2b Merge UE5/RES CL# 15462083 to UE5/Main
This represents UE4/Main @ 15414221

[CL 15463811 by Marc Audy in ue5-main branch]
2021-02-18 18:13:28 -04:00