Commit Graph

572 Commits

Author SHA1 Message Date
Marc Audy
8df336162c Copying //UE4/Dev-Anim to Dev-Main (//UE4/Dev-Main) @ 8782600
#rb
#rnx

[CL 8783278 by Marc Audy in Main branch]
2019-09-17 19:12:19 -04: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
Chris Gagnon
2e87118a18 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) Interim 4.24.
#rb none

[CL 8614014 by Chris Gagnon in Main branch]
2019-09-10 11:35:20 -04:00
Marc Audy
a7459b1afc Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 8292949
#rb
#rnx

[CL 8293622 by Marc Audy in Dev-Framework branch]
2019-08-26 10:30:04 -04:00
krzysztof narkowicz
9ea65aa96b New SkyAtmosphere component CLs in FN
Merging using //Fortnite/Main/_to_/UE4/Dev-Rendering
#rb none

Also tested on mobile with Dmitriy.
Improvement and optimisation pending with https://docs.google.com/document/d/17fBBGX_cP9YARfiBU3P9BIElOo2m6IpqJhRXOZvzXa0/edit#heading=h.tuqnyahzdlw8

Integrated / edtigrated CLs are
7555515
7559183
7565353
7577376
7593568
7624000
7785404
7785501
7839046
7861664
7949251
7949481
7951875
7973183

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: sebastien.hillaire
#ROBOMERGE-SOURCE: CL 8020041 via CL 8027701 via CL 8062409
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v400-8057353)

[CL 8070395 by krzysztof narkowicz in Dev-Build branch]
2019-08-16 00:28:28 -04:00
krzysztof narkowicz
c3f806ef7b New SkyAtmosphere component CLs in FN
Merging using //Fortnite/Main/_to_/UE4/Dev-Rendering
#rb none

Also tested on mobile with Dmitriy.
Improvement and optimisation pending with https://docs.google.com/document/d/17fBBGX_cP9YARfiBU3P9BIElOo2m6IpqJhRXOZvzXa0/edit#heading=h.tuqnyahzdlw8

Integrated / edtigrated CLs are
7555515
7559183
7565353
7577376
7593568
7624000
7785404
7785501
7839046
7861664
7949251
7949481
7951875
7973183


#ROBOMERGE-OWNER: krzysztof.narkowicz
#ROBOMERGE-AUTHOR: sebastien.hillaire
#ROBOMERGE-SOURCE: CL 8020041 via CL 8027701
#ROBOMERGE-BOT: (v400-8057353)

[CL 8062409 by krzysztof narkowicz in Main branch]
2019-08-15 13:46:05 -04:00
dave belanger
671f44e6ba Fix Widget Blueprint and Editor Utility icons using Blueprint class icon in menu and for new asset that isn't named yet. Regression caused by 6979887 (that fixed UE-76605).
#rb Vincent.Gauthier
#jira UE-78632

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: dave.belanger
#ROBOMERGE-SOURCE: CL 7949909 in //UE4/Release-4.23/... via CL 7949910
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v398-8029740)

[CL 8035305 by dave belanger in Dev-Build branch]
2019-08-14 12:11:38 -04:00
Ben Hoffman
ece3c0b6e3 Update the slate icon for the level blueprint editor tab to be correct
#jira UE-78626
#rb me
#rnx

[CL 8034121 by Ben Hoffman in Dev-Framework branch]
2019-08-14 11:53:59 -04:00
Marc Audy
1c3be81dca Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 7950634
#rb
#rnx

[CL 7950994 by Marc Audy in Dev-Framework branch]
2019-08-12 12:52:39 -04:00
dave belanger
8bd1f10cb1 Fix Widget Blueprint and Editor Utility icons using Blueprint class icon in menu and for new asset that isn't named yet. Regression caused by 6979887 (that fixed UE-76605).
#rb Vincent.Gauthier
#jira UE-78632

#ROBOMERGE-SOURCE: CL 7949909 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v392-7949540)

[CL 7949910 by dave belanger in Main branch]
2019-08-12 09:39:34 -04:00
Josh Adams
84150c0c8f - Changed the directory structure from /Platforms/Engine to /Engine/Platforms (and .../Project/Platforms)
- Some fixes to get project platform files compiling
#rb ben.marsh

[CL 7294119 by Josh Adams in Dev-Build branch]
2019-07-12 16:09:23 -04:00
Marc Audy
278eda75dd Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 7234503
#rb
#rnx

[CL 7263339 by Marc Audy in Dev-Framework branch]
2019-07-10 13:47:03 -04:00
cody albert
cdddaf98b1 Asset tabs will now use the icon for the generated class instead of the generic blueprint icon. Fixed up issue where widget blueprint icons were no longer appearing. Copy of CL# 6979887 from Dev-Editor
#jira UE-76605
#rb none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: cody.albert
#ROBOMERGE-SOURCE: CL 7228059 in //UE4/Release-4.23/... via CL 7228060
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v367-6836689)

[CL 7237175 by cody albert in Dev-Build branch]
2019-07-09 00:19:40 -04:00
cody albert
b0eaa5ba41 Asset tabs will now use the icon for the generated class instead of the generic blueprint icon. Fixed up issue where widget blueprint icons were no longer appearing. Copy of CL# 6979887 from Dev-Editor
#jira UE-76605
#rb none

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: cody.albert
#ROBOMERGE-SOURCE: CL 7228059 in //UE4/Release-4.23/... via CL 7228060
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v367-6836689)

[CL 7237169 by cody albert in Dev-Anim branch]
2019-07-09 00:19:38 -04:00
cody albert
65c378745e Asset tabs will now use the icon for the generated class instead of the generic blueprint icon. Fixed up issue where widget blueprint icons were no longer appearing. Copy of CL# 6979887 from Dev-Editor
#jira UE-76605
#rb none

#ROBOMERGE-SOURCE: CL 7228059 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7228060 by cody albert in Main branch]
2019-07-08 11:24:36 -04:00
lauren ridge
175f3158bd Adding "Browse To Asset in Content Browser" button and alternate row styling for the Material Analyzer
#rb trivial
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: lauren.ridge
#ROBOMERGE-SOURCE: CL 7095398 via CL 7105765 via CL 7105831
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v367-6836689)

[CL 7131823 by lauren ridge in Dev-Build branch]
2019-06-21 03:15:57 -04:00
lauren ridge
320a8d54f5 Adding "Browse To Asset in Content Browser" button and alternate row styling for the Material Analyzer
#rb trivial
#rnx

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: lauren.ridge
#ROBOMERGE-SOURCE: CL 7095398 via CL 7105765 via CL 7105831
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v367-6836689)

[CL 7131743 by lauren ridge in Dev-Anim branch]
2019-06-21 03:15:12 -04:00
lauren ridge
2877a50bc2 Adding "Browse To Asset in Content Browser" button and alternate row styling for the Material Analyzer
#rb trivial
#rnx


#ROBOMERGE-SOURCE: CL 7095398 via CL 7105765
#ROBOMERGE-BOT: (v367-6836689)

[CL 7105831 by lauren ridge in Main branch]
2019-06-20 11:49:09 -04:00
max chen
2b61878c3e Copying //UE4/Dev-Sequencer to Dev-Main (//UE4/Dev-Main) [at] 6863847
#lockdown nick.penwarden
#rb none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: max.chen
#ROBOMERGE-SOURCE: CL 6863971 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v366-6836689)

[CL 6917141 by max chen in Dev-Build branch]
2019-06-10 16:16:26 -04:00
patrick enfedaque
255e4e6f7e - Landscape Layer System:
New Toggles for Affects Height/Weight
Show Brush Stack always
More brush Undo/Redo fixes
New BP Tool Icons

#rb richard.malo
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 6847988 via CL 6848209 via CL 6849056
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v366-6836689)

[CL 6915634 by patrick enfedaque in Dev-Build branch]
2019-06-10 15:35:47 -04:00
max chen
d1634f22a4 Copying //UE4/Dev-Sequencer to Dev-Main (//UE4/Dev-Main) [at] 6863847
#lockdown nick.penwarden
#rb none

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: max.chen
#ROBOMERGE-SOURCE: CL 6863971 in //UE4/Main/...
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v366-6836689)

[CL 6891117 by max chen in Dev-Anim branch]
2019-06-07 11:31:06 -04:00
Skylonxe
0dd41d93e6 Blueprints: Changed the function icon for pure functions to be green in the My Blueprint list
#jira UE-73225
Adapted from PR #5757: Green pure functions in blueprint function list (Contributed by Skylonxe)

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: michael.noland
#ROBOMERGE-SOURCE: CL 6837540 via CL 6839931 via CL 6840147
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v366-6836689)

[CL 6876575 by michael noland in Dev-Build branch]
2019-06-07 05:52:24 -04:00
chris gagnon
72ba51c5bd Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.23 From CL 6837861
#rb none


#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 6838042 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v366-6836689)

[CL 6874679 by chris gagnon in Dev-Build branch]
2019-06-07 05:27:42 -04:00
Lina Halper
b0bdc590d5 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim)
#lockdown: thomas.sarkanen
#fyi: Laurent.Delayen
#rb: none

[CL 6861656 by Lina Halper in Dev-Anim branch]
2019-06-06 12:33:54 -04:00
Max Chen
259f6d8c80 Sequencer: Fixed a stray '.' that came in from main merge in the icon refactor styles
#rb none
#lockdown nick.penwarden
#jira none

[CL 6857619 by Max Chen in Dev-Sequencer branch]
2019-06-05 20:10:27 -04:00