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 |
|
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 |
|
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
|
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
|
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 |
|