James Hopkin
|
235137b0cc
|
Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)
Copying to Dev-Main @ CL# 4688301
#rb none
[CL 4707991 by James Hopkin in Dev-Networking branch]
|
2019-01-11 02:57:03 -05:00 |
|
chris gagnon
|
aad5335ff6
|
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 4676940 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4676943 by chris gagnon in Dev-Networking branch]
|
2019-01-02 15:37:07 -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
|
9843ebaa9f
|
Merging conflict by hand.
/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Plugins/Experimental/GeometryCollectionPlugin/Source/GeometryCollectionEditor/GeometryCollectionEditor.Build.cs - merging //UE4/Main/Engine/Plugins/Experimental/GeometryCollectionPlugin/Source/GeometryCollectionEditor/GeometryCollectionEditor.Build.cs#1
/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Source/Runtime/Experimental/Chaos/Private/Chaos/PBDCollisionConstraint.cpp - merging //UE4/Main/Engine/Source/Runtime/Experimental/Chaos/Private/Chaos/PBDCollisionConstraint.cpp#1
/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Source/Runtime/Experimental/Chaos/Private/Chaos/PBDRigidsEvolution.cpp - merging //UE4/Main/Engine/Source/Runtime/Experimental/Chaos/Private/Chaos/PBDRigidsEvolution.cpp#1
--------------------------------------
Copying //UE4/Dev-Physics to //UE4/Dev-Main.
#rb none
#lockdown Nick.Penwarden
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: michael.lentine
#ROBOMERGE-SOURCE: CL 4653110 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4653305 by ryan gerleve in Dev-Networking branch]
|
2018-12-12 11:43:42 -05:00 |
|
max chen
|
43fe4d6f9b
|
Copying //UE4/Dev-Sequencer to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown nick.penwarden
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: max.chen
#ROBOMERGE-SOURCE: CL 4629913 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4629932 by max chen in Dev-Networking branch]
|
2018-12-04 17:10:23 -05:00 |
|
mark satterthwaite
|
f9d5524e4c
|
Duplicate 4627931
Missing MTLPP_EXPORT tags for various mtlpp types.
#rb none
#lockdown nick.penwarden
#jira UE-67152
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: mark.satterthwaite
#ROBOMERGE-SOURCE: CL 4628482 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4628502 by mark satterthwaite in Dev-Networking branch]
|
2018-12-04 13:19:50 -05:00 |
|
marcus wassmer
|
7fd84ab077
|
Resave other assets with good version
#rb none
#lockdown nick.penwarden
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: marcus.wassmer
#ROBOMERGE-SOURCE: CL 4627797 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4627798 by marcus wassmer in Dev-Networking branch]
|
2018-12-04 11:16:39 -05:00 |
|
marcus wassmer
|
cbba1d1a5a
|
Save with version
#rb none
#lockdown nick.penwarden
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: marcus.wassmer
#ROBOMERGE-SOURCE: CL 4627780 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4627791 by marcus wassmer in Dev-Networking branch]
|
2018-12-04 11:14:06 -05:00 |
|
marcus wassmer
|
f43eb0e188
|
Copying //UE4/Dev-Rendering[at]4626416 to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown nick.penwarden
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: marcus.wassmer
#ROBOMERGE-SOURCE: CL 4626501 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4626516 by marcus wassmer in Dev-Networking branch]
|
2018-12-03 22:27:31 -05:00 |
|
ryan gerleve
|
289a4fa159
|
Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4567513 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4573136 by ryan gerleve in Dev-Networking branch]
|
2018-11-16 14:01:06 -05:00 |
|
ryan gerleve
|
53a3e4eaa8
|
Copying //UE4/Release-Staging-4.21 to Dev-Main (//UE4/Dev-Main) [at] 4547701
#rb
#rnx
#lockdown Nick.Penwarden
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 4547706 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4548022 by ryan gerleve in Dev-Networking branch]
|
2018-11-07 11:34:19 -05:00 |
|
marc audy
|
9e9c0fdb36
|
Copying //UE4/Release-Staging-4.21 to Dev-Main (//UE4/Dev-Main) [at] 4530863
#rb none
#rnx
#lockdown Nick.Penwarden
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 4530881 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4530882 by marc audy in Dev-Networking branch]
|
2018-11-01 09:57:31 -04:00 |
|
yasiman ahsani
|
4bfdf00f5c
|
Adding licenses for Clang, FBX integration code, ISPC texture compressor, OpenColor, PocketSphinx, and RxJava
#rb none
#lockdown Nick.Penwarden
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: yasiman.ahsani
#ROBOMERGE-SOURCE: CL 4524198 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4524199 by yasiman ahsani in Dev-Networking branch]
|
2018-10-30 11:26:26 -04:00 |
|
ben marsh
|
51bd922115
|
Copying //UE4/Release-Staging-4.21 to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4523800 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4523841 by ben marsh in Dev-Networking branch]
|
2018-10-30 10:25:06 -04: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 |
|
Bart Hawthorne
|
deb9115149
|
Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)
#rb none
[CL 4351996 by Bart Hawthorne in Dev-Networking branch]
|
2018-09-07 16:38:29 -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 |
|
Ryan Gerleve
|
e7612e89b2
|
Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)
#rb none
#rnx
[CL 4341874 by Ryan Gerleve in Dev-Networking branch]
|
2018-09-04 14:32:41 -04:00 |
|
Ryan Gerleve
|
bcca42e74a
|
Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)
#rb none
#rnx
[CL 4284864 by Ryan Gerleve in Dev-Networking branch]
|
2018-08-14 15:58:25 -04:00 |
|
Ryan Gerleve
|
58b2ff476e
|
Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)
#rb none
[CL 4227549 by Ryan Gerleve in Dev-Networking branch]
|
2018-07-23 14:41:30 -04:00 |
|
Unrealbot
|
016a58825b
|
Branch snapshot for CL 4205071
[CL 4205071 in Dev-Networking branch]
|
2018-07-16 19:03:53 -04:00 |
|
Ryan Gerleve
|
ac280888a0
|
Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)
#rb none
#rnx
[CL 4175728 by Ryan Gerleve in Dev-Networking branch]
|
2018-06-29 20:48:58 -04:00 |
|
Ryan Gerleve
|
e88617b37e
|
Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)
#rb none
#rnx
[CL 4119306 by Ryan Gerleve in Dev-Networking branch]
|
2018-06-07 22:39:07 -04:00 |
|
Chad Garyet
|
e7986c2138
|
Merging AutoSDK changes into dev-networking
#rb none
#jira none
[CL 4109133 by Chad Garyet in Dev-Networking branch]
|
2018-06-04 10:07:08 -04:00 |
|