Commit Graph

28 Commits

Author SHA1 Message Date
Ben Marsh
0cc6e3dca6 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 6631504 by Ben Marsh in Main branch]
2019-05-24 11:51:54 -04:00
ben marsh
474eae67b2 Fix WebRTCProxy compile errors with VS2019.
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 5990912 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5990937 by ben marsh in Main branch]
2019-04-18 14:39:13 -04:00
stuart hill
8488e7ba61 Prevent the Pixel Streaming Demo from trying to change the resolution to 4K when the user hasn't added the -NvEncH264ConfigLevel=NV_ENC_LEVEL_H264_52 UE4 command line option to UE4.
#rb Alistair.White
#rnx
#jira UE-70299

#ROBOMERGE-SOURCE: CL 5414137 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5414141 by stuart hill in Main branch]
2019-03-15 10:54:06 -04:00
ben marsh
85b97e41c0 Fix shadow variable warnings in WebRTCProxy.
#rb none
#jira

#ROBOMERGE-SOURCE: CL 5312014 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5314696 by ben marsh in Main branch]
2019-03-06 12:44:37 -05:00
alistair white
d2d98fbb1c 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-SOURCE: CL 5286302 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5286303 by alistair white in Main branch]
2019-03-04 12:10:36 -05:00
ben marsh
b00e98899c Use scoped Windows TRUE and FALSE constants.
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 5257396 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5257411 by ben marsh in Main branch]
2019-02-28 18:44:06 -05:00
jerome delattre
7bcbb21e18 Copied from Dev-Enterprise - Fixed some compile errors in the WebRTCProxy caused by increased warning level.
#author Stuart.Hill
#rb Alistair.White
#jira UE-69338

#ROBOMERGE-SOURCE: CL 4883268 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4883270 by jerome delattre in Main branch]
2019-02-04 10:12:13 -05:00
JeanMichel Dignard
fb979d921b Copying //UE4/Dev-Enterprise @ cl 4784880 to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

[CL 4784913 by JeanMichel Dignard in Main branch]
2019-01-23 14:28:06 -05:00
James Hopkin
a9f7efc154 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 4718806

[CL 4732416 by James Hopkin in Dev-Core branch]
2019-01-16 10:11:46 -05:00
Robert Manuszewski
cfa01c09c7 Merging //UE4/Dev-Main to Dev-Core (//UE4/Dev-Core)
#rb none

[CL 4731457 by Robert Manuszewski in Dev-Core branch]
2019-01-16 04:23:12 -05:00
Ben Marsh
a22b952aa9 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 4718806 by Ben Marsh in Main branch]
2019-01-14 12:11:24 -05:00
Ben Marsh
3ce251b66c Fix warnings generating project files.
#rb none
#rnx

[CL 4709822 by Ben Marsh in Dev-Build branch]
2019-01-11 12:07:43 -05:00
Ben Marsh
69428f3503 Fix CIS warning.
#rb none
#rnx

[CL 4706870 by Ben Marsh in Dev-Build branch]
2019-01-10 20:15:41 -05:00
Ben Marsh
129aac0526 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4706788 by Ben Marsh in Dev-Build branch]
2019-01-10 20:03:35 -05:00
Francis Hurteau
57c677da93 Copying //UE4/Dev-Enterprise@4705006 to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

[CL 4705151 by Francis Hurteau in Main branch]
2019-01-10 17:26:53 -05:00
Robert Manuszewski
fa9581a6e6 Merging //UE4/Dev-Main @ 4671600 to Dev-Core (//UE4/Dev-Core)
#rb none

[CL 4675732 by Robert Manuszewski in Dev-Core branch]
2019-01-02 02:43:38 -05:00
Robert Manuszewski
2752c82adc Merging //UE4/Dev-Main @ 4664414 to Dev-Core (//UE4/Dev-Core)
#rb none

[CL 4675693 by Robert Manuszewski in Dev-Core branch]
2019-01-02 00:55:51 -05:00
Ben Marsh
0c830ebcdb Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4671723 by Ben Marsh in Dev-Build branch]
2018-12-20 08:33:57 -05:00
Ben Marsh
b6605d25ff Update some missing copyright strings.
#rb none
#lockdown Nick.Penwarden

[CL 4668760 by Ben Marsh in Main branch]
2018-12-18 13:38:36 -05:00
Ben Marsh
530369c613 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4662695 by Ben Marsh in Dev-Build branch]
2018-12-14 14:49:12 -05:00
Ben Marsh
7598af0532 Update copyright notices to 2019.
#rb none
#lockdown Nick.Penwarden

[CL 4662404 by Ben Marsh in Main branch]
2018-12-14 13:41:00 -05:00
Steve Robb
c3fd29aa64 GitHub #5317 : Fix VARARGS family of macro which would not close the va_list scope as per the standard
#rb martin.ridgers
#jira UE-67022

[CL 4623747 by Steve Robb in Dev-Core branch]
2018-12-03 11:02:49 -05:00
Steve Robb
494a7b9a19 Fix for accidental junk checked in with CL# 4623722.
#rb none

[CL 4623739 by Steve Robb in Dev-Core branch]
2018-12-03 10:58:09 -05:00
Steve Robb
3ecfe5151c TIndirectArray's placement new syntax deprecated, which can cause new/free or malloc/delete mismatches.
Also see UE-64535.

#rb martin.ridgers
#fyi luke.thatcher

[CL 4623722 by Steve Robb in Dev-Core branch]
2018-12-03 10:52:48 -05:00
Ben Marsh
0f022f2f46 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none

[CL 4502641 by Ben Marsh in Dev-Build branch]
2018-10-24 13:03:31 -04:00