alistair white
|
9fdea3be2c
|
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: ryan.gerleve
#ROBOMERGE-AUTHOR: alistair.white
#ROBOMERGE-SOURCE: CL 5286302 in //UE4/Release-4.22/... via CL 5286303
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5289573 by alistair white in Dev-Networking branch]
|
2019-03-04 16:59:44 -05:00 |
|
ben marsh
|
1c428ef3ed
|
Use scoped Windows TRUE and FALSE constants.
#rb none
#rnx
#jira
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5257396 in //UE4/Release-4.22/... via CL 5257411
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5268988 by ben marsh in Dev-Networking branch]
|
2019-03-01 15:18:13 -05:00 |
|
jerome delattre
|
dcb389d0b7
|
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-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jerome.delattre
#ROBOMERGE-SOURCE: CL 4883268 in //UE4/Release-4.22/... via CL 4883270
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4885176 by jerome delattre in Dev-Networking branch]
|
2019-02-04 12:51:25 -05:00 |
|
ryan gerleve
|
efd1e98234
|
Resolving conflict.
/src/ROBOMERGE_ENGINE_Dev_Networking/Enterprise/Plugins/Editor/DatasmithFBXImporter/Source/DatasmithDeltaGenImporter/Private/DatasmithDeltaGenImporterAuxFiles.cpp - merging //UE4/Main/Enterprise/Plugins/Editor/DatasmithFBXImporter/Source/DatasmithDeltaGenImporter/Private/DatasmithDeltaGenImporterAuxFiles.cpp#1
/src/ROBOMERGE_ENGINE_Dev_Networking/Enterprise/Plugins/Editor/DatasmithFBXImporter/Source/DatasmithDeltaGenImporter/Private/DatasmithDeltaGenImporterAuxFiles.h - merging //UE4/Main/Enterprise/Plugins/Editor/DatasmithFBXImporter/Source/DatasmithDeltaGenImporter/Private/DatasmithDeltaGenImporterAuxFiles.h#1
/src/ROBOMERGE_ENGINE_Dev_Networking/Enterprise/Plugins/Editor/MDLImporter/Source/MDLImporter/Private/MDLImporterFactory.h - merging //UE4/Main/Enterprise/Plugins/Editor/MDLImporter/Source/MDLImporter/Private/MDLImporterFactory.h#1
--------------------------------------
Copying //UE4/Dev-Enterprise [at] cl 4784880 to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jeanmichel.dignard
#ROBOMERGE-SOURCE: CL 4784913 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4788073 by ryan gerleve in Dev-Networking branch]
|
2019-01-23 16:05:15 -05:00 |
|
robert manuszewski
|
be36beb7e4
|
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 4772220 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4782699 by robert manuszewski in Dev-Networking branch]
|
2019-01-23 09:49:18 -05:00 |
|
ben marsh
|
cf4a18955c
|
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4718806 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4718825 by ben marsh in Dev-Networking branch]
|
2019-01-14 12:15:37 -05:00 |
|
ryan gerleve
|
b41214417e
|
Resolving conflict from Dev-Enterprise.
/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Source/Runtime/Sockets/Private/BSDSockets/SocketsBSD.cpp - merging //UE4/Main/Engine/Source/Runtime/Sockets/Private/BSDSockets/SocketsBSD.cpp#20
--------------------------------------
Copying //UE4/Dev-Enterprise[at]4705006 to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: francis.hurteau
#ROBOMERGE-SOURCE: CL 4705151 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4712032 by ryan gerleve in Dev-Networking branch]
|
2019-01-11 14:26:15 -05:00 |
|
ben marsh
|
30a922878e
|
Update some missing copyright strings.
#rb none
#lockdown Nick.Penwarden
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4668760 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4668762 by ben marsh in Dev-Networking branch]
|
2018-12-18 13:38:45 -05:00 |
|
ben marsh
|
2b46ba7b94
|
Update copyright notices to 2019.
#rb none
#lockdown Nick.Penwarden
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4662404 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4662413 by ben marsh in Dev-Networking branch]
|
2018-12-14 13:44:01 -05:00 |
|
Ryan Gerleve
|
9af1fb3463
|
Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)
#rb none
#rnx
[CL 4516466 by Ryan Gerleve in Dev-Networking branch]
|
2018-10-29 10:01:28 -04:00 |
|
Ryan Gerleve
|
f20cd46b96
|
Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)
#rb none
#rnx
[CL 4344260 by Ryan Gerleve in Dev-Networking branch]
|
2018-09-05 10:17:10 -04:00 |
|