Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified Knossos.NET/Assets/general/menu_debug.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Knossos.NET/Assets/general/menu_explore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Knossos.NET/Assets/general/menu_home.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Knossos.NET/Assets/general/menu_play.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Knossos.NET/Assets/general/menu_settings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Knossos.NET/ViewModels/Windows/ModSettingsViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ private void ConfigureBuild(bool ignoreUserSettings)
}

/// <summary>
/// Reset settings to DEFAULT on UI BUT it does not save them, the user must click save
/// Reset settings to DEFAULT on UI
/// </summary>
internal void ResetSettingsCommand()
{
Expand Down
6 changes: 3 additions & 3 deletions Knossos.NET/Views/DebugView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
<Button Margin="5" Classes="Settings" Command="{Binding OpenFS2Ini}">View fs2__open.ini</Button>
</WrapPanel>
<WrapPanel Grid.Row="0" Margin="5">
<Button Margin="5" Classes="Settings" Command="{Binding UploadKnossosConsole}">Upload Knossos Console</Button>
<Button Margin="5" Classes="Settings" Command="{Binding OpenLog}">View Knossos Logfile</Button>
<Button Margin="5" Classes="Settings" Command="{Binding OpenSettings}">View Knossos Settings File</Button>
<Button Margin="5" Classes="Settings" Command="{Binding UploadKnossosConsole}">Upload KnossosNET Console</Button>
<Button Margin="5" Classes="Settings" Command="{Binding OpenLog}">View KnossosNET Logfile</Button>
<Button Margin="5" Classes="Settings" Command="{Binding OpenSettings}">View KnossosNET Settings File</Button>
</WrapPanel>
</StackPanel>
<TextBox Grid.Row="1" Text="{Binding UiConsoleOutput}" IsReadOnly="True"></TextBox>
Expand Down
6 changes: 3 additions & 3 deletions Knossos.NET/Views/GlobalSettingsView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<Expander VerticalAlignment="Top" Margin="5" MinWidth="400">
<Expander.Header>
<Label Margin="5,0,0,0" FontWeight="Bold" FontSize="18" ToolTip.Tip="Settings that are specific to KnossosNET only. These settings do not affect the FSO engine.">
Knossos Settings
KnossosNET Settings
</Label>
</Expander.Header>
<StackPanel Margin="5">
Expand Down Expand Up @@ -52,7 +52,7 @@
</WrapPanel>
<WrapPanel Margin="8,10,0,0">
<TextBlock VerticalAlignment="Center" Width="200">Mod Compression</TextBlock>
<ComboBox SelectedIndex="{Binding ModCompression}" ToolTip.Tip="KnossosNET can try to compress mod files in order to save disk space, and in some cases reduce loading times. 'Manual' means you will have to change a modpack's compression from mod settings or during installation. 'Always' means Knossos will compress all mods during install. 'Mod Support' means Knossos will compress the files only if the mod FSO engine dependency set by the mod is over the minimum, and if the mod uses an official build." Grid.Column="1" Width="150" Margin="10,0,0,0">
<ComboBox SelectedIndex="{Binding ModCompression}" ToolTip.Tip="KnossosNET can try to compress mod files in order to save disk space, and in some cases reduce loading times. 'Manual' means you will have to change a modpack's compression from mod settings or during installation. 'Always' means KnossosNET will compress all mods during install. 'Mod Support' means KnossosNET will compress the files only if the mod FSO engine dependency set by the mod is over the minimum, and if the mod uses an official build." Grid.Column="1" Width="150" Margin="10,0,0,0">
<ComboBoxItem Tag="0">Disabled</ComboBoxItem>
<ComboBoxItem Tag="1">Manual</ComboBoxItem>
<ComboBoxItem Tag="2">Always</ComboBoxItem>
Expand Down Expand Up @@ -414,7 +414,7 @@
</WrapPanel>
<WrapPanel Margin="0,5,0,0">
<Label Margin="5,5,0,0" IsVisible="{Binding IsAVX}" Width="200">Force SSE2</Label>
<CheckBox Margin="12,0,0,0" IsVisible="{Binding IsAVX}" ToolTip.Tip="When enabled, Knossos will force to run SSE2 FSO builds instead of AVX ones, if SSE2 builds are available." IsChecked="{Binding ForceSSE2}"></CheckBox>
<CheckBox Margin="12,0,0,0" IsVisible="{Binding IsAVX}" ToolTip.Tip="When enabled, KnossosNET will force to run SSE2 FSO builds instead of AVX ones, if SSE2 builds are available." IsChecked="{Binding ForceSSE2}"></CheckBox>
</WrapPanel>
<!-- GLOBAL CMDLINE -->
<Grid ColumnDefinitions="Auto,Auto,Auto" Margin="5">
Expand Down
5 changes: 2 additions & 3 deletions Knossos.NET/Views/Windows/PerformanceHelpView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
CanResize="False">

<StackPanel MaxWidth="500" Background="{StaticResource BackgroundColorPrimary}">
<TextBlock Margin="10,20,20,10" TextWrapping="Wrap">If in-game performance is slow, close the game and then try disabling "Extra Multisample AA" and "Shadows". Note, "Extra Multisample AA" is an added, more expensive anti-aliasing step and if it is disabled then "Post-processing AA" will still be be applied. </TextBlock>
<TextBlock Margin="10,10,20,10" TextWrapping="Wrap">The next best options to disable are "Deferred Lighting" and then "Post-processing AA".</TextBlock>
<TextBlock Margin="10,10,20,20" TextWrapping="Wrap">And always remember to click the "Save" button!</TextBlock>
<TextBlock Margin="10,20,20,10" TextWrapping="Wrap">If in-game performance is slow, close the game and then disable "Extra Multisample AA" and "Shadows". Note, "Extra Multisample AA" is an added, more expensive anti-aliasing step and if it is disabled then "Post-processing AA" will still be be applied. </TextBlock>
<TextBlock Margin="10,10,20,10" TextWrapping="Wrap">If performance remains slow the next best options to disable are "Deferred Lighting" and then "Post-processing AA".</TextBlock>
</StackPanel>
</Window>
14 changes: 7 additions & 7 deletions Knossos.NET/Views/Windows/QuickSetupView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,24 @@
<TextBlock Margin="10" TextWrapping="Wrap" FontWeight="Bold" FontSize="36" HorizontalAlignment="Left" >Welcome To Knossos.NET</TextBlock>
<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left" >This quick setup guide will help you through the basics of configuring the KnossosNET launcher for the first time. If you already know how to configure the launcher you can close this window.</TextBlock>
<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left" >Note, you can reopen this guide at any time, just go to the "Settings" tab and click the "Quick Setup Guide" button.</TextBlock>
<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left" >If you ever need assistance with KnossosNET please ask on the Knossos Discord channel linked below.</TextBlock>
<Button Margin="20, 10" Command="{Binding OpenDiscordQuickSetup}">Discord Help for Knossos</Button>
<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left" >If you ever need assistance with KnossosNET please ask on the Discord channel linked below.</TextBlock>
<Button Margin="20, 10" Command="{Binding OpenDiscordQuickSetup}">Discord Help for KnossosNET</Button>
</StackPanel>

<!--Page2-->
<StackPanel IsVisible="{Binding Page2}" Grid.Row="0" >
<StackPanel IsVisible="{Binding !IsPortableMode}">
<TextBlock Margin="10" TextWrapping="Wrap" FontWeight="Bold" FontSize="36" HorizontalAlignment="Left" >Setting up the library folder</TextBlock>
<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">First, you must set a library folder. Go to the "Settings" tab and under the "KnossosNET" section click on the "Browse" button and choose or create a folder for Knossos to use. It is highly recommended to set this as an empty folder in a location with a large amount of available storage. Once you have set the folder be sure to click the "Save" button in the upper right corner of the "Settings" tab. </TextBlock>
<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">First, you must set a library folder. Go to the "Settings" tab and under the "KnossosNET" section click on the "Browse" button and choose or create a folder for KnossosNET to use. It is highly recommended to set this as an empty folder in a location with a large amount of available storage. </TextBlock>
<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">The KnossosNET library folder is where all game and mod data will be saved to. Make sure you always have space available on this drive before installing a new mod or update.</TextBlock>
<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" FontWeight="Bold" HorizontalAlignment="Left">Current Library Folder</TextBlock>
<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left" Text="{Binding LibraryPath}"></TextBlock>
<TextBlock IsVisible="{Binding !CanContinue}" Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">Go to the "Settings" tab and set the library folder to continue.</TextBlock>
</StackPanel>
<StackPanel IsVisible="{Binding IsPortableMode}">
<TextBlock Margin="10" TextWrapping="Wrap" FontWeight="Bold" FontSize="36" HorizontalAlignment="Left" >KnossosNET is running in portable mode</TextBlock>
<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">This means KnossosNET settings and FSO pilots, settings and data are saved inside the 'kn_portable' folder, you can not set a library folder in this mode. </TextBlock>
<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">If you ever need to stop using the portable mode move, rename or delete the 'kn_portable' folder</TextBlock>
<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">This means KnossosNET settings and FSO pilots, settings and data are saved inside the 'kn_portable' folder, you cannot set a library folder in this mode. </TextBlock>
<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">If you ever need to stop using the portable mode move, rename or delete the 'kn_portable' folder.</TextBlock>
<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" FontWeight="Bold" HorizontalAlignment="Left">Current Library Folder</TextBlock>
<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left" Text="{Binding LibraryPath}"></TextBlock>
</StackPanel>
Expand Down Expand Up @@ -91,8 +91,8 @@
<!--Page6-->
<StackPanel IsVisible="{Binding Page6}" Grid.Row="0" >
<TextBlock Margin="10" TextWrapping="Wrap" FontWeight="Bold" FontSize="36" HorizontalAlignment="Left">Finishing</TextBlock>
<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">Finally, before launching a mod go to the "Settings" tab and configure video and audio settings, as well as any joysticks you may have installed. Always remember to click "Save" after changing any values.</TextBlock>
<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">It is recommended to run in windowed mode at the same resolution as your system display. There is no need to enable the borderless mode, as windowed mode is already borderless at native resolution.</TextBlock>
<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">Finally, before launching a mod go to the "Settings" tab and configure video and audio settings, as well as any joysticks you may have installed.</TextBlock>
<!--<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">It is recommended to run in windowed mode at the same resolution as your system display. There is no need to enable the borderless mode, as windowed mode is already borderless at native resolution.</TextBlock>-->
</StackPanel>

<!--Navigation-->
Expand Down