jeanluc corenthin
dc7395a7f2
Fixed UE4 references
...
#jira UE-111793
#rb trivial
#ROBOMERGE-SOURCE: CL 15783515 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v783-15756269)
[CL 15789922 by jeanluc corenthin in ue5-main branch]
2021-03-23 21:46:00 -04:00
JeanMichel Dignard
6b9e811737
Renamed UE4.ico to UE.ico for the Datasmith 3dsmax exporter
...
#jira UE-104769
#rb none
[CL 15317915 by JeanMichel Dignard in ue5-main branch]
2021-02-04 12:52:21 -04:00
Marc Audy
cac1fe0019
Merge UE5/Release-Engine-Staging @ CL# 15299266 to UE5/Main
...
This represents UE4/Main @ CL# 15277572
[CL 15299962 by Marc Audy in ue5-main branch]
2021-02-03 14:57:28 -04:00
Marc Audy
a7f9391231
Merge UE5/Release-Engine-Staging @ 14811410 to UE5/Main
...
This represents UE4/Main @ 14768117
For ReleaseObjectVersion.h
#lockdown Marcus.Wassmer
[CL 14811440 by Marc Audy in ue5-main branch]
2020-11-24 18:42:39 -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
JeanMichel Dignard
0902132b6c
Datasmith Max Exporter fix: Disable strict conformance since the 3dsmax sdk isn't compliant.
...
#robomerge release-5.0-m2
[CL 14252568 by JeanMichel Dignard in ue5-main branch]
2020-09-03 09:21:40 -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
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
Matt Kuhlenschmidt
603a4119c5
Fix HAL/PlatformFileManager.h non-portable casing CIS issues
...
#rb none
[CL 13214257 by Matt Kuhlenschmidt in ue5-main branch]
2020-05-06 17:58:18 -04:00
benoit deschenes
3f4df78a67
Integrating CL# 11292240 from Dev-Enterprise
...
Fixing crash in 3ds Max Exporter, autodesk noise map are not supported.
#jira UE-88193
Julien.StJean
#rb Julien.StJean
#ROBOMERGE-SOURCE: CL 11462019 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)
[CL 11462031 by benoit deschenes in 4.25-Plus branch]
2020-02-17 14:07:50 -05:00
benoit deschenes
744f09c6c3
Integrating CL# 11427051 from Dev-Enterprise
...
Fixing 3dsMax exporter crash
#jira UE-86710
#rb none
#ROBOMERGE-SOURCE: CL 11461917 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)
[CL 11461922 by benoit deschenes in 4.25-Plus branch]
2020-02-17 13:59:14 -05:00
JeanMichel Dignard
ccbeb192c3
Datasmith 3dsMax Exporter: More int to bool conversion fixes for operator== that returns an int.
...
#jira UE-88378
#rb none
[CL 11361910 by JeanMichel Dignard in Main branch]
2020-02-11 18:00:12 -05:00
JeanMichel Dignard
dedb269658
Build fix for int to bool implicit conversion
...
#jira UE-88378
#rb none
[CL 11360229 by JeanMichel Dignard in Main branch]
2020-02-11 17:22:57 -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
JeanMichel Dignard
70d074639f
Merging //UE4/Dev-Main @ 10886849 to Dev-Tools-Staging (//UE4/Dev-Tools-Staging)
...
#rb none
#rnx
[CL 10906274 by JeanMichel Dignard in Dev-Tools-Staging branch]
2020-01-08 13:26:18 -05:00
Ryan Durand
9ef3748747
Updating copyrights for Engine Programs.
...
#rnx
#rb none
#jira none
#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869242 in //Fortnite/Release-12.00/... via CL 10869536
#ROBOMERGE-BOT: FORTNITE (Main -> Dev-EngineMerge) (v613-10869866)
[CL 10870955 by Ryan Durand in Main branch]
2019-12-26 23:01:54 -05:00
johan duparc
7f18f950b0
Copy of 10340048 from //UE4/Dev-Enterprise:
...
Datasmith: flag exporters with bBuildInSolutionByDefault = false;
Fixes Github build when the whole solution is being built
#rb JeanMichel.Dignard
#jira UE-86070
#lockdown cristina.riveron
#ROBOMERGE-SOURCE: CL 10811760 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v610-10636431)
[CL 10811763 by johan duparc in Main branch]
2019-12-19 12:34:35 -05:00
JeanLuc Corenthin
276d3af9b8
Copy up //UE4/Dev-Enterprise/... to //UE4/Dev-Tools-Staging/...
...
#rb none
[CL 10371791 by JeanLuc Corenthin in Dev-Tools-Staging branch]
2019-11-22 10:05:55 -05:00
johan duparc
20fd21797b
Datasmith: in solution, renamed Program/Enterprise to Program/Datasmith
...
#rb JeanMichel.Dignard
#jira none
#rnx
#ROBOMERGE-SOURCE: CL 10229353 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v590-10202696)
[CL 10229358 by johan duparc in Main branch]
2019-11-14 17:19:25 -05:00
johan duparc
64eedec497
Removed Itoo (tps) from NotForLicensees
...
#rb none
#jira none
#ROBOMERGE-SOURCE: CL 9893601 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v558-9892490)
[CL 9893603 by johan duparc in Main branch]
2019-10-30 13:44:13 -04:00
johan duparc
6e47d520ab
Remove copy of max 2017 sdk from Enterprise
...
#rb Jerome.Delattre
#jira none
#ROBOMERGE-SOURCE: CL 9735907 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v539-9700858)
[CL 9735952 by johan duparc in Main branch]
2019-10-21 15:02:26 -04:00
JeanMichel Dignard
d4f0f4d3f2
Copying //UE4/Dev-Enterprise @ cl 9420543 to Dev-Main (//UE4/Dev-Main)
...
#rb none
[CL 9420574 by JeanMichel Dignard in Main branch]
2019-10-04 13:11:45 -04:00
