Commit Graph

14 Commits

Author SHA1 Message Date
aurel cordonnier
a12d56ff31 Merge from Release-Engine-Staging @ 17791557 to Release-Engine-Test
This represents UE4/Main @17774255, Release-5.0 @17791557 and Dev-PerfTest @17789485

[CL 17794212 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-12 21:21:22 -04:00
axel riffard
d1c74ebf35 iOS Icon Refactor step 3 : auto generate iOS icons from Marketing Icon
#jira UE-72584
#rb jack.porter

#ROBOMERGE-SOURCE: CL 17243716 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v855-17104924)

[CL 17243725 by axel riffard in ue5-release-engine-test branch]
2021-08-20 00:14:21 -04:00
Josh Adams
b0e4357576 - UBT Code changes to remove 32-bit Windows support (C++ code for 32-bit still exists)
#rb marc.audy (concept, not each file)

[CL 15265424 by Josh Adams in ue5-main branch]
2021-01-31 15:09:58 -04:00
David Lesage
a7cbea39c7 #Jira 103813 UE4 Static Analysis - surface_io.h - illegal character
#Jira 103815 UE4 Static Analysis - FreeImage.h - illegal character
the file surface_io.h contained � and � illegal characters at the line 281
  ...The �natural� normal ...
They have been replace by ". A request has been done to CT to fix the original file.
the file FreeImage contained � illegal characher at line 6:
// - Herv� Drolon (drolon@infonie.fr).
It had been replace by a "e"

#rb jeanluc.corenthin

[CL 14839789 by David Lesage in ue5-main branch]
2020-12-02 18:48:59 -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
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
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
ryan durand
5954c1f85b Updating remaining copyrights in Engine.
#rnx
#rb none


#ROBOMERGE-SOURCE: CL 10869250 via CL 10869537 via CL 10869906
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870965 by ryan durand in Main branch]
2019-12-26 23:08:00 -05:00
johan duparc
e259024898 FreeImage: add support for Mac platform
- minor edit to freeimage.h to prevent redefinition of BOOL on osx
#jira UEENT-2953
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 10085641 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v574-10069753)

[CL 10085644 by johan duparc in Main branch]
2019-11-08 14:12:33 -05:00
Johan Duparc
612526ad3a Copy of 9484211 from //UE4/Dev-Enterprise-Minimal:
FreeImage:
- add support for Linux

#rb none
#jira UEENT-2953

[CL 9620592 by Johan Duparc in 4.24 branch]
2019-10-16 14:00:43 -04:00
Johan Duparc
6bac11953d Copy of 9481035 from //UE4/Dev-Enterprise-Minimal:
FreeImage:
- update to FreeImage 3.18.0
- update associated tps file
- more robust integration for client modules

#rb none
#jira UEENT-2953

[CL 9620518 by Johan Duparc in 4.24 branch]
2019-10-16 13:50:55 -04:00
Ben Marsh
dd5bd154bc Fix bad RuntimeDependencies
#jira UE-81785, UE-81784
#rb none
#rnx

[CL 9598862 by Ben Marsh in 4.24 branch]
2019-10-15 13:41:16 -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