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
180,637 Commits 23 Branches 254 Tags
e59338fcbb052d40802ffaf991924b2aebf04341
Commit Graph

42 Commits

Author SHA1 Message Date
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
jordan cristiano
5a0b8c9cd7 Added framepro.lScopeMinTimeMicroseconds to control the minimum recorded scope duration per platform. 
framepro.ScopeMinTimeMicroseconds only applies when using framepro.startrec (not when captuing externally with the framepro ui or starting a capture through code).
Also got rid of framepro.startrecscopeoverride.

Set the default min scope to 25us.
Switch is set to 50us.
PC and Mac are set to 10us.

#rb andrew.ladenberger


#ROBOMERGE-SOURCE: CL 10955317 via CL 10972181 via CL 10972341
#ROBOMERGE-BOT: (v632-10940481)

[CL 10972518 by jordan cristiano in Main branch]
 2020-01-13 19:34:13 -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
jordan cristiano
b523f0ceac Changed the default min scope time for framepro captures from 25us to 50us. 
This is the default for framepro windows client live captures.

Significantly reduces hitching from scope "FramePro Start Frame" when recording captures.

#rb andrew.ladenberger
[FYI] ben.woodhouse, chris.bunner


#ROBOMERGE-SOURCE: CL 10613076 via CL 10613078 via CL 10613755
#ROBOMERGE-BOT: (v608-10590470)

[CL 10613841 by jordan cristiano in Main branch]
 2019-12-09 13:53:53 -05:00
Ben Marsh
38b9f9c5fc Fix some IncludeTool warnings. 
#rb none
#rnx

[CL 8693835 by Ben Marsh in Main branch]
 2019-09-16 11:50:08 -04:00
bart hawthorne
8eea3d88bb Fix Framepro's DynamicWString wrapper class - each time the assignment operator is called, it chops off the last character of the string. 
#rb ryan.gerleve
[FYI] david.harvey


#ROBOMERGE-SOURCE: CL 7477716 via CL 7493666 via CL 7545632
#ROBOMERGE-BOT: (v372-7473910)

[CL 7545879 by bart hawthorne in Main branch]
 2019-07-23 10:53:40 -04:00
david harvey
67772f6316 Updated FramePro drop with disconnection fixes + restoring workaround for -nothreading 
#rb none
[FYI] joe.barnes


#ROBOMERGE-SOURCE: CL 7099482 via CL 7109516
#ROBOMERGE-BOT: (v367-6836689)

[CL 7109581 by david harvey in Main branch]
 2019-06-20 15:26:16 -04:00
joe barnes
9272ea7b09 [FramePro] Fix thread leak and tls crash. 
#rb david.harvey


#ROBOMERGE-SOURCE: CL 7095051 via CL 7095055 via CL 7105342
#ROBOMERGE-BOT: (v367-6836689)

[CL 7105385 by joe barnes in Main branch]
 2019-06-20 11:10:17 -04:00