Commit Graph

33 Commits

Author SHA1 Message Date
Marc Audy
50a3d7d368 Merge Release-Engine-Staging to Main @ CL# 14467590
This represents UE4/Main @ 14432125 + some cherrypick fixes

[CL 14468207 by Marc Audy in ue5-main branch]
2020-10-09 22:42:26 -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
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
Ben Marsh
99be00dcdb Merging latest from Private-Starship.
[CL 13192225 by Ben Marsh in ue5-main branch]
2020-05-05 18:50:52 -04:00
alistair white
03c9953f34 Merging 11279208
For the Pixel Streaming Signalling Web Server, add an error code for the disconnect player event.

#jira UEENT-3397
#rb Stuart.Hill

#ROBOMERGE-SOURCE: CL 12350736 in //UE4/Release-4.25/... via CL 12350738
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v671-12333473)

[CL 12350754 by alistair white in Main branch]
2020-03-20 17:05:41 -04:00
alistair white
21c2b3cdbf Integrating 11824451
Swapping Bcrypt node module to native js version
Adding npm console commands to ease usage

#jira: UE-89833
#rb: Stuart.Hill

#ROBOMERGE-SOURCE: CL 11851819 in //UE4/Release-4.25/... via CL 11851825
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11851829 by alistair white in Main branch]
2020-03-03 04:40:44 -05:00
JeanMichel Dignard
84facd6d15 Copy from dev-enterprise cl 11097196
#rb none
#rnx

[CL 11099277 by JeanMichel Dignard in Dev-Tools-Staging branch]
2020-01-23 16:28:59 -05:00
Ryan Durand
9ef3748747 Updating copyrights for Engine Programs.
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869242 in //Fortnite/Release-12.00/... via CL 10869536
#ROBOMERGE-BOT: FORTNITE (Main -> Dev-EngineMerge) (v613-10869866)

[CL 10870955 by Ryan Durand in Main branch]
2019-12-26 23:01:54 -05:00
Marco Anastasi
c705a52562 * Fixed wrong mouse pointer position offset when flipping the "Enlarge Display to Fill Window" toggle
#rb stuart.hill
#rnx

[CL 10418791 by Marco Anastasi in Main branch]
2019-11-25 11:58:10 -05:00
alistair white
61018a3852 Merging 9546470 from //UE4/Dev-CharacterTech to //UE4/Release-4.24
For Pixel Streaming added a client-side AFK system which will disconnect inactive users. It will first warn the user after a period of inactivty that they are to be disconnected and a countdown will be shown. If the user does not click then they will be disconnected.
This is configurated in app.js as follows:
afk.enabled: Set this to true to activate the AFK system; default false.
afk.warnTimeout: Set this to the number of seconds of inactivity before the warning overlay is displayed; default 120 seconds.
afk.closeTimeout: Set this to the number of seconds the warning overlay will be displayed before the user is disconnected (unless they click); default 10 seconds.

#jira FORT-207270
#rb Alistair.White
[RN] Added a client-side AFK system which will disconnect inactive users.

#ROBOMERGE-SOURCE: CL 9688071 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v538-9681622)

[CL 9688076 by alistair white in Main branch]
2019-10-18 09:20:33 -04:00
Andriy Tylychko
9f65ad43a6 Merging //UE4/Private-3Lateral_Streaming to Main (//UE4/Main)
This mainly covers the new Pixel Streaming plugin version along with minor changes to other parts of the engine:
* removed multiple copies of FThread as it's now a part of Core
* changes to SlateUser required to fix user input in Pixel Streaming

This wasn't formally reviewed due to the size of Pixel Streaming changes, but was skimmed over by Zack Letters before integration

#rb zack.letters

[CL 9486237 by Andriy Tylychko in Main branch]
2019-10-09 08:21:27 -04:00
JeanMichel Dignard
d4f0f4d3f2 Copying //UE4/Dev-Enterprise @ cl 9420543 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 9420574 by JeanMichel Dignard in Main branch]
2019-10-04 13:11:45 -04:00
Stuart Hill
9391b31bb3 Merge Pixel Streaming code //UE4/Dev-Enterprise@8224093 -> //UE4/Main/
Also merge build break fixes 8224117, 8224125, 8225640.

Allow Pixel Streaming to stop streaming and to send a freeze frame JPEG for the browser to display. This is for situations where the camera is not moving and nothing is animated in the scene, so the user will not perceive and difference, other than the JPEG being higher quality perhaps.
This is controlled by two new Blueprint functions: FreezeFrame and UnfreezeFrame. FreezeFrame may be supplied with a texture which will be used for the freeze frame. If this is not supplied then the back buffer will be captured and used as the freeze frame, acting as an impostor for the suspended video stream.

#rb none

[CL 8374931 by Stuart Hill in Main branch]
2019-08-29 15:12:58 -04:00
Joakim Lindqvist
d26625d39d Updated module build configurations to follow our updated guidelines on using a library, you should always specify the full path to the library if you know it (in PublicAdditionalLibraries). This allows UBT to do up to date checking of the module and is faster.
If you still need to old behavior of searching for a library we use the new PublicSystemLibraries instead (used very sparingly).

Also updated conventions on importing Android libraries to use the newly introduced Android Architecture instead, which is always set to a valid architecuture (unlike Target.Architecture for the general case)

Lastly I updated some build.cs files that were doing filesystem enumeration or copying as they were being parsed, this is highly discouraged (partially because we cache filesystem operations but also it adds a cost to something we expect to be very fast). Any operations like this should be done as part of the build if they have to be done at all.

#rb none

[CL 7918851 by Joakim Lindqvist in Dev-Build branch]
2019-08-09 03:48:12 -04:00
zzz77
97e4a99783 PR #6033: Fixes for IntelliSense (Contributed by zzz77)
#rb none
#rnx

[CL 7308593 by Ben Marsh in Dev-Build branch]
2019-07-15 10:09:44 -04:00
stuart hill
2ae2063ad0 Copy of 6989699 to from //UE4/Dev-Enterprise:
Allow the address (as well as the port) of UE4 to be given to the Proxy. This allows us to test the Proxy when UE4 is not on the local machine.

[RN] Changed the -UE4 option of the WebRTC Proxy from -UE4Port=<Port> to -UE4=<IP:Port>. Previously the IP was hard-coded to localhost; now you may have the UE4 and WebRTC Proxy instances on separate machines.
#rb none
#jira none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: stuart.hill
#ROBOMERGE-SOURCE: CL 7050456 in //UE4/Release-4.23/... via CL 7050466
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v367-6836689)

[CL 7121366 by stuart hill in Dev-Build branch]
2019-06-21 01:31:27 -04:00
Ben Marsh
cfe09c649f Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 6922670 by Ben Marsh in Dev-Build branch]
2019-06-10 19:47:29 -04:00
Josh Adams
1e4b186150 - Big update to platforms: PlatformExtensions
- This allows for Confidential platforms to exist outside of the engine, and insert themselves in as needed
- Directory structure is, where .... mirrors the directory structure for Engine and projects
     - /Platforms/XXX/....
- Moving to more data driven approach for ShaderPlatforms and PlatformInfo, where they can be read from DataDrivenPlatformInfo.ini files that live in the platform config folders
- Removed platform mentions from UBT, by way of changing some enums to partial classes with static members (see UnrealTargetPlatform)
- Various other UBT/UAT modifications to allow for looking in other locations for files
- THIS IS NOT A COMPLETE AND FINAL SOLUTION. WE WILL CONTINUE WORK IN DEV-BUILD BEFORE ITS READY FOR PRIMETIME
#rb ben.marsh

[CL 6271418 by Josh Adams in Dev-Build branch]
2019-05-03 08:03:23 -04:00
ben marsh
5d2e4bc196 Fix WebRTCProxy compile errors with VS2019.
#rb none
#rnx
#jira

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5990912 in //UE4/Release-4.22/... via CL 5990937
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 6000161 by ben marsh in Dev-Build branch]
2019-04-18 21:29:24 -04:00
Ben Marsh
07e535411b Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 5435186 by Ben Marsh in Dev-Build branch]
2019-03-18 16:38:36 -04:00
ben marsh
3c87843b97 Fix shadow variable warnings in WebRTCProxy.
#rb none
#jira

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5312014 in //UE4/Release-4.22/... via CL 5314696
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5328941 by ben marsh in Dev-Build branch]
2019-03-06 18:30:45 -05:00
alistair white
768fc59440 Change Show FPS to button since we don't have the current shown state and so can't update the UI appropriately to it's current state.
#jira UE-70807
#rb: Stuart.Hill

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: alistair.white
#ROBOMERGE-SOURCE: CL 5286302 in //UE4/Release-4.22/... via CL 5286303
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5289583 by alistair white in Dev-Build branch]
2019-03-04 16:59:54 -05:00
ben marsh
fdbc727716 Use scoped Windows TRUE and FALSE constants.
#rb none
#rnx
#jira

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5257396 in //UE4/Release-4.22/... via CL 5257411
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5265957 by ben marsh in Dev-Build branch]
2019-03-01 15:00:56 -05:00
Ben Marsh
c34dc5a8cf Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4932473 by Ben Marsh in Dev-Build branch]
2019-02-07 10:01:58 -05:00
Ben Marsh
6b22106b31 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4798655 by Ben Marsh in Dev-Build branch]
2019-01-24 08:36:47 -05:00