julien lheureux
a460459eed
Added possibility to get asset data from history, with a max fetch size (until we have a better solution)
...
Changed the way we associate shelved files with their local filename to facilitate mapping (perforce operations)
Implemented what was needed on the SCC side to support diff against shelve
Improved way we display object names for deleted & shelved files
#rb sebastien.lussier
[CL 15356101 by julien lheureux in ue5-main branch]
2021-02-08 09:36:20 -04:00
Marc Audy
bc88b73a29
Merge Release-Engine-Staging to Main @ CL# 15151250
...
Represents UE4/Main @ 15133763
[CL 15158774 by Marc Audy in ue5-main branch]
2021-01-21 16:22:06 -04:00
Marc Audy
bf80889353
UE5/Release-Engine-Staging to UE5/Main
...
This represents UE4/Main up to CL# 14958402
[CL 15028197 by Marc Audy in ue5-main branch]
2021-01-08 19:56:07 -04:00
Alexis Matte
786b0446b7
Make sure the Fbx parser have the fbx sdk scene loaded all the time the translator is active.
...
#jira none
#rb richard.talbotwatkin
[CL 14666644 by Alexis Matte in ue5-main branch]
2020-11-05 13:48:16 -04:00
Marc Audy
4c1bb11c29
Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662
...
This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck
[CL 14551026 by Marc Audy in ue5-main branch]
2020-10-22 19:19:16 -04:00
Marc Audy
50a3d7d368
Merge Release-Engine-Staging to Main @ CL# 14467590
...
This represents UE4/Main @ 14432125 + some cherrypick fixes
[CL 14468207 by Marc Audy in ue5-main branch]
2020-10-09 22:42:26 -04:00
Marcus Wassmer
3b81cf8201
Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
...
autoresolved files
#rb none
[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -04:00
Alexis Matte
319bbc5550
Make sure all interchange namespace respect the coding standard
...
#jira none
#rb jeanmichel.dignard
[CL 14379943 by Alexis Matte in ue5-main branch]
2020-09-23 15:40:10 -04:00
Fred Kimberley
eb2edb9b69
Adding lightweight instances subsystem for gameplay objects.
...
Lightweight instances allow a low memory representation of objects. Instances can be converted into full actors when necessary. Actors can also be reduced down to light weight instances when the full representation is no longer needed.
Hit results now return a handle that may refer to either an actor or lightweight instance.
#rb Michael.Noland
[CL 14369221 by Fred Kimberley in ue5-main branch]
2020-09-22 15:55:19 -04:00
Marc Audy
7379fa99c5
Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14229157
...
[CL 14233282 by Marc Audy in ue5-main branch]
2020-09-01 14:07:48 -04:00
Marc Audy
a7c9001a94
Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
...
#rb
#rnx
[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -04:00
Alexis Matte
78fa2d6e35
Interchange framework initial commit. This is an experimental feature that is off by default
...
#jira none
#rb jeanmichel.dignard, jeanluc.corenthin, johan.duparc, danny.couture
[CL 13935912 by Alexis Matte in ue5-main branch]
2020-07-23 14:33:55 -04:00
Marc Audy
11f5b21210
Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)
...
#rnx
[CL 13753156 by Marc Audy in ue5-main branch]
2020-06-23 18:40:00 -04:00
benoit deschenes
ec5edba1ae
Integrating CL#11136074 from Dev-Enterprise
...
Fixing Python asset import task returning wrong path when not combining mesh.
#jira UE-72503
#rb none
#ROBOMERGE-SOURCE: CL 11461632 in //UE4/Release-4.25/... via CL 11461660
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)
[CL 11462399 by benoit deschenes in Main branch]
2020-02-17 14:23:08 -05:00
benoit deschenes
ab17f991c8
Integrating CL#11136074 from Dev-Enterprise
...
Fixing Python asset import task returning wrong path when not combining mesh.
#jira UE-72503
#rb none
#ROBOMERGE-SOURCE: CL 11461632 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)
[CL 11461660 by benoit deschenes in 4.25-Plus branch]
2020-02-17 13:39:58 -05:00
dave belanger
a32107b87c
Add option on whether to prompt user with checkout dialog in AssetFixUpRedirectors and use it to avoid pop-up in PPID generation.
...
#rb Rex.Hill
#ROBOMERGE-SOURCE: CL 11447143 via CL 11447144 via CL 11447146
#ROBOMERGE-BOT: (v654-11333218)
[CL 11447152 by dave belanger in Main branch]
2020-02-14 15:01:22 -05:00
rex hill
0d4303b088
Fix asset bulk export not having filename
...
#jira UE-88007
[FYI] Marc.Audy
#rnx
#ROBOMERGE-SOURCE: CL 11216103 via CL 11216109 via CL 11216118
#ROBOMERGE-BOT: (v644-11213502)
[CL 11227465 by rex hill in Main branch]
2020-02-04 20:10:45 -05:00
Chris Gagnon
76c6bcbfeb
UE4 Main merged to Dev-Tools-Staging at CL 11164391
...
#rb none
[CL 11171981 by Chris Gagnon in Dev-Tools-Staging branch]
2020-01-29 20:39:37 -05:00
Max Chen
b4881d8bf8
Copying //UE4/Dev-Editor to Dev-Tools-Staging (//UE4/Dev-Tools-Staging) @11123875
...
#rb none
#jira none
[CL 11123880 by Max Chen in Dev-Tools-Staging branch]
2020-01-27 20:11:15 -05:00
JeanMichel Dignard
84facd6d15
Copy from dev-enterprise cl 11097196
...
#rb none
#rnx
[CL 11099277 by JeanMichel Dignard in Dev-Tools-Staging branch]
2020-01-23 16:28:59 -05:00
Lina Halper
44c1bb3292
COPY from //Dev-Anim to //Dev-Main
...
#rb: none
#fyi: Laurent.Delayen, Thomas.Sarkanen
[CL 11088765 by Lina Halper in Main branch]
2020-01-22 17:58:55 -05:00
lauren barnes
8608c8e7ff
Migrate now correctly checks for packages outside the source packages' root directory, and will not add those to the dependency list.
...
#jira UE-85015
#rb Frank.Fella
#rnx
#ROBOMERGE-SOURCE: CL 11075462 via CL 11075477
#ROBOMERGE-BOT: (v637-11041722)
[CL 11075480 by lauren barnes in Main branch]
2020-01-21 14:59:26 -05:00
rex hill
63f58eda9f
Allow plugins to control which folders are writable
...
#rb jamie.dale
#ROBOMERGE-SOURCE: CL 11075022 via CL 11075023 via CL 11075025
#ROBOMERGE-BOT: (v637-11041722)
[CL 11075026 by rex hill in Main branch]
2020-01-21 14:04:13 -05:00
ryan durand
471d972e62
Updating copyright for Engine Developer.
...
#rnx
#rb none
#ROBOMERGE-SOURCE: CL 10869240 via CL 10869516 via CL 10869902
#ROBOMERGE-BOT: (v613-10869866)
[CL 10870584 by ryan durand in Main branch]
2019-12-26 15:32:37 -05:00
sebastian nordgren
8335597d9d
Added DuplicateAssetWithDialogAndTitle() to IAssetTools, which allows for the user to specify a title for the asset saving dialog that is displayed.
...
#rb frank.fella
#ROBOMERGE-SOURCE: CL 10760652 via CL 10760653
#ROBOMERGE-BOT: (v610-10636431)
[CL 10760656 by sebastian nordgren in Main branch]
2019-12-17 04:37:20 -05:00
