Commit Graph

62 Commits

Author SHA1 Message Date
bertrand carre
c0dd805a56 Make WebSockets protocols configurable via ini
#jira UE-136231
[at]Alejandro.Aguilar [at]Michael.Kirzinger

#ROBOMERGE-AUTHOR: bertrand.carre
#ROBOMERGE-SOURCE: CL 18328876 in //UE5/Release-5.0/... via CL 18328892
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18328922 by bertrand carre in ue5-release-engine-test branch]
2021-11-30 14:30:00 -05: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
alejandro aguilar
0a659a747a Adding logic to ensure initialisation of WinHttpHttpManager to enable WebSocket functionality
#jira OI-3199
[at]Michael.Kirzinger, [at]Sam.Zamani

#ROBOMERGE-SOURCE: CL 17400963 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v865-17346139)

[CL 17400985 by alejandro aguilar in ue5-release-engine-test branch]
2021-09-02 07:40:02 -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
steve robb
f358ac99f2 FPrivateToken trick used to allow emplacement-style functions (like MakeShared) to compile without giving up constructor access rights.
This replaces classes' use of friendship with internal TSharedPtr functions.

#rb devin.doucette
#jira none

#ROBOMERGE-OWNER: steve.robb
#ROBOMERGE-AUTHOR: steve.robb
#ROBOMERGE-SOURCE: CL 16745356 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v835-16672529)
#ROBOMERGE-CONFLICT from-shelf

[CL 16745698 by steve robb in ue5-release-engine-test branch]
2021-06-22 13:45:32 -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
Steve Robb
1f3fe8c9ac Some ANSICHAR/UTF8CHAR cast fixes for upcoming changes to StringConv.h.
#rb none
#jira none

[CL 16469364 by Steve Robb in ue5-main branch]
2021-05-26 10:45:12 -04:00
aurel cordonnier
8eebe8841f Merge UE5/RET @ 16305968 to UE5/Main
This represents UE4/Main @ 16261013 and Dev-PerfTest @ 16259937

[CL 16306996 by aurel cordonnier in ue5-main branch]
2021-05-12 18:10:03 -04:00
David Harvey
80aba12736 remove WITH_LEGACY_XDK
#rb jon.cain
#fyi josh.adams
#rnx

[CL 15270061 by David Harvey in ue5-main branch]
2021-02-01 08:25:01 -04:00
Josh Adams
b0e4357576 - UBT Code changes to remove 32-bit Windows support (C++ code for 32-bit still exists)
#rb marc.audy (concept, not each file)

[CL 15265424 by Josh Adams in ue5-main branch]
2021-01-31 15:09:58 -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
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
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
Marc Audy
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -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
josh adams
aac44c8877 - Fixed up FN to compile after making XboxOne a PlatformExtension
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 13043859 via CL 13043868 via CL 13043871
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v683-13008971)

[CL 13043873 by josh adams in Main branch]
2020-04-24 19:55:45 -04:00
josh adams
a443cf98ad - Moved XboxOne source code into PlatformExtension location (not C#, ThirdParty, or plugins, yet)
#rb none

#ROBOMERGE-SOURCE: CL 13042000 via CL 13042003 via CL 13042011
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v683-13008971)

[CL 13042014 by josh adams in Main branch]
2020-04-24 18:36:00 -04:00
louisphilippe seguin
5b6e4a9a8f Run the LwsWebSocketsModule in its unique thread on forked processes that support multithreading
#ROBOMERGE-SOURCE: CL 12455558 via CL 12455864 via CL 12460976 via CL 12461109
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v672-12450963)

[CL 12461241 by louisphilippe seguin in Main branch]
2020-03-26 17:59:01 -04:00
billy bramer
ce297b32c9 CIS fix against LwsWebSocket.cpp
[FYI] Evan.Kinney


#ROBOMERGE-SOURCE: CL 12390428 via CL 12397566
#ROBOMERGE-BOT: (v671-12333473)

[CL 12397620 by billy bramer in Release-Engine-Staging branch]
2020-03-24 19:24:23 -04:00
evan kinney
52e3a145cb add support for skipping domain whitelisting in LWS connect
#rnx
[at]paul.moore
[FYI] jonathan.kremer, ramon.flores


#ROBOMERGE-SOURCE: CL 12388838 via CL 12388843 via CL 12390206 via CL 12397548
#ROBOMERGE-BOT: (v671-12333473)

[CL 12397604 by evan kinney in Release-Engine-Staging branch]
2020-03-24 19:23:41 -04:00
paul moore
c87397a43f - Fix non-unity compile error
bob.tellez


#ROBOMERGE-SOURCE: CL 12164916 via CL 12164933
#ROBOMERGE-BOT: (v661-12148976)

[CL 12164935 by paul moore in Main branch]
2020-03-13 13:50:18 -04:00
paul moore
dfec453c1e - MMS MCP DNS resolver.
#ROBOMERGE-SOURCE: CL 12163467 via CL 12163470 via CL 12163474 via CL 12163901
#ROBOMERGE-BOT: (v661-12148976)

[CL 12164026 by paul moore in Main branch]
2020-03-13 12:56:08 -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
Juan Canada
2ecf4f9708 Merging //UE4/Dev-Main@10877709 to Dev-RenderPlat-Staging(//UE4/Dev-Rendering)
#rnx
#rb none

[CL 10895568 by Juan Canada in Dev-RenderPlat-Staging branch]
2020-01-07 13:45:01 -05:00