diff --git a/CHANGELOG b/CHANGELOG index a61990778b..7d92929a72 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -16,8 +16,9 @@ NEW: Added a setting for team health bar colors. Asset Browser: Fixed crashes when trying to load invalid filenames or sprites with just 1 frame. - Added support for browsing the folders for R8 files. + Added support for all sprite types. Added palette chooser and colorpicker dropdown boxes. + Overhauled layout. Red Alert: Added MAD Tank. Fixed a crash in Monster Tank Madness. @@ -122,6 +123,7 @@ NEW: OpenRA.Utility --png will now generate a set of frames for any sprite type [shp(td)/shp(ts)/shp(d2)/r8/tmp(td)/tmp(ra)]. OpenRA.Utility --shp now requires a list of frames to be combined into a shp. Removed Utility --tmp-png, --r8, --fromd2 commands (use --png instead). + Removed Asset Browser file extraction / conversion (use the Utility instead). Unified sprite loading allows any sprite type to be used anywhere: shp can now be used for terrain, and tmp for units. 20130915: diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj index eba63a2dde..bececf0c2e 100644 --- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj +++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj @@ -33,9 +33,9 @@ true - true + True full - false + False bin\Debug\ DEBUG;TRACE prompt @@ -47,17 +47,17 @@ AllRules.ruleset - true + True pdbonly - true + True TRACE prompt 4 bin\Release\ AllRules.ruleset - true + True @@ -70,14 +70,13 @@ - - False - ..\thirdparty\ICSharpCode.SharpZipLib.dll - ..\thirdparty\Mono.Nat.dll False + + ..\thirdparty\ICSharpCode.SharpZipLib.dll + @@ -444,7 +443,6 @@ - @@ -481,7 +479,7 @@ - {e915a0a4-2641-4f7e-8a88-8f123fa88bf1} + {E915A0A4-2641-4F7E-8A88-8F123FA88BF1} LuaInterface @@ -495,7 +493,7 @@ False - {85b48234-8b31-4be6-af9c-665cc6866841} + {85B48234-8B31-4BE6-AF9C-665CC6866841} OpenRA.Irc diff --git a/OpenRA.Mods.RA/Widgets/Logic/AssetBrowserLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/AssetBrowserLogic.cs index 2c7adaaad3..44f88cbe9e 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/AssetBrowserLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/AssetBrowserLogic.cs @@ -35,6 +35,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic PaletteFromFile currentPalette; + static readonly string[] AllowedExtensions = { ".shp", ".r8", ".tem", ".des", ".sno", ".int" }; + [ObjectCreator.UseCtor] public AssetBrowserLogic(Widget widget, Action onExit, World world) { @@ -60,6 +62,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic var paletteDropDown = panel.Get("PALETTE_SELECTOR"); paletteDropDown.OnMouseDown = _ => ShowPaletteDropdown(paletteDropDown, world); + paletteDropDown.GetText = () => currentPalette.Name; var colorPreview = panel.Get("COLOR_MANAGER"); colorPreview.Color = Game.Settings.Player.Color; @@ -80,7 +83,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic frameSlider.OnChange += x => { spriteWidget.Frame = (int)Math.Round(x); }; frameSlider.GetValue = () => spriteWidget.Frame; - panel.Get("FRAME_COUNT").GetText = () => "{0}/{1}".F(spriteWidget.Frame, spriteWidget.FrameCount); + panel.Get("FRAME_COUNT").GetText = () => "{0} / {1}".F(spriteWidget.Frame + 1, spriteWidget.FrameCount + 1); playButton = panel.Get("BUTTON_PLAY"); playButton.OnClick = () => @@ -118,96 +121,15 @@ namespace OpenRA.Mods.RA.Widgets.Logic template = panel.Get("ASSET_TEMPLATE"); PopulateAssetList(); - var modID = Game.modData.Manifest.Mod.Id; - - // TODO: This should not invoke the OpenRA.Utility.exe, but use it's functions directly. - // TODO: Does not work with SHP(TS) yet?! - panel.Get("EXPORT_BUTTON").OnClick = () => - { - var ExtractGameFiles = new string[][] - { - new string[] { "--extract", modID, currentPalette.Filename, "--userdir" }, - new string[] { "--extract", modID, "{0}.shp".F(spriteWidget.Image), "--userdir" }, - }; - - var ExportToPng = new string[][] - { - new string[] { "--png", Platform.SupportDir + "{0}.shp".F(spriteWidget.Image), Platform.SupportDir + currentPalette.Filename }, - }; - - var ImportFromPng = new string[][] { }; - - var args = new WidgetArgs() - { - { "ExtractGameFiles", ExtractGameFiles }, - { "ExportToPng", ExportToPng }, - { "ImportFromPng", ImportFromPng } - }; - - Ui.OpenWindow("CONVERT_ASSETS_PANEL", args); - }; - - panel.Get("EXTRACT_BUTTON").OnClick = () => - { - var ExtractGameFilesList = new List(); - var ExportToPngList = new List(); - - ExtractGameFilesList.Add(new string[] { "--extract", modID, currentPalette.Filename, "--userdir" }); - - foreach (var shp in availableShps) - { - ExtractGameFilesList.Add(new string[] { "--extract", modID, shp, "--userdir" }); - ExportToPngList.Add(new string[] { "--png", Platform.SupportDir + shp, Platform.SupportDir + currentPalette.Filename }); - Console.WriteLine(Platform.SupportDir + shp); - } - - var ExtractGameFiles = ExtractGameFilesList.ToArray(); - var ExportToPng = ExportToPngList.ToArray(); - var ImportFromPng = new string[][] { }; - - var args = new WidgetArgs() - { - { "ExtractGameFiles", ExtractGameFiles }, - { "ExportToPng", ExportToPng }, - { "ImportFromPng", ImportFromPng } - }; - - Ui.OpenWindow("CONVERT_ASSETS_PANEL", args); - }; - - panel.Get("IMPORT_BUTTON").OnClick = () => - { - var imageSizeInput = panel.Get("IMAGE_SIZE_INPUT"); - var imageFilename = panel.Get("IMAGE_FILENAME_INPUT"); - - var ExtractGameFiles = new string[][] { }; - var ExportToPng = new string[][] { }; - var ImportFromPng = new string[][] - { - new string[] { "--shp", Platform.SupportDir + imageFilename.Text, imageSizeInput.Text }, - }; - - var args = new WidgetArgs() - { - { "ExtractGameFiles", ExtractGameFiles }, - { "ExportToPng", ExportToPng }, - { "ImportFromPng", ImportFromPng } - }; - - Ui.OpenWindow("CONVERT_ASSETS_PANEL", args); - }; - panel.Get("CLOSE_BUTTON").OnClick = () => { Ui.CloseWindow(); onExit(); }; } void AddAsset(ScrollPanelWidget list, string filepath, ScrollItemWidget template) { - var r8 = filepath.EndsWith(".r8", true, CultureInfo.InvariantCulture); - var filename = Path.GetFileName(filepath); - var sprite = r8 ? filename : Path.GetFileNameWithoutExtension(filepath); + var filename = Path.GetFileName(filepath); var item = ScrollItemWidget.Setup(template, - () => spriteWidget.Image == sprite, - () => {filenameInput.Text = filename; LoadAsset(filename); }); + () => spriteWidget.Image == filename, + () => { filenameInput.Text = filename; LoadAsset(filename); }); item.Get("TITLE").GetText = () => filepath; list.AddChild(item); @@ -221,11 +143,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic if (!FileSystem.Exists(filename)) return false; - var r8 = filename.EndsWith(".r8", true, CultureInfo.InvariantCulture); - var sprite = r8 ? filename : Path.GetFileNameWithoutExtension(filename); - spriteWidget.Frame = 0; - spriteWidget.Image = sprite; + spriteWidget.Image = filename; frameSlider.MaximumValue = (float)spriteWidget.FrameCount; frameSlider.Ticks = spriteWidget.FrameCount + 1; return true; @@ -265,7 +184,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic var files = assetSource.AllFileNames(); foreach (var file in files) { - if (file.EndsWith(".shp", true, CultureInfo.InvariantCulture) || file.EndsWith(".r8", true, CultureInfo.InvariantCulture)) + if (AllowedExtensions.Any(ext => file.EndsWith(ext, true, CultureInfo.InvariantCulture))) { AddAsset(assetList, file, template); availableShps.Add(file); @@ -278,8 +197,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic Func setupItem = (palette, itemTemplate) => { var item = ScrollItemWidget.Setup(itemTemplate, - () => currentPalette.Name == palette.Name, - () => { currentPalette = palette; spriteWidget.Palette = currentPalette.Name; }); + () => currentPalette.Name == palette.Name, + () => { currentPalette = palette; spriteWidget.Palette = currentPalette.Name; }); item.Get("LABEL").GetText = () => palette.Name; return item; }; diff --git a/OpenRA.Mods.RA/Widgets/Logic/ConvertGameFilesLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/ConvertGameFilesLogic.cs deleted file mode 100644 index 8cd8bfcc60..0000000000 --- a/OpenRA.Mods.RA/Widgets/Logic/ConvertGameFilesLogic.cs +++ /dev/null @@ -1,110 +0,0 @@ -#region Copyright & License Information -/* - * Copyright 2007-2013 The OpenRA Developers (see AUTHORS) - * This file is part of OpenRA, which is free software. It is made - * available to you under the terms of the GNU General Public License - * as published by the Free Software Foundation. For more information, - * see COPYING. - */ -#endregion - -using System; -using System.IO; -using System.Linq; -using System.Threading; -using OpenRA.Utility; -using OpenRA.Widgets; - -namespace OpenRA.Mods.RA.Widgets.Logic -{ - public class ConvertGameFilesLogic - { - Widget panel; - ProgressBarWidget progressBar; - LabelWidget statusLabel; - ButtonWidget retryButton, backButton; - Widget extractingContainer; - - string[][] ExtractGameFiles, ExportToPng, ImportFromPng; - - [ObjectCreator.UseCtor] - public ConvertGameFilesLogic(Widget widget, string[][] ExtractGameFiles, string[][] ExportToPng, string[][] ImportFromPng) - { - panel = widget.Get("CONVERT_ASSETS_PANEL"); - progressBar = panel.Get("PROGRESS_BAR"); - statusLabel = panel.Get("STATUS_LABEL"); - - backButton = panel.Get("BACK_BUTTON"); - backButton.OnClick = Ui.CloseWindow; - - retryButton = panel.Get("RETRY_BUTTON"); - retryButton.OnClick = Extract; - - extractingContainer = panel.Get("EXTRACTING"); - - this.ExtractGameFiles = ExtractGameFiles; - this.ExportToPng = ExportToPng; - this.ImportFromPng = ImportFromPng; - - Extract(); - } - - void Extract() - { - backButton.IsDisabled = () => true; - retryButton.IsDisabled = () => true; - extractingContainer.IsVisible = () => true; - - var onError = (Action)(s => Game.RunAfterTick(() => - { - statusLabel.GetText = () => "Error: "+s; - backButton.IsDisabled = () => false; - retryButton.IsDisabled = () => false; - })); - - var t = new Thread( _ => - { - try - { - for (int i = 0; i < ExtractGameFiles.Length; i++) - { - progressBar.Percentage = i*100/ExtractGameFiles.Count(); - statusLabel.GetText = () => "Extracting..."; - Command.ExtractFiles(ExtractGameFiles[i]); - } - - for (int i = 0; i < ExportToPng.Length; i++) - { - progressBar.Percentage = i*100/ExportToPng.Count(); - statusLabel.GetText = () => "Exporting SHP to PNG..."; - Command.ConvertShpToPng(ExportToPng[i]); - } - - for (int i = 0; i < ImportFromPng.Length; i++) - { - progressBar.Percentage = i*100/ImportFromPng.Count(); - statusLabel.GetText = () => "Converting PNG to SHP..."; - Command.ConvertPngToShp(ImportFromPng[i]); - } - - Game.RunAfterTick(() => - { - progressBar.Percentage = 100; - statusLabel.GetText = () => "Done. Check {0}".F(Platform.SupportDir); - backButton.IsDisabled = () => false; - }); - } - catch (FileNotFoundException f) - { - onError(f.FileName+" not found."); - } - catch (Exception e) - { - onError(e.Message); - } - - }) { IsBackground = true }; - t.Start(); - } - } -} diff --git a/mods/d2k/chrome/assetbrowser.yaml b/mods/d2k/chrome/assetbrowser.yaml deleted file mode 100644 index 270cdec6cd..0000000000 --- a/mods/d2k/chrome/assetbrowser.yaml +++ /dev/null @@ -1,215 +0,0 @@ -Background@ASSETBROWSER_BG: - Logic:AssetBrowserLogic - X:(WINDOW_RIGHT - WIDTH)/2 - Y:(WINDOW_BOTTOM - HEIGHT)/2 - Width:700 - Height:410 - Children: - ColorPreviewManager@COLOR_MANAGER: - Label@ASSETBROWSER_TITLE: - X:0 - Y:10 - Width:PARENT_RIGHT - Height:25 - Text:Game Asset Viewer & Converter - Align:Center - Font:Bold - DropDownButton@SOURCE_SELECTOR: - X:40 - Y:45 - Width:160 - Height:25 - Font:Bold - Text:Folders - ScrollPanel@ASSET_LIST: - X:40 - Y:80 - Width:160 - Height:190 - Children: - ScrollItem@ASSET_TEMPLATE: - Width:PARENT_RIGHT-27 - Height:25 - X:2 - Y:0 - Visible:false - Children: - Label@TITLE: - X:10 - Width:PARENT_RIGHT-20 - Height:25 - TextField@FILENAME_INPUT: - X:40 - Y:280 - Width:140 - Height:25 - Text:mouse.r8 - Button@LOAD_BUTTON: - X:40 - Y:310 - Width:140 - Height:25 - Text:Load - Font:Bold - Key:return - DropDownButton@PALETTE_SELECTOR: - X:230 - Y:45 - Width:150 - Height:25 - Font:Bold - Text:Palette - DropDownButton@COLOR: - X:380 - Y:45 - Width:80 - Height:25 - Children: - ColorBlock@COLORBLOCK: - X:5 - Y:6 - Width:PARENT_RIGHT-35 - Height:PARENT_BOTTOM-12 - Background@SPRITE_BG: - X:220 - Y:80 - Width:250 - Height:250 - Background:dialog4 - Children: - ShpImage@SPRITE: - X:4 - Y:4 - Width:246 - Height:246 - Image:mouse.r8 - Label@ACTIONS_TITLE: - X:PARENT_RIGHT - 150 - Y:45 - Width:PARENT_RIGHT - Height:25 - Text:Actions - Font:Bold - Button@EXPORT_BUTTON: - X:PARENT_RIGHT - 200 - Y:80 - Width:160 - Height:25 - Text:Selected to PNG - Font:Bold - Button@EXTRACT_BUTTON: - X:PARENT_RIGHT - 200 - Y:115 - Width:160 - Height:25 - Text:Extract all to PNG - Font:Bold - TextField@IMAGE_FILENAME_INPUT: - X:PARENT_RIGHT - 200 - Y:PARENT_BOTTOM - 235 - Width:100 - Height:25 - Text:pixelart.png - TextField@IMAGE_SIZE_INPUT: - X:PARENT_RIGHT - 90 - Y:PARENT_BOTTOM - 235 - Width:50 - Height:25 - Text:width - Button@IMPORT_BUTTON: - X:PARENT_RIGHT - 200 - Y:PARENT_BOTTOM - 200 - Width:160 - Height:25 - Text:Import from PNG - Font:Bold - Button@CLOSE_BUTTON: - X:PARENT_RIGHT - 200 - Y:PARENT_BOTTOM - 115 - Width:160 - Height:25 - Text:Close - Font:Bold - Key:escape - Container@FRAME_SELECTOR: - X:45 - Y:360 - Children: - Button@BUTTON_PREV: - X:0 - Y:0 - Width:25 - Height:25 - Children: - Image@IMAGE_PREV: - X:0 - Y:0 - Width:25 - Height:25 - ImageCollection:music - ImageName:prev - Button@BUTTON_PLAY: - X:35 - Y:0 - Width:25 - Height:25 - Children: - Image@IMAGE_PLAY: - X:0 - Y:0 - Width:25 - Height:25 - ImageCollection:music - ImageName:play - Button@BUTTON_PAUSE: - Visible: no - X:35 - Y:0 - Width:25 - Height:25 - Children: - Image@IMAGE_PAUSE: - X:0 - Y:0 - Width:25 - Height:25 - ImageCollection:music - ImageName:pause - Button@BUTTON_STOP: - X:70 - Y:0 - Width:25 - Height:25 - Children: - Image@IMAGE_STOP: - X:0 - Y:0 - Width:25 - Height:25 - ImageCollection:music - ImageName:stop - Button@BUTTON_NEXT: - X:105 - Y:0 - Width:25 - Height:25 - Children: - Image@IMAGE_NEXT: - X:0 - Y:0 - Width:25 - Height:25 - ImageCollection:music - ImageName:next - Slider@FRAME_SLIDER: - X:160 - Y:0 - Width:410 - Height:20 - MinimumValue: 0 - Label@FRAME_COUNT: - X:585 - Y:0 - Width:25 - Height:25 - Font:Bold \ No newline at end of file diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml index 7fff8c53f6..bdccad9daa 100644 --- a/mods/d2k/mod.yaml +++ b/mods/d2k/mod.yaml @@ -76,8 +76,7 @@ ChromeLayout: mods/ra/chrome/cheats.yaml mods/ra/chrome/musicplayer.yaml mods/d2k/chrome/tooltips.yaml - mods/d2k/chrome/assetbrowser.yaml - mods/ra/chrome/convertassets.yaml + mods/ra/chrome/assetbrowser.yaml mods/ra/chrome/irc.yaml Weapons: diff --git a/mods/ra/chrome/assetbrowser.yaml b/mods/ra/chrome/assetbrowser.yaml index bf313b1c9b..ef5fea2547 100644 --- a/mods/ra/chrome/assetbrowser.yaml +++ b/mods/ra/chrome/assetbrowser.yaml @@ -3,29 +3,36 @@ Background@ASSETBROWSER_BG: X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - HEIGHT)/2 Width:700 - Height:410 + Height:500 Children: ColorPreviewManager@COLOR_MANAGER: Label@ASSETBROWSER_TITLE: - X:0 - Y:10 + Y:20 Width:PARENT_RIGHT Height:25 - Text:Game Asset Viewer & Converter - Align:Center Font:Bold + Align:Center + Text:Asset Browser + Label@SOURCE_SELECTOR_DESC: + X:20 + Y:35 + Width:160 + Height:25 + Font:TinyBold + Align:Center + Text:Select asset source DropDownButton@SOURCE_SELECTOR: - X:40 - Y:45 + X:20 + Y:60 Width:160 Height:25 Font:Bold Text:Folders ScrollPanel@ASSET_LIST: - X:40 - Y:80 + X:20 + Y:90 Width:160 - Height:190 + Height:275 Children: ScrollItem@ASSET_TEMPLATE: Width:PARENT_RIGHT-27 @@ -38,30 +45,45 @@ Background@ASSETBROWSER_BG: X:10 Width:PARENT_RIGHT-20 Height:25 + Label@FILENAME_DESC: + X:20 + Y:370 + Width:160 + Height:25 + Font:TinyBold + Align:Center + Text:Search for file TextField@FILENAME_INPUT: - X:40 - Y:280 - Width:140 + X:20 + Y:395 + Width:160 Height:25 Text:mouse.shp Button@LOAD_BUTTON: - X:40 - Y:310 - Width:140 + X:20 + Y:425 + Width:160 Height:25 Text:Load Font:Bold Key:return - DropDownButton@PALETTE_SELECTOR: - X:230 - Y:45 + Label@PALETTE_DESC: + X:PARENT_RIGHT-WIDTH-270 + Y:60 + Width:150 + Height:25 + Font:Bold + Align:Right + Text:Palette: + DropDownButton@PALETTE_SELECTOR: + X:PARENT_RIGHT-WIDTH-110 + Y:60 Width:150 Height:25 Font:Bold - Text:Palette DropDownButton@COLOR: - X:380 - Y:45 + X:PARENT_RIGHT-WIDTH-20 + Y:60 Width:80 Height:25 Children: @@ -71,69 +93,19 @@ Background@ASSETBROWSER_BG: Width:PARENT_RIGHT-35 Height:PARENT_BOTTOM-12 Background@SPRITE_BG: - X:220 - Y:80 - Width:250 - Height:250 - Background:dialog4 + X:190 + Y:90 + Width:490 + Height:330 + Background:dialog3 Children: ShpImage@SPRITE: - X:4 - Y:4 - Width:246 - Height:246 + Width:PARENT_RIGHT + Height:PARENT_BOTTOM Image:mouse - Label@ACTIONS_TITLE: - X:PARENT_RIGHT - 150 - Y:45 - Width:PARENT_RIGHT - Height:25 - Text:Actions - Font:Bold - Button@EXPORT_BUTTON: - X:PARENT_RIGHT - 200 - Y:80 - Width:160 - Height:25 - Text:Selected to PNG - Font:Bold - Button@EXTRACT_BUTTON: - X:PARENT_RIGHT - 200 - Y:115 - Width:160 - Height:25 - Text:Extract all to PNG - Font:Bold - TextField@IMAGE_FILENAME_INPUT: - X:PARENT_RIGHT - 200 - Y:PARENT_BOTTOM - 235 - Width:100 - Height:25 - Text:pixelart.png - TextField@IMAGE_SIZE_INPUT: - X:PARENT_RIGHT - 90 - Y:PARENT_BOTTOM - 235 - Width:50 - Height:25 - Text:width - Button@IMPORT_BUTTON: - X:PARENT_RIGHT - 200 - Y:PARENT_BOTTOM - 200 - Width:160 - Height:25 - Text:Import from PNG - Font:Bold - Button@CLOSE_BUTTON: - X:PARENT_RIGHT - 200 - Y:PARENT_BOTTOM - 115 - Width:160 - Height:25 - Text:Close - Font:Bold - Key:escape Container@FRAME_SELECTOR: - X:45 - Y:360 + X:190 + Y:425 Children: Button@BUTTON_PREV: X:0 @@ -202,14 +174,22 @@ Background@ASSETBROWSER_BG: ImageCollection:music ImageName:next Slider@FRAME_SLIDER: - X:160 - Y:0 - Width:410 + X:140 + Y:3 + Width:300 Height:20 MinimumValue: 0 Label@FRAME_COUNT: - X:585 - Y:0 - Width:25 + X:445 + Width:40 Height:25 - Font:Bold \ No newline at end of file + Font:TinyBold + Align:Left + Button@CLOSE_BUTTON: + Key:escape + X:PARENT_RIGHT-180 + Y:PARENT_BOTTOM-45 + Width:160 + Height:25 + Font:Bold + Text:Close \ No newline at end of file diff --git a/mods/ra/chrome/convertassets.yaml b/mods/ra/chrome/convertassets.yaml deleted file mode 100644 index ecd4cc73af..0000000000 --- a/mods/ra/chrome/convertassets.yaml +++ /dev/null @@ -1,47 +0,0 @@ -Background@CONVERT_ASSETS_PANEL: - Logic:ConvertGameFilesLogic - X:(WINDOW_RIGHT - WIDTH)/2 - Y:(WINDOW_BOTTOM - HEIGHT)/2 - Width:500 - Height:160 - Children: - Label@TITLE: - X:0 - Y:20 - Width:PARENT_RIGHT - Height:25 - Text:Extracting and Converting Gamefiles - Align:Center - Font:Bold - Container@EXTRACTING: - Width:PARENT_RIGHT - Height:PARENT_BOTTOM - Visible: false - Children: - ProgressBar@PROGRESS_BAR: - X:50 - Y:55 - Width:PARENT_RIGHT - 100 - Height:25 - Label@STATUS_LABEL: - X:50 - Y:80 - Width:PARENT_RIGHT - 100 - Height:25 - Align:Left - Button@RETRY_BUTTON: - X:PARENT_RIGHT - 280 - Y:PARENT_BOTTOM - 45 - Width:120 - Height:25 - Text:Retry - Font:Bold - Key:return - Button@BACK_BUTTON: - X:PARENT_RIGHT - 140 - Y:PARENT_BOTTOM - 45 - Width:120 - Height:25 - Text:Back - Font:Bold - Key:escape \ No newline at end of file diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml index e36a9a7edb..630f97383f 100644 --- a/mods/ra/mod.yaml +++ b/mods/ra/mod.yaml @@ -92,7 +92,6 @@ ChromeLayout: mods/ra/chrome/musicplayer.yaml mods/ra/chrome/tooltips.yaml mods/ra/chrome/assetbrowser.yaml - mods/ra/chrome/convertassets.yaml mods/ra/chrome/irc.yaml Weapons: diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml index 0030ff7b92..ffb690c447 100644 --- a/mods/ts/mod.yaml +++ b/mods/ts/mod.yaml @@ -120,7 +120,6 @@ ChromeLayout: mods/ra/chrome/musicplayer.yaml mods/ra/chrome/tooltips.yaml mods/ra/chrome/assetbrowser.yaml - mods/ra/chrome/convertassets.yaml mods/ra/chrome/irc.yaml Weapons: