izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity
167,746 Commits 23 Branches 254 Tags
088da5f2929e923ac3e18ea94de020d5da8e90c3
Commit Graph

55 Commits

Author SHA1 Message Date
will damon
3af9a4c98d Rebuild OpenSSL 1.1.1k Mac libraries as Universal 2 binaries. 
#rb will.damon
#jira none
[FYI] dave.hunter, pavel.punsky
#rnx

#ROBOMERGE-OWNER: will.damon
#ROBOMERGE-AUTHOR: will.damon
#ROBOMERGE-COMMAND: _robomerge UE5-Main
#ROBOMERGE-SOURCE: CL 16418023 in //UE4/Release-4.27/... via CL 16418059 via CL 16419044
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v811-16416015)
#ROBOMERGE[STARSHIP]: UE5-Main

[CL 16419226 by will damon in ue5-release-engine-test branch]
 2021-05-21 11:01:09 -04:00
Marc Audy
f02d489290 Update Release-Engine-Test from Release-Engine-Staging @ 16264272 
[CL 16264458 by Marc Audy in ue5-release-engine-test branch]
 2021-05-11 01:10:20 -04:00
aurel cordonnier
50944fd712 Merge UE5/RES @ 16162155 to UE5/Main 
This represents UE4/Main @ 16130047 and Dev-PerfTest @ 16126156

[CL 16163576 by aurel cordonnier in ue5-main branch]
 2021-04-29 19:32:06 -04:00
Marc Audy
9753392e2b Merge UE5/RES CL# 15462083 to UE5/Main 
This represents UE4/Main @ 15414221

[CL 15463811 by Marc Audy in ue5-main branch]
 2021-02-18 18:13:28 -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
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
Josh Adams
69ba582188 - Removing Android 32-bit libraries, as a previous changelist removed support in UBT for it 
#fyi chris.babcock,jack.porter
#rb none

[CL 15056352 by Josh Adams in ue5-main branch]
 2021-01-12 17:02:01 -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
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
Ben Marsh
99be00dcdb Merging latest from Private-Starship. 
[CL 13192225 by Ben Marsh in ue5-main branch]
 2020-05-05 18:50:52 -04:00
josh adams
62945c475f - Moving ThirdParty platform files to PlatformExtensions 
#rb none

#ROBOMERGE-OWNER: josh.adams
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 13048826 via CL 13048840 via CL 13048844
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13048916 by josh adams in Main branch]
 2020-04-27 13:58:54 -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
Marcus Wassmer
6517c68ef5 Copying //UE4/Dev-RenderPlat-Staging@8684824 to Dev-Main (//UE4/Dev-Main) 
#rb none

[CL 8684840 by Marcus Wassmer in Main branch]
 2019-09-14 09:45:25 -04:00
Josh Markiewicz
d79515867d Copying //UE4/Dev-Online to Dev-Main (//UE4/Dev-Main) 
- Up to CL8320930 from DevOnline and 8311605 Merge Down from Main
- skipped some Fortnite content/plugins/code where it tried to reintegrate files that had been moved pending investigation
#rb none

[CL 8321295 by Josh Markiewicz in Main branch]
 2019-08-26 18:35:22 -04:00
Joakim Lindqvist
d26625d39d Updated module build configurations to follow our updated guidelines on using a library, you should always specify the full path to the library if you know it (in PublicAdditionalLibraries). This allows UBT to do up to date checking of the module and is faster. 
If you still need to old behavior of searching for a library we use the new PublicSystemLibraries instead (used very sparingly).

Also updated conventions on importing Android libraries to use the newly introduced Android Architecture instead, which is always set to a valid architecuture (unlike Target.Architecture for the general case)

Lastly I updated some build.cs files that were doing filesystem enumeration or copying as they were being parsed, this is highly discouraged (partially because we cache filesystem operations but also it adds a cost to something we expect to be very fast). Any operations like this should be done as part of the build if they have to be done at all.

#rb none

[CL 7918851 by Joakim Lindqvist in Dev-Build branch]
 2019-08-09 03:48:12 -04:00
joe conley
19c83dbe7b #jira UE-78449 - Enable SSL & OpenSSL modules on Lumin 
#rb trivial

#ROBOMERGE-SOURCE: CL 7813288 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v388-7785529)

[CL 7813303 by joe conley in Main branch]
 2019-08-06 14:39:30 -04:00
Jeff Fisher
bcc5bcf128 Copying //UE4/Dev-VR to Main (//UE4/Main) 
-Copy up for 4.23
#rb none

[CL 6911980 by Jeff Fisher in Main branch]
 2019-06-10 12:22:13 -04:00
Michael Kirzinger
5f4e2b4396 Copying //UE4/Dev-Online to Dev-Main (//UE4/Dev-Main) 
Source: //UE4/Dev-Online 4860295

#rb none

[CL 4860323 by Michael Kirzinger in Main branch]
 2019-01-31 15:08:35 -05:00
michael kirzinger
0360202148 apply 7123aa81e9 to openssl to fix crash on intel processors with sha extensions 
[at]rob.cannaday


#ROBOMERGE-SOURCE: CL 4699744

[CL 4699813 by michael kirzinger in Main branch]
 2019-01-10 07:56:13 -05:00
Ben Marsh
7598af0532 Update copyright notices to 2019. 
#rb none
#lockdown Nick.Penwarden

[CL 4662404 by Ben Marsh in Main branch]
 2018-12-14 13:41:00 -05:00
Arciel Rekman
4141229f52 Copying //UE4/PQ-Staging@3957047 to Dev-Main (//UE4/Dev-Main) 
#rb Ben.Marsh
#fyi Josh.Adams
#lockdown Nick.Penwarden

[CL 3957060 by Arciel Rekman in Main branch]
 2018-03-21 11:09:41 -04:00
Marc Audy
7a0f229e8d Copying //UE4/Fortnite-Staging to //UE4/Dev-Main (Source: //Fortnite/Main/Engine @ 3876564) 
#lockdown Nick.Penwarden
#rnx
#rb none

[CL 3903710 by Marc Audy in Main branch]
 2018-02-22 11:25:06 -05:00
Ben Marsh
13d012685f Merging copyright update from 4.19 branch. 
#rb none
#rnx
#jira

[CL 3818977 by Ben Marsh in Staging-4.19 branch]
 2018-01-02 15:30:26 -05:00