Commit Graph

46 Commits

Author SHA1 Message Date
carl lloyd
a745d7eb86 Removed ATC/ETC1 and Android PVR texture formats
[at]Chris.babcock [at]Jack.porter
[FYI] [at]Rolando.Caloca [at]Luke.Thatcher
#rb Chris.babcock, Jack.porter, Rolando Caloca
#jira none

#ROBOMERGE-SOURCE: CL 11825686 in //UE4/Release-4.25/... via CL 11825740
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11825801 by carl lloyd in Main branch]
2020-03-02 11:26:01 -05:00
Rolando Caloca
5b82f15def Copying //UE4/Dev-RenderPlat-Staging@11388153 to //UE4/Main
#rb none
#rnx

[CL 11388545 by Rolando Caloca in Main branch]
2020-02-12 13:27:19 -05:00
Josh Adams
aa9705149b Copying Private-LoadTimes-4.24 stream to Main. Biggest changes are in Materials/Shader memory freezing.
#rb none

[CL 11282608 by Josh Adams in Main branch]
2020-02-06 13:13:41 -05:00
Rolando Caloca
bbb9564388 Copying //UE4/Dev-RenderPlat-Staging@11110326 to //UE4/Main
#rb none
#rnx

[CL 11110369 by Rolando Caloca in Main branch]
2020-01-24 18:07:01 -05:00
Juan Canada
2ecf4f9708 Merging //UE4/Dev-Main@10877709 to Dev-RenderPlat-Staging(//UE4/Dev-Rendering)
#rnx
#rb none

[CL 10895568 by Juan Canada in Dev-RenderPlat-Staging branch]
2020-01-07 13:45:01 -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
Rolando Caloca
c2d62c0ecc Copying //UE4/Dev-Rendering@10763356 to //UE4/Dev-RenderPlat-Staging
#rb none
#rnx

[CL 10769097 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2019-12-17 14:14:23 -05:00
Rolando Caloca
1a30325d6f Copying //UE4/Dev-RenderPlat-Staging@9551419 to //UE4/Main
#rb none
#rnx

[CL 9551447 by Rolando Caloca in Main branch]
2019-10-11 15:33:31 -04:00
jeff newquist
1ff08f0bf7 Copying //UE4/Dev-Console to Dev-RenderPlat-Staging (//UE4/Dev-RenderPlat-Staging)
#rb none
#rnx

[CL 9445960 by jeff newquist in Dev-RenderPlat-Staging branch]
2019-10-07 10:54:53 -04:00
joe conley
f2409e2ffa Merging //UE4/Main[at]9314622 to Dev-RenderPlat-Staging
#rb none
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: rolando.caloca
#ROBOMERGE-SOURCE: CL 9315153 in //UE4/Dev-RenderPlat-Staging/...
#ROBOMERGE-BOT: DEVVR (Dev-RenderPlat-Staging -> Dev-VR) (v455-9298202)

[CL 9318813 by joe conley in Dev-VR branch]
2019-10-01 14:25:49 -04:00
Ryan Vance
a05748cb7b Copying //UE4/Partner-MagicLeap-Staging to Dev-VR (//UE4/Dev-VR)
#rb integration
Magic Leap 0.22 SDK integration

[CL 9310486 by Ryan Vance in Dev-VR branch]
2019-09-30 20:02:41 -04:00
steve robb
14cab21e0c Deprecating ARRAY_COUNT and changing it to UE_ARRAY_COUNT.
Replicated from CL# 7924370.

#rb none


#ROBOMERGE-OWNER: steve.robb
#ROBOMERGE-AUTHOR: steve.robb
#ROBOMERGE-SOURCE: CL 9279060 via CL 9279063
#ROBOMERGE-BOT: (v443-9013191)

[CL 9279836 by steve robb in Main branch]
2019-09-28 08:19:35 -04:00
Ben Marsh
421de9107a Fix editor-only plugins triggering recompilation of code projects.
Also rework logic for determining whether a project needs to be compiled, to more closely match equivalent code in UAT. ITargetPlatform::NeedsTempTarget() now allows querying whether a project needs a temporary target to be generated.

#rb none
#jira UE-79833

[CL 8623682 by Ben Marsh in Dev-Build branch]
2019-09-10 16:11:58 -04:00
josh adams
3d282bf6e7 - Added early check before creating a TargetPlatform object if the PlatformInfo will be found (check a static function to see if it's usable before making it)
- Changed each platform's GetTargetPlatform[s] function
#rb none
#jira UE-78692
[FYI] bob.tellez


#ROBOMERGE-SOURCE: CL 7952099 via CL 7954770
#ROBOMERGE-BOT: (v393-7951996)

[CL 7954968 by josh adams in Main branch]
2019-08-12 18:12:07 -04:00
Rolando Caloca
aa0d2303d6 Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) @ 6944469
#rb none
#rnx

[CL 6944849 by Rolando Caloca in Main branch]
2019-06-11 18:27:07 -04:00
Ben Marsh
0cc6e3dca6 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 6631504 by Ben Marsh in Main branch]
2019-05-24 11:51:54 -04:00
rolando caloca
8a9099cbaf UE4.22 - Fix Lumin shaders format
#rnx
#rb none
#jira UE-UE-70308

#ROBOMERGE-SOURCE: CL 5095354 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5095358 by rolando caloca in Main branch]
2019-02-20 14:58:38 -05:00
Marcus Wassmer
68f340a63c Merging //UE4/Dev-Main@4825910 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none
KNOWN BROKEN DO NOT SYNC
#lockdown rolando.caloca

[CL 4827063 by Marcus Wassmer in Dev-Rendering branch]
2019-01-28 21:04:21 -05:00
Ryan Vance
d5aa052fe5 Copying //UE4/Dev-VR to Dev-Main (//UE4/Dev-Main) Souce CL: 4824152
#lockdown: Nick.Penwarden
#rb Integration

[CL 4824851 by Ryan Vance in Main branch]
2019-01-28 16:31:25 -05:00
Marcus Wassmer
cbfcbbb93b Merging //UE4/Dev-Main@4662404 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none
Should be just copyright updates

[CL 4680440 by Marcus Wassmer in Dev-Rendering branch]
2019-01-03 19:16:26 -05:00
Ben Marsh
530369c613 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4662695 by Ben Marsh in Dev-Build branch]
2018-12-14 14:49:12 -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
Ben Marsh
983f6e4d86 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none

[CL 4450587 by Ben Marsh in Dev-Build branch]
2018-10-11 09:04:26 -04:00
jason bestimt
210df791fc Merging CL 4336998 from Dev-VR - Splitting game and client platform info
#RB:josh.adams
#JIRA: UE-63529


#ROBOMERGE-SOURCE: CL 4413107 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4413128 by jason bestimt in Staging-4.21 branch]
2018-10-01 16:12:16 -04:00
Jason Bestimt
06601c192a Moving Lumin SDK Settings back into per project from per user
#lockdown: nick.penwarden
#RB: none

[CL 4312419 by Jason Bestimt in Main branch]
2018-08-23 14:59:04 -04:00