Commit Graph

10 Commits

Author SHA1 Message Date
Matthew Griffin
bb70b349ce Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update
#lockdown Nick.Penwarden

[CL 2819020 by Matthew Griffin in Main branch]
2016-01-07 08:17:16 -05:00
Ben Marsh
79171001e0 [INTEGRATE] Change 2418473 by James.Golding@JGOLDING-T2781-CODE on 2015/01/26 05:59:50
Make 'add content pack' dialog more robust to missing images
	Copied changes from main branch (CL 2400859) to hopefully ease merging
	#codereview bruce.nesbit, frank.fella

[CL 2419717 by Ben Marsh in Main branch]
2015-01-26 20:18:06 -05:00
bruce nesbit
4e0879df43 Minor stability revisions to feature pack related code.
[CL 2418494 by bruce nesbit in Main branch]
2015-01-26 06:39:22 -05:00
bruce nesbit
daa7a7ca46 Added some valid checks in FContentSourceViewModel::SetupBrushes
[CL 2400859 by bruce nesbit in Main branch]
2015-01-08 09:00:12 -05:00
bruce nesbit
6f095f81dc Added asset/class field to manifest
Added display of asset/class info used to Add Content dialog
Fixed several cut/pasted comments regarding UMG styles that referred to shooter game

[CL 2392502 by bruce nesbit in Main branch]
2014-12-18 10:27:15 -05:00
Frank Fella
a82edb0602 AddContentDialog - Minor additions.
+ Refresh feature packs automatically when they change on disk.
+ Remove drag and drop and batch install, and replace it with a single button for installing in the details section.
+ Don't allow multiple copies of the dialog to be opened.
+ Fix a missing brush visible when resizing the dialog.
+ Fix an issue where brushes in the dialog could get deleted resulting in white images.

[CL 2385434 by Frank Fella in Main branch]
2014-12-11 09:08:57 -05:00
Ben Marsh
149375b14b Update copyright notices to 2015.
[CL 2379638 by Ben Marsh in Main branch]
2014-12-07 19:09:38 -05:00
Frank Fella
0247167c1f AddContentDialog - Remove unused methods from the content source view model.
[CL 2357398 by Frank Fella in Main branch]
2014-11-12 14:49:33 -05:00
Frank Fella
59290a82ca AddContentDialog - Add destructors and undefine loctext namespaces to fix the build.
[CL 2353194 by Frank Fella in Main branch]
2014-11-07 13:16:53 -05:00
Frank Fella
ec05ac91a5 AddContentDialog - A dialog and lower level infrastructure for adding additional content to an existing game. Currently there is only support for the new "feature pack" upack files.
#codereview matt.kuhlenschmidt, nick.atamas

[CL 2353064 by Frank Fella in Main branch]
2014-11-07 09:55:57 -05:00