Commit Graph

7 Commits

Author SHA1 Message Date
Richard TalbotWatkin
552ab7a3cd Renaming an asset with no source control now prompts the user to connect to source control or make the file writable before performing the operaton.
#jira UE-7510 - Failed to save when renaming asset

[CL 2411056 by Richard TalbotWatkin in Main branch]
2015-01-19 12:51:54 -05:00
Bob Tellez
1e8ad7d421 [AUTOMERGE]
#UE4 Renaming assets no longer attempts to load all their referencers. This happens earlier in the rename process and is corretly skipped if being referenced by a map or already checked into SCC.

--------
Integrated using branch Ue4-To-UE4-Fortnite-Simple (reversed) of change#2401575 by Bob.Tellez on 2015/01/08 21:19:31.

[CL 2401576 by Bob Tellez in Main branch]
2015-01-08 21:19:58 -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
Richard TalbotWatkin
e486e8614c Fixed crash moving assets which are checked out to another user. Fixed bug where asset move happens before the user is given the chance to cancel in the source control dialog.
#ttp 348063 - Crash moving files in Content Browser
#branch UE4
#proj Developer.AssetTools, Editor.ContentBrowser, Editor.PackagesDialog, Editor.UnrealEd

[CL 2328547 by Richard TalbotWatkin in Main branch]
2014-10-14 10:33:22 -04:00
Jaroslaw Palczynski
cfcda1df30 CORE: In-editor fixup redirects not working with string asset ref
TTP# 341126

[CL 2230254 by Jaroslaw Palczynski in Main branch]
2014-07-24 13:25:23 -04:00
Daniel Broder
1b562a7b22 Merging using UE4-Fortnite-To-UE4 using CL 2058592.
Removed UENUM() from EMyTownBuildingsWidgetSorting and EMyFortRatingStarSize to fix compile issues and because UENUM() was unnecessary.

Also made hand-fix to UAIHotSpotRenderingComponent by removing HeaderGroup (obsolete).

Did not merge TRV_HAF_Outer_012_lower_border or TRV_HAF_Outer_030 umaps due to conflicts and based on advice from Stefan.

[CL 2060490 by Daniel Broder in Main branch]
2014-04-30 17:34:38 -04:00
Tim Sweeney
324683ce78 Engine source (Main branch up to CL 2026164) 2014-03-14 14:13:41 -04:00