Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 2.3 #72

Merged
merged 30 commits into from
Aug 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
aef62e2
Improve animations support
cooolbros Jun 30, 2021
5e3d2ad
Add presets
cooolbros Jul 1, 2021
7001c8d
Added a control width override
CriticalFlaw Jul 9, 2021
4d25e26
Runtime Localization Support (#67)
CriticalFlaw Jul 10, 2021
48287e9
Added a toolbar for additional options.
CriticalFlaw Jul 11, 2021
46a35bb
Create Resources.ru-RU.resx
Blueberryy Jul 11, 2021
f1ffe5b
Update Resources.ru-RU.resx
Blueberryy Jul 11, 2021
ed63989
Merge pull request #77 from Blueberryy/2.3
CriticalFlaw Jul 11, 2021
9e33db2
Localization Corrections
CriticalFlaw Jul 12, 2021
642d3b9
Update Resources.ru-RU.resx
Blueberryy Jul 12, 2021
fd0355a
Merge pull request #78 from Blueberryy/2.3
CriticalFlaw Jul 13, 2021
5bd8146
Header style changes
cooolbros Jul 15, 2021
cde9d90
Updated AutoUpdater.NET
CriticalFlaw Jul 28, 2021
eae9656
Added a schema for HUDs without customization (#63)
CriticalFlaw Aug 5, 2021
4032c3d
Support for HUDs without customization (#61)
CriticalFlaw Aug 5, 2021
2165857
Move shared.json
cooolbros Aug 13, 2021
7903d73
Add hud authors and screenshots
cooolbros Aug 16, 2021
b62ded6
Add shared HUD customizations + Implement data binding
cooolbros Aug 17, 2021
9e35cfc
Added a warning for custom backgrounds. (#70)
CriticalFlaw Aug 19, 2021
391a2b9
Code Cleanup
CriticalFlaw Aug 19, 2021
555c8fe
Update Resources.fr-FR.resx
tacokete Aug 21, 2021
581f967
Merge pull request #84 from tacokete/patch-1
CriticalFlaw Aug 21, 2021
948e7fe
Code Cleanup
CriticalFlaw Aug 21, 2021
39d6a2f
Add importing HUDs + Add option to view only customizable huds
cooolbros Aug 22, 2021
8bf7e4e
Merge branch '2.3.test' into 2.3
cooolbros Aug 22, 2021
7bd1484
Bug Fixes
CriticalFlaw Aug 22, 2021
f6b8c17
Bug Fixes
CriticalFlaw Aug 23, 2021
2667ccd
Redirect StandardOutput from vtex.exe
cooolbros Aug 23, 2021
0283404
Corrected link button colors
CriticalFlaw Aug 23, 2021
eedaa29
Merge branch 'master' into 2.3
CriticalFlaw Aug 24, 2021
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
26 changes: 26 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": "0.2.0",
"configurations": [
{
// Use IntelliSense to find out which attributes exist for C# debugging
// Use hover for the description of the existing attributes
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
"name": ".NET Core Launch (console)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/src/TF2HUD.Editor/bin/Debug/net5.0-windows/HUDEditor.dll",
"args": [],
"cwd": "${workspaceFolder}/src/TF2HUD.Editor",
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
"console": "internalConsole",
"stopAtEntry": false,
},
{
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach"
}
]
}
12 changes: 12 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"[csharp]": {
"editor.insertSpaces": true,
"editor.formatOnSave": false,
"editor.formatOnSaveMode": "modifications"
},
"[json]": {
"editor.tabSize": 2
},
"editor.detectIndentation": false,
"editor.insertSpaces": true
}
42 changes: 42 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "build",
"command": "dotnet",
"type": "process",
"args": [
"build",
"${workspaceFolder}/src/TF2HUD.Editor/HUDEditor.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "publish",
"command": "dotnet",
"type": "process",
"args": [
"publish",
"${workspaceFolder}/src/TF2HUD.Editor/HUDEditor.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "watch",
"command": "dotnet",
"type": "process",
"args": [
"watch",
"run",
"${workspaceFolder}/src/TF2HUD.Editor/HUDEditor.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
}
]
}
96 changes: 81 additions & 15 deletions src/TF2HUD.Editor/App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Setter x:Key="Tf2Secondary" Property="TextElement.FontFamily"
Value="../Resources/TF2Secondary.ttf #TF2 Secondary" />
<Setter x:Key="Tf2Icons" Property="TextElement.FontFamily"
Value="../Resources/TF2Icons.ttf #TF2 Icons" />
Value="../Resources/TF2Icons.ttf #TF2Icons" />
<Setter x:Key="Tf2Crosshairs" Property="TextElement.FontFamily"
Value="../Resources/TF2Crosshairs.ttf #TF2Crosshairs" />

Expand Down Expand Up @@ -54,7 +54,7 @@
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Top" />
<Setter Property="Foreground" Value="White" />
<Setter Property="Width" Value="125" />
<Setter Property="Width" Value="150" />
<Setter Property="FontSize" Value="16" />
</Style>

Expand All @@ -64,14 +64,14 @@
<Setter Property="ColorMode" Value="ColorCanvas" />
<Setter Property="ShowRecentColors" Value="True" />
<Setter Property="Foreground" Value="Black" />
<Setter Property="Width" Value="125" />
<Setter Property="Width" Value="150" />
</Style>

<Style x:Key="IntegerUpDownLabel" TargetType="Label">
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Top" />
<Setter Property="Foreground" Value="White" />
<Setter Property="Width" Value="100" />
<Setter Property="Width" Value="125" />
<Setter Property="FontSize" Value="16" />
</Style>

Expand All @@ -81,7 +81,7 @@
<Setter Property="TextAlignment" Value="Center" />
<Setter Property="FormatString" Value="N0" />
<Setter Property="Increment" Value="1" />
<Setter Property="Width" Value="100" />
<Setter Property="Width" Value="125" />
<Setter Property="AllowTextInput" Value="False" />
</Style>

Expand All @@ -97,7 +97,7 @@
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="VerticalAlignment" Value="Top" />
<Setter Property="FontSize" Value="30" />
<Setter Property="Width" Value="125" />
<Setter Property="Width" Value="150" />
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="FontFamily" Value="../Resources/TF2Crosshairs.ttf #TF2Crosshairs" />
</Style>
Expand Down Expand Up @@ -127,17 +127,16 @@
<Setter Property="Foreground" Value="#A49E9E" />
</Style>

<Style x:Key="Button" TargetType="Button">
<Style x:Key="HUDButton" TargetType="Button">
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Top" />
<Setter Property="FontFamily" Value="../Resources/TF2Build.ttf #TF2 Build" />
<Setter Property="FontSize" Value="14px" />
<Setter Property="Foreground" Value="#EBE2CA" />
<Setter Property="Background" Value="#776B5F" />
<Setter Property="Margin" Value="5" />
<Setter Property="Width" Value="140" />
<Setter Property="Width" Value="160" />
<Setter Property="Height" Value="40" />

<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
Expand Down Expand Up @@ -167,6 +166,66 @@
<Setter Property="Background" Value="#776B5F" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="Margin" Value="5" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Border Background="{TemplateBinding Background}">
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
</Border>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Foreground" Value="#FFFFFF" />
<Setter Property="Background" Value="#934739" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Foreground" Value="#2B2724" />
<Setter Property="Background" Value="#776B5F" />
</Trigger>
</Style.Triggers>
</Style>

<Style x:Key="GitHubButton" TargetType="Button" BasedOn="{StaticResource LinkButton}">
<Setter Property="Content" Value="Y" />
<Setter Property="Background" Value="#171A21" />
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="#1D263B" />
</Trigger>
</Style.Triggers>
</Style>

<Style x:Key="HudsButton" TargetType="Button" BasedOn="{StaticResource LinkButton}">
<Setter Property="FontFamily" Value="../Resources/TF2Build.ttf #TF2 Build" />
<Setter Property="Content" Value="H" />
<Setter Property="Background" Value="#42A5F5" />
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="#68A8DC" />
</Trigger>
</Style.Triggers>
</Style>

<Style x:Key="DiscordButton" TargetType="Button" BasedOn="{StaticResource LinkButton}">
<Setter Property="Content" Value="Z" />
<Setter Property="Background" Value="#5865F2" />
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="#7B82D9" />
</Trigger>
</Style.Triggers>
</Style>

<Style x:Key="SteamButton" TargetType="Button" BasedOn="{StaticResource LinkButton}">
<Setter Property="Content" Value="X" />
<Setter Property="Background" Value="#1B2838" />
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="#384452" />
</Trigger>
</Style.Triggers>
</Style>

<Style x:Key="PreviewButton" TargetType="Button">
Expand Down Expand Up @@ -202,12 +261,6 @@
<Setter Property="Width" Value="600" />
</Style>

<Style x:Key="PageTitle" TargetType="Label">
<Setter Property="FontSize" Value="35" />
<Setter Property="Foreground" Value="White" />
<Setter Property="Margin" Value="10,10,0,0" />
</Style>

<Style x:Key="ScrollThumbs" TargetType="{x:Type Thumb}">
<Setter Property="Template">
<Setter.Value>
Expand All @@ -229,6 +282,7 @@
</Setter.Value>
</Setter>
</Style>

<Style TargetType="{x:Type ScrollBar}">
<Setter Property="Margin" Value="-5,0,0,0" />
<Setter Property="Stylus.IsFlicksEnabled" Value="false" />
Expand Down Expand Up @@ -292,16 +346,28 @@
<Setter Property="Cursor" Value="Hand" />
</Style>

<Style x:Key="HudListIcon" TargetType="Label">
<Setter Property="FontFamily" Value="../Resources/TF2Icons.ttf #TF2Icons" />
<Setter Property="FontSize" Value="20" />
<Setter Property="Foreground" Value="#FFFFFF" />
<Setter Property="HorizontalAlignment" Value="Right" />
<Setter Property="VerticalAlignment" Value="Top" />
<Setter Property="Opacity" Value="0.8" />
<Setter Property="Grid.Row" Value="0" />
</Style>

<Style x:Key="HudListImage" TargetType="Image">
<Setter Property="Height" Value="118" />
<Setter Property="Stretch" Value="UniformToFill" />
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Grid.Row" Value="0" />
</Style>

<Style x:Key="HudListLabel" TargetType="Label">
<Setter Property="Foreground" Value="Black" />
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="Grid.Row" Value="1" />
</Style>
</Application.Resources>
</Application>
10 changes: 9 additions & 1 deletion src/TF2HUD.Editor/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
using System.IO;
using System.Globalization;
using System.IO;
using System.Reflection;
using System.Windows;
using HUDEditor.Properties;
using log4net;
using log4net.Config;
using WPFLocalizeExtension.Engine;

namespace HUDEditor
{
Expand All @@ -11,6 +14,11 @@ namespace HUDEditor
/// </summary>
public partial class App
{
private App()
{
LocalizeDictionary.Instance.Culture = new CultureInfo(Settings.Default.user_language);
}

protected override void OnStartup(StartupEventArgs e)
{
var repository = LogManager.GetRepository(Assembly.GetEntryAssembly());
Expand Down
Loading