marc audy
ca037cc449
Copying //UE4/Dev-Anim to Dev-Main (//UE4/Dev-Main) [at] 4803512
...
#rb
#rnx
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 4803543 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4804431 by marc audy in Dev-Networking branch]
2019-01-24 16:07:24 -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
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
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
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
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
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
Alexis Matte
e4b95f93a1
Fix Merge tool material issue
...
#rb none
[CL 3986345 by Alexis Matte in Dev-Geometry branch]
2018-04-05 09:26:01 -04:00
Alexis Matte
816c2456c8
Fix partially the Merge actor tests
...
#rb none
[CL 3982657 by Alexis Matte in Dev-Geometry branch]
2018-04-03 18:35:54 -04:00
Matt Kuhlenschmidt
fa6a9e3237
Merging //UE4/Dev-Main to Dev-Geometry (//UE4/Dev-Geometry)
...
#rb none
[CL 3968009 by Matt Kuhlenschmidt in Dev-Geometry branch]
2018-03-27 16:13:55 -04:00
Matt Kuhlenschmidt
238fcb9d83
Merging //UE4/Dev-Main to Dev-Geometry (//UE4/Dev-Geometry)
...
#fyi richard.talbotwatkin, alexis.matte
#rb none
[CL 3928841 by Matt Kuhlenschmidt in Dev-Geometry branch]
2018-03-06 13:26:20 -05:00
Alexis Matte
1119758fae
Change Meshdescription to use FName instead of indexes.
...
#rb none
[CL 3924913 by Alexis Matte in Dev-Geometry branch]
2018-03-05 10:06:09 -05:00
Matt Kuhlenschmidt
68f4525e1b
Merging //UE4/Dev-Main to Dev-Geometry (//UE4/Dev-Geometry)
...
#rb none
[CL 3889612 by Matt Kuhlenschmidt in Dev-Geometry branch]
2018-02-14 14:13:42 -05:00
Alexis Matte
aa84947dfc
Make the mesh description conversion from/to rawmesh
...
Move triangulation from editable mesh to MeshDescription
Fix the edge creation when importing a fbx to mesh description
Add automation tests for mesh description, add some conversion tests
Load orion monolith02 level succesfully using meshdescription instead of rawmesh
#rb none
[CL 3817088 by Alexis Matte in Dev-Geometry branch]
2017-12-28 17:15:00 -05:00
Matt Kuhlenschmidt
92eed46d3f
Merging //UE4/Dev-Main to Dev-Geometry (//UE4/Dev-Geometry)
...
#rb none
[CL 3635882 by Matt Kuhlenschmidt in Dev-Geometry branch]
2017-09-11 10:43:35 -04:00
Mike Fricker
3892ace583
Merging //UE4/Dev-Main to Dev-Geometry (//UE4/Dev-Geometry) (up to CL 3517493)
...
#rb none
[CL 3517961 by Mike Fricker in Dev-Geometry branch]
2017-06-30 12:21:06 -04:00
