Skip to content

Commit

Permalink
Merge pull request #4 from tremwil/v4-dev
Browse files Browse the repository at this point in the history
Merge V4 dev branch
  • Loading branch information
tremwil authored May 8, 2021
2 parents 8fa686a + 921391e commit de5d2bf
Show file tree
Hide file tree
Showing 53 changed files with 3,194 additions and 2,385 deletions.
28 changes: 14 additions & 14 deletions DS3ConnectionInfo.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29806.167
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DS3ConnectionInfo", "DS3ConnectionInfo\DS3ConnectionInfo.csproj", "{B4B03E67-40BC-400C-AA2A-AEF13B5D5130}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{85B98847-BA2D-4A75-9DEE-AFABC317CC5E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DS3ConnectionInfo", "DS3ConnectionInfo\DS3ConnectionInfo.csproj", "{A4512F87-F19E-4CD4-9FA1-EBB6C514BE77}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -17,18 +17,18 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B4B03E67-40BC-400C-AA2A-AEF13B5D5130}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B4B03E67-40BC-400C-AA2A-AEF13B5D5130}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B4B03E67-40BC-400C-AA2A-AEF13B5D5130}.Debug|x64.ActiveCfg = Debug|Any CPU
{B4B03E67-40BC-400C-AA2A-AEF13B5D5130}.Debug|x64.Build.0 = Debug|Any CPU
{B4B03E67-40BC-400C-AA2A-AEF13B5D5130}.Debug|x86.ActiveCfg = Debug|Any CPU
{B4B03E67-40BC-400C-AA2A-AEF13B5D5130}.Debug|x86.Build.0 = Debug|Any CPU
{B4B03E67-40BC-400C-AA2A-AEF13B5D5130}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B4B03E67-40BC-400C-AA2A-AEF13B5D5130}.Release|Any CPU.Build.0 = Release|Any CPU
{B4B03E67-40BC-400C-AA2A-AEF13B5D5130}.Release|x64.ActiveCfg = Release|Any CPU
{B4B03E67-40BC-400C-AA2A-AEF13B5D5130}.Release|x64.Build.0 = Release|Any CPU
{B4B03E67-40BC-400C-AA2A-AEF13B5D5130}.Release|x86.ActiveCfg = Release|Any CPU
{B4B03E67-40BC-400C-AA2A-AEF13B5D5130}.Release|x86.Build.0 = Release|Any CPU
{A4512F87-F19E-4CD4-9FA1-EBB6C514BE77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A4512F87-F19E-4CD4-9FA1-EBB6C514BE77}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A4512F87-F19E-4CD4-9FA1-EBB6C514BE77}.Debug|x64.ActiveCfg = Debug|Any CPU
{A4512F87-F19E-4CD4-9FA1-EBB6C514BE77}.Debug|x64.Build.0 = Debug|Any CPU
{A4512F87-F19E-4CD4-9FA1-EBB6C514BE77}.Debug|x86.ActiveCfg = Debug|Any CPU
{A4512F87-F19E-4CD4-9FA1-EBB6C514BE77}.Debug|x86.Build.0 = Debug|Any CPU
{A4512F87-F19E-4CD4-9FA1-EBB6C514BE77}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A4512F87-F19E-4CD4-9FA1-EBB6C514BE77}.Release|Any CPU.Build.0 = Release|Any CPU
{A4512F87-F19E-4CD4-9FA1-EBB6C514BE77}.Release|x64.ActiveCfg = Release|Any CPU
{A4512F87-F19E-4CD4-9FA1-EBB6C514BE77}.Release|x64.Build.0 = Release|Any CPU
{A4512F87-F19E-4CD4-9FA1-EBB6C514BE77}.Release|x86.ActiveCfg = Release|Any CPU
{A4512F87-F19E-4CD4-9FA1-EBB6C514BE77}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
154 changes: 154 additions & 0 deletions DS3ConnectionInfo/App.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,160 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="DS3ConnectionInfo.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="DS3ConnectionInfo.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup>
<userSettings>
<DS3ConnectionInfo.Settings>
<setting name="UsePingFilter" serializeAs="String">
<value>True</value>
</setting>
<setting name="MaxAvgPing" serializeAs="String">
<value>200</value>
</setting>
<setting name="REOHotkey" serializeAs="String">
<value>0</value>
</setting>
<setting name="RSDHotkey" serializeAs="String">
<value>0</value>
</setting>
<setting name="WSDHotkey" serializeAs="String">
<value>0</value>
</setting>
<setting name="LeaveSessionHotkey" serializeAs="String">
<value>0</value>
</setting>
<setting name="SamplingDelay" serializeAs="String">
<value>1</value>
</setting>
<setting name="SamplingPeriod" serializeAs="String">
<value>5</value>
</setting>
<setting name="DisplayOverlay" serializeAs="String">
<value>False</value>
</setting>
<setting name="OverlayHotkey" serializeAs="String">
<value>0</value>
</setting>
<setting name="BorderlessMode" serializeAs="String">
<value>False</value>
</setting>
<setting name="BorderlessHotkey" serializeAs="String">
<value>0</value>
</setting>
<setting name="OverlayAnchor" serializeAs="String">
<value>0</value>
</setting>
<setting name="XOffset" serializeAs="String">
<value>0.025</value>
</setting>
<setting name="YOffset" serializeAs="String">
<value>0.05</value>
</setting>
<setting name="OverlayFont" serializeAs="String">
<value>Segoe UI, 20.25pt</value>
</setting>
<setting name="NameFormat" serializeAs="String">
<value>{SteamName} ({CharName})</value>
</setting>
<setting name="NameFormatConnecting" serializeAs="String">
<value>{SteamName}</value>
</setting>
<setting name="ShowRegion" serializeAs="String">
<value>False</value>
</setting>
<setting name="TextColor" serializeAs="String">
<value>#FFFFFFFF</value>
</setting>
<setting name="OutlineColor" serializeAs="String">
<value>#FF000000</value>
</setting>
<setting name="OutlineThickness" serializeAs="String">
<value>2</value>
</setting>
<setting name="ConnectingColor" serializeAs="String">
<value>#FFFFA500</value>
</setting>
<setting name="PingColor1" serializeAs="String">
<value>#FF00BFFF</value>
</setting>
<setting name="PingColor2" serializeAs="String">
<value>#FF7CFC00</value>
</setting>
<setting name="PingColor3" serializeAs="String">
<value>#FFFFFF00</value>
</setting>
<setting name="PingColor4" serializeAs="String">
<value>#FFCD5C5C</value>
</setting>
<setting name="PingFilterHotkey" serializeAs="String">
<value>0</value>
</setting>
<setting name="SessColumnVisibility" serializeAs="Xml">
<value>
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<string>Visible</string>
<string>Visible</string>
<string>Visible</string>
<string>Visible</string>
<string>Hidden</string>
<string>Hidden</string>
<string>Visible</string>
<string>Hidden</string>
<string>Visible</string>
<string>Hidden</string>
<string>Visible</string>
</ArrayOfString>
</value>
</setting>
<setting name="OverlayColVisibility" serializeAs="Xml">
<value>
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<string>Hidden</string>
<string>Hidden</string>
<string>Hidden</string>
<string>Hidden</string>
<string>Visible</string>
<string>Hidden</string>
<string>Visible</string>
<string>Hidden</string>
<string>Visible</string>
<string>Hidden</string>
<string>Hidden</string>
</ArrayOfString>
</value>
</setting>
</DS3ConnectionInfo.Settings>
</userSettings>
<applicationSettings>
<DS3ConnectionInfo.Settings>
<setting name="SessColumnDescs" serializeAs="Xml">
<value>
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<string>The slot this player occupies in the game's SessionInfo structure.</string>
<string>The player's in-game character name.</string>
<string>The player's in-game team (e.g. Host, Dark Spirit, etc.)</string>
<string>The player's Steam profile name.</string>
<string>A combination of the player's Steam and in-game name, formatted according to overlay settings.</string>
<string>The player's Steam ID 64 (number found in a Steam profile link).</string>
<string>The player's ping (roundtrip time latency), calculated using the delay between sent and recieved STUN packets. Displayed in milliseconds.</string>
<string>The player's average ping over the last 10 recieved STUN packets. Displayed in milliseconds.</string>
<string>The standard deviation of the player's ping over the last 10 samples. A high value indicates an unstable connection. Displayed in milliseconds.</string>
<string>The ratio of late vs. on time STUN reply packets from the player, as a percentage. Another indicator of connection quality.</string>
<string>The state and country of the player, if available.</string>
</ArrayOfString>
</value>
</setting>
</DS3ConnectionInfo.Settings>
</applicationSettings>
</configuration>
17 changes: 17 additions & 0 deletions DS3ConnectionInfo/App.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<Application x:Class="DS3ConnectionInfo.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:DS3ConnectionInfo"
StartupUri="MainWindow.xaml">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<!-- MahApps.Metro resource dictionaries. Make sure that all file names are Case Sensitive! -->
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
<!-- Theme setting -->
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Dark.Blue.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
</Application>
17 changes: 17 additions & 0 deletions DS3ConnectionInfo/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
using System.Windows;

namespace DS3ConnectionInfo
{
/// <summary>
/// Interaction logic for App.xaml
/// </summary>
public partial class App : Application
{
}
}
Loading

0 comments on commit de5d2bf

Please sign in to comment.