izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity
210,234 Commits 23 Branches 254 Tags
3c2010d281269994deefcc86297a79247a9aeb34
Commit Graph

49 Commits

Author SHA1 Message Date
jeff newquist
45350930a3 Remove NDA platform define references 
#jira none
#rb rolando.caloca, david.harvey
#preflight 62880af3d1384beadd4de28b

[CL 20332798 by jeff newquist in ue5-main branch]
 2022-05-23 13:53:51 -04:00
evgenii babinets
eddd3db1d6 Fixed compiler error (forgot FramePro isn't built on PS4). 
#ROBOMERGE-AUTHOR: evgenii.babinets
#ROBOMERGE-SOURCE: CL 20191999 via CL 20192016 via CL 20192018
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)

[CL 20192754 by evgenii babinets in ue5-main branch]
 2022-05-13 20:47:40 -04:00
evgenii babinets
1bf9d7bb91 Unifying how we modify GCycleStatsShouldEmitNamedEvents so that we guarantee it won't drop below zero (should never happen, but just in case so that we can change checks to be != 0). 
#rb jordan.cristiano

#ROBOMERGE-AUTHOR: evgenii.babinets
#ROBOMERGE-SOURCE: CL 20190641 via CL 20190656 via CL 20190671
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)

[CL 20192726 by evgenii babinets in ue5-main branch]
 2022-05-13 20:46:55 -04:00
ilya loshchinin
3fa9f8ce4d Fixed FramePro re-initializing FThreadIdleStats singleton on shutdown. 
- don't trace FramePro waits when FramePro is not recording (FramePro uses wait events only when recording).

#rb Michael.Sartain

#ROBOMERGE-AUTHOR: ilya.loshchinin
#ROBOMERGE-SOURCE: CL 20140195 via CL 20142229 via CL 20142742
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)

[CL 20145520 by ilya loshchinin in ue5-main branch]
 2022-05-11 14:18:09 -04:00
ilya loshchinin
4b58a73582 Added support for using FramePro profiling scopes in MallocBinned2 allocator: added a separate memory allocator for FramePro, added support for TArrays to use a different base malloc, rather than FMemory. 
#rb louisphilippe.seguin, robert.millar
#tests automatic and manual FramePro captures of Squads games on Linux in WSL2 and cloud hardware (m5.4)

#ROBOMERGE-AUTHOR: ilya.loshchinin
#ROBOMERGE-SOURCE: CL 19091015 via CL 19094278 via CL 19095759 via CL 19101834
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19141844 by ilya loshchinin in ue5-main branch]
 2022-02-25 00:09:54 -05:00
nuno leiria
492c958e88 Fixed float convertion warning 
#rb trivial

#ROBOMERGE-AUTHOR: nuno.leiria
#ROBOMERGE-SOURCE: CL 18707229 via CL 18707475 via CL 18707520 via CL 18707842 via CL 18707870 via CL 18707996
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v903-18687472)

[CL 18708013 by nuno leiria in ue5-main branch]
 2022-01-24 09:15:57 -05:00
ionut matasaru
0af261835d Fixed usage of TCHAR_TO_ANSI. 
#rb Catalin.Dragoiu, Josh.Adams

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

[CL 18453449 by ionut matasaru in ue5-release-engine-test branch]
 2021-12-14 06:51:13 -05: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
carlmagnus nordin
00583f9764 Restored static analysis warning fixes that got lost when merging 
#rnx

#ROBOMERGE-AUTHOR: carlmagnus.nordin
#ROBOMERGE-SOURCE: CL 17607910 via CL 17607912 via CL 17607924 via CL 17616735 via CL 17616808
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v871-17566257)
#ROBOMERGE[STARSHIP]: UE5-Main

[CL 17616845 by carlmagnus nordin in ue5-release-engine-test branch]
 2021-09-23 19:19:56 -04:00
brian bekich
5e22e9ad65 Fix for framepro strings being truncated 
#jira UE-117941
#rb ryan.gerleve

#ROBOMERGE-SOURCE: CL 16661137 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v834-16658389)

[CL 16661138 by brian bekich in ue5-release-engine-test branch]
 2021-06-14 13:54:48 -04:00
david harvey
4d057d8cae remove PLATFORM_XBOXONE from FramePro code. 
#jira UECON-543
#rnx
#rb eric.mcdaniel, nuno.leiria

#ROBOMERGE-SOURCE: CL 16329306 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v804-16311228)

[CL 16329321 by david harvey in ue5-release-engine-test branch]
 2021-05-14 10:12:32 -04:00
Andriy Tylychko
c470716274 fixed compilation error: https://horde.devtools.epicgames.com/job/608b3fc0ff44100001a3cca5?step=9073&issue=67780 
[CL 16163653 by Andriy Tylychko in ue5-main branch]
 2021-04-29 19:43:18 -04:00
marc audy
a823ccf4a7 Remove double slash 
[FYI] nuno.leiria

#ROBOMERGE-SOURCE: CL 16111749 in //UE5/Release-Engine-Staging/...
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Main) (v789-15992632)

[CL 16111753 by marc audy in ue5-main branch]
 2021-04-26 01:01:10 -04:00
nuno leiria
2455c610c5 Remove SOMAXCONN definitions from FramePro because they clash with Winsock (and are not well defined on other platforms). 
#rb trivial

[CL 16098259 by nuno leiria in ue5-main branch]
 2021-04-22 17:09:21 -04:00
nuno leiria
2c698d658b Upgrade FramePro to version 1.10.10 
#rb brian.white
#preflight 6081a5c8590e4a000108adbc

[CL 16095787 by nuno leiria in ue5-main branch]
 2021-04-22 14:06:37 -04:00
david harvey
d2dab6ce86 remove some references to UE4 
#jira UE-110961, UE-110964, UE-110966, UE-110968, UE-111010
#rb nuno.leiria
#rnx

#ROBOMERGE-SOURCE: CL 15746749 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v781-15675533)

[CL 15750769 by david harvey in ue5-main branch]
 2021-03-19 16:20:21 -04:00
nuno leiria
80bd7691bc Fix FramePro integration to treat Unix platforms as Linux and some clang compile errors 
#rb trivial

[CL 15451424 by nuno leiria in ue5-main branch]
 2021-02-18 05:32:29 -04:00
Marc Audy
68150e0be7 Merge UE5/Release-Engine-Staging to UE5/Main @ 14611496 
This represents UE4/Main @ 14594913

[CL 14612291 by Marc Audy in ue5-main branch]
 2020-10-29 13:38:15 -04:00
Marc Audy
4c1bb11c29 Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662 
This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck

[CL 14551026 by Marc Audy in ue5-main branch]
 2020-10-22 19:19:16 -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
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main) 
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
 2020-06-23 18:40:00 -04:00
jordan cristiano
ef93e0e6b0 Fixed framepro.stoprec underflowing GCycleStatsShouldEmitNamedEvents if called when not recording a framepro capture. 
#rb trivial
#rnx

#ROBOMERGE-SOURCE: CL 12782896 via CL 12783810 via CL 12783830 via CL 12783849
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12786364 by jordan cristiano in Main branch]
 2020-04-14 16:52:57 -04:00
jordan cristiano
0d3a219dfb Fixed FFrameProProfiler setting explicit values for GCycleStatsShouldEmitNamedEvents instead of inc/dec. 
#rb andrew.ladenberger
#rnx

#ROBOMERGE-SOURCE: CL 12782686 via CL 12782701 via CL 12782712 via CL 12782721
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12782733 by jordan cristiano in Main branch]
 2020-04-14 13:45:53 -04:00
Rolando Caloca
5b82f15def Copying //UE4/Dev-RenderPlat-Staging@11388153 to //UE4/Main 
#rb none
#rnx

[CL 11388545 by Rolando Caloca in Main branch]
 2020-02-12 13:27:19 -05:00
michael noland
2d6847d01a Core: Fixes for various unsafe implicit type conversion warnings in the Core module (WIP; some files still suppress the warning) 
- Ptrdiff -> int32
- Float/int confusion and double/float
- size_t stuff; various changes to the algorithms to use a deduced IndexType template argument and/or decltype to use the appropriate size for indicies and counts
- Fixed GetNum(FString) incorrectly returning SIZE_T instead of int32, and GetNum(container) now returns whatever container.Num() does (so usually int32)
#jira UE-86949
#rb marc.audy, steve.robb


#ROBOMERGE-OWNER: michael.noland
#ROBOMERGE-AUTHOR: michael.noland
#ROBOMERGE-SOURCE: CL 11050799 via CL 11050828 via CL 11050837
#ROBOMERGE-BOT: (v637-11041722)

[CL 11051763 by michael noland in Main branch]
 2020-01-17 13:49:41 -05:00