Skip to content

Commit 8efe241

Browse files
VolcanicArtsVolcanicArts
committed
Merge branch 'dev' into main
2 parents e57ea23 + 546ac16 commit 8efe241

File tree

92 files changed

+894
-823
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+894
-823
lines changed

‎VRCOSC.Desktop/Updater/SquirrelUpdateManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace VRCOSC.Desktop.Updater;
1515

16-
public class SquirrelUpdateManager : VRCOSCUpdateManager
16+
public partial class SquirrelUpdateManager : VRCOSCUpdateManager
1717
{
1818
private GithubUpdateManager? updateManager;
1919
private UpdateInfo? updateInfo;

‎VRCOSC.Desktop/VRCOSCGameDesktop.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace VRCOSC.Desktop;
99

10-
public class VRCOSCGameDesktop : VRCOSCGame
10+
public partial class VRCOSCGameDesktop : VRCOSCGame
1111
{
1212
protected override VRCOSCUpdateManager CreateUpdateManager()
1313
{

‎VRCOSC.Game/Config/VRCOSCConfigManager.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ protected override void InitialiseDefaults()
2525
SetDefault(VRCOSCSetting.ReceivePort, 9001);
2626
SetDefault(VRCOSCSetting.UpdateMode, UpdateMode.Auto);
2727
SetDefault(VRCOSCSetting.UpdateRepo, @"https://github.com/VolcanicArts/VRCOSC");
28-
SetDefault(VRCOSCSetting.AutoFocus, false);
2928
}
3029
}
3130

@@ -37,6 +36,5 @@ public enum VRCOSCSetting
3736
SendPort,
3837
ReceivePort,
3938
UpdateMode,
40-
UpdateRepo,
41-
AutoFocus
39+
UpdateRepo
4240
}

‎VRCOSC.Game/Graphics/About/AboutScreen.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
namespace VRCOSC.Game.Graphics.About;
1717

18-
public sealed class AboutScreen : Container
18+
public sealed partial class AboutScreen : Container
1919
{
2020
[Resolved]
2121
private GameHost host { get; set; } = null!;
@@ -25,7 +25,7 @@ public sealed class AboutScreen : Container
2525

2626
private readonly FillFlowContainer buttonFlow;
2727
private readonly TextFlowContainer text;
28-
private Bindable<string> versionBindable;
28+
private Bindable<string> versionBindable = null!;
2929

3030
public AboutScreen()
3131
{
@@ -91,7 +91,7 @@ private void load()
9191
}, true);
9292
}
9393

94-
private sealed class AboutButton : Container
94+
private sealed partial class AboutButton : Container
9595
{
9696
public IconUsage Icon { get; init; }
9797
public Colour4 BackgroundColour { get; init; }

‎VRCOSC.Game/Graphics/LineSeparator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace VRCOSC.Game.Graphics;
1010

11-
public sealed class LineSeparator : CircularContainer
11+
public sealed partial class LineSeparator : CircularContainer
1212
{
1313
public LineSeparator()
1414
{

‎VRCOSC.Game/Graphics/MainContent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
namespace VRCOSC.Game.Graphics;
1414

15-
public sealed class MainContent : Container
15+
public sealed partial class MainContent : Container
1616
{
1717
[Resolved]
1818
private Bindable<Tab> selectedTab { get; set; } = null!;

‎VRCOSC.Game/Graphics/ModuleEditing/AttributeFlow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
namespace VRCOSC.Game.Graphics.ModuleEditing;
1818

19-
public sealed class AttributeFlow : FillFlowContainer<AttributeCard>
19+
public sealed partial class AttributeFlow : FillFlowContainer<AttributeCard>
2020
{
2121
public BindableList<ModuleAttribute> AttributesList = new();
2222

‎VRCOSC.Game/Graphics/ModuleEditing/Attributes/AttributeCard.cs

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@
22
// See the LICENSE file in the repository root for full license text.
33

44
using osu.Framework.Allocation;
5+
using osu.Framework.Extensions.Color4Extensions;
56
using osu.Framework.Graphics;
67
using osu.Framework.Graphics.Containers;
7-
using osu.Framework.Graphics.Effects;
88
using osu.Framework.Graphics.Shapes;
9+
using osu.Framework.Graphics.Sprites;
910
using osuTK;
1011
using VRCOSC.Game.Graphics.UI;
1112
using VRCOSC.Game.Graphics.UI.Button;
1213
using VRCOSC.Game.Modules;
1314

1415
namespace VRCOSC.Game.Graphics.ModuleEditing.Attributes;
1516

16-
public abstract class AttributeCard : Container
17+
public abstract partial class AttributeCard : Container
1718
{
1819
private VRCOSCButton resetToDefault = null!;
1920
protected FillFlowContainer ContentFlow = null!;
@@ -42,24 +43,21 @@ private void load()
4243
{
4344
Anchor = Anchor.CentreLeft,
4445
Origin = Anchor.CentreRight,
45-
Size = new Vector2(30, 50),
46+
Size = new Vector2(30, 60),
4647
Padding = new MarginPadding(5),
47-
Child = resetToDefault = new BasicButton
48+
Child = resetToDefault = new IconButton
4849
{
4950
Anchor = Anchor.Centre,
5051
Origin = Anchor.Centre,
5152
RelativeSizeAxes = Axes.Both,
52-
Size = new Vector2(0.5f, 1.0f),
53-
CornerRadius = 5,
54-
CornerExponent = 2,
5553
Action = SetDefault,
56-
BackgroundColour = VRCOSCColour.Blue,
57-
EdgeEffect = new EdgeEffectParameters
58-
{
59-
Type = EdgeEffectType.Glow,
60-
Colour = VRCOSCColour.BlueLight,
61-
Radius = 5
62-
}
54+
IconPadding = 4,
55+
CornerRadius = 10,
56+
BorderThickness = 2,
57+
BorderColour = VRCOSCColour.Gray0,
58+
BackgroundColour = VRCOSCColour.BlueDark.Darken(0.25f),
59+
Icon = FontAwesome.Solid.Undo,
60+
IconShadow = true
6361
}
6462
},
6563
new Container

‎VRCOSC.Game/Graphics/ModuleEditing/Attributes/AttributeCardList.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright (c) VolcanicArts. Licensed under the GPL-3.0 License.
22
// See the LICENSE file in the repository root for full license text.
33

4-
using System.Linq;
54
using osu.Framework.Allocation;
65
using osu.Framework.Bindables;
76
using osu.Framework.Extensions.IEnumerableExtensions;
@@ -13,7 +12,7 @@
1312

1413
namespace VRCOSC.Game.Graphics.ModuleEditing.Attributes;
1514

16-
public abstract class AttributeCardList : AttributeCard
15+
public abstract partial class AttributeCardList : AttributeCard
1716
{
1817
protected ModuleAttributeList AttributeData;
1918

@@ -110,10 +109,7 @@ protected override void LoadComplete()
110109
checkForDefault();
111110
}
112111

113-
protected virtual Bindable<object> GetDefaultItem()
114-
{
115-
return new Bindable<object>(AttributeData.AttributeList.Last().Value);
116-
}
112+
protected abstract Bindable<object> GetDefaultItem();
117113

118114
private void performAttributeUpdate(ValueChangedEvent<object> e)
119115
{

‎VRCOSC.Game/Graphics/ModuleEditing/Attributes/AttributeCardSingle.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace VRCOSC.Game.Graphics.ModuleEditing.Attributes;
88

9-
public abstract class AttributeCardSingle : AttributeCard
9+
public abstract partial class AttributeCardSingle : AttributeCard
1010
{
1111
protected readonly ModuleAttributeSingle AttributeData;
1212

‎VRCOSC.Game/Graphics/ModuleEditing/Attributes/Dropdown/DropdownAttributeCard.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
namespace VRCOSC.Game.Graphics.ModuleEditing.Attributes.Dropdown;
1212

13-
public sealed class DropdownAttributeCard<T> : AttributeCardSingle where T : Enum
13+
public sealed partial class DropdownAttributeCard<T> : AttributeCardSingle where T : Enum
1414
{
1515
private VRCOSCDropdown<T> dropdown = null!;
1616

‎VRCOSC.Game/Graphics/ModuleEditing/Attributes/Slider/FloatSliderAttributeCard.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace VRCOSC.Game.Graphics.ModuleEditing.Attributes.Slider;
88

9-
public sealed class FloatSliderAttributeCard : SliderAttributeCard<float>
9+
public sealed partial class FloatSliderAttributeCard : SliderAttributeCard<float>
1010
{
1111
public FloatSliderAttributeCard(ModuleAttributeSingleWithBounds attributeData)
1212
: base(attributeData)

‎VRCOSC.Game/Graphics/ModuleEditing/Attributes/Slider/IntSliderAttributeCard.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace VRCOSC.Game.Graphics.ModuleEditing.Attributes.Slider;
88

9-
public sealed class IntSliderAttributeCard : SliderAttributeCard<int>
9+
public sealed partial class IntSliderAttributeCard : SliderAttributeCard<int>
1010
{
1111
public IntSliderAttributeCard(ModuleAttributeSingleWithBounds attributeData)
1212
: base(attributeData)

‎VRCOSC.Game/Graphics/ModuleEditing/Attributes/Slider/SliderAttributeCard.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
namespace VRCOSC.Game.Graphics.ModuleEditing.Attributes.Slider;
1212

13-
public abstract class SliderAttributeCard<T> : AttributeCardSingle where T : struct, IComparable<T>, IConvertible, IEquatable<T>
13+
public abstract partial class SliderAttributeCard<T> : AttributeCardSingle where T : struct, IComparable<T>, IConvertible, IEquatable<T>
1414
{
1515
protected ModuleAttributeSingleWithBounds AttributeDataWithBounds;
1616

‎VRCOSC.Game/Graphics/ModuleEditing/Attributes/Text/ButtonTextAttributeCard.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
namespace VRCOSC.Game.Graphics.ModuleEditing.Attributes.Text;
1111

12-
public sealed class ButtonTextAttributeCard : TextAttributeCard
12+
public sealed partial class ButtonTextAttributeCard : TextAttributeCard
1313
{
1414
private readonly ModuleAttributeSingleWithButton attributeSingleWithButton;
1515

‎VRCOSC.Game/Graphics/ModuleEditing/Attributes/Text/IntTextAttributeCard.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace VRCOSC.Game.Graphics.ModuleEditing.Attributes.Text;
88

9-
public sealed class IntTextAttributeCard : TextAttributeCard
9+
public sealed partial class IntTextAttributeCard : TextAttributeCard
1010
{
1111
public IntTextAttributeCard(ModuleAttributeSingle attributeData)
1212
: base(attributeData)

‎VRCOSC.Game/Graphics/ModuleEditing/Attributes/Text/IntTextAttributeCardList.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
// Copyright (c) VolcanicArts. Licensed under the GPL-3.0 License.
22
// See the LICENSE file in the repository root for full license text.
33

4+
using System.Linq;
45
using osu.Framework.Bindables;
56
using VRCOSC.Game.Modules;
67

78
namespace VRCOSC.Game.Graphics.ModuleEditing.Attributes.Text;
89

9-
public sealed class IntTextAttributeCardList : TextAttributeCardList
10+
public sealed partial class IntTextAttributeCardList : TextAttributeCardList
1011
{
1112
public IntTextAttributeCardList(ModuleAttributeList attributeData)
1213
: base(attributeData)
@@ -15,7 +16,8 @@ public IntTextAttributeCardList(ModuleAttributeList attributeData)
1516

1617
protected override Bindable<object> GetDefaultItem()
1718
{
18-
return new Bindable<object>(0);
19+
var value = AttributeData.AttributeList.LastOrDefault()?.Value ?? 0;
20+
return new Bindable<object>(value);
1921
}
2022

2123
protected override object OnTextWrite(ValueChangedEvent<string> e)

‎VRCOSC.Game/Graphics/ModuleEditing/Attributes/Text/TextAttributeCard.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
namespace VRCOSC.Game.Graphics.ModuleEditing.Attributes.Text;
1111

12-
public class TextAttributeCard : AttributeCardSingle
12+
public partial class TextAttributeCard : AttributeCardSingle
1313
{
1414
private VRCOSCTextBox textBox = null!;
1515

‎VRCOSC.Game/Graphics/ModuleEditing/Attributes/Text/TextAttributeCardList.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Copyright (c) VolcanicArts. Licensed under the GPL-3.0 License.
22
// See the LICENSE file in the repository root for full license text.
33

4+
using System.Linq;
45
using osu.Framework.Allocation;
56
using osu.Framework.Bindables;
67
using osu.Framework.Extensions.IEnumerableExtensions;
@@ -9,7 +10,7 @@
910

1011
namespace VRCOSC.Game.Graphics.ModuleEditing.Attributes.Text;
1112

12-
public class TextAttributeCardList : AttributeCardList
13+
public partial class TextAttributeCardList : AttributeCardList
1314
{
1415
public TextAttributeCardList(ModuleAttributeList attributeData)
1516
: base(attributeData)
@@ -22,6 +23,12 @@ private void load()
2223
AttributeData.AttributeList.ForEach(addTextBox);
2324
}
2425

26+
protected override Bindable<object> GetDefaultItem()
27+
{
28+
var value = AttributeData.AttributeList.LastOrDefault()?.Value ?? string.Empty;
29+
return new Bindable<object>(value);
30+
}
31+
2532
private void addTextBox(Bindable<object> item)
2633
{
2734
var textBox = CreateTextBox().With(t => t.Text = item.Value.ToString());

‎VRCOSC.Game/Graphics/ModuleEditing/Attributes/Toggle/ToggleAttributeCard.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
namespace VRCOSC.Game.Graphics.ModuleEditing.Attributes.Toggle;
1111

12-
public sealed class ToggleAttributeCard : AttributeCardSingle
12+
public sealed partial class ToggleAttributeCard : AttributeCardSingle
1313
{
1414
private ToggleButton toggleButton = null!;
1515

‎VRCOSC.Game/Graphics/ModuleEditing/ModuleEditingContent.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace VRCOSC.Game.Graphics.ModuleEditing;
1515

16-
public sealed class ModuleEditingContent : Container
16+
public sealed partial class ModuleEditingContent : Container
1717
{
1818
private readonly SpriteText titleText;
1919
private readonly SeparatedAttributeFlow settings;
@@ -92,7 +92,7 @@ protected override void LoadComplete()
9292
}, true);
9393
}
9494

95-
private sealed class SeparatedAttributeFlow : Container
95+
private sealed partial class SeparatedAttributeFlow : Container
9696
{
9797
private readonly AttributeFlow attributeFlow;
9898

‎VRCOSC.Game/Graphics/ModuleEditing/ModuleEditingPopover.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
namespace VRCOSC.Game.Graphics.ModuleEditing;
1111

12-
public sealed class ModuleEditingPopover : PopoverScreen
12+
public sealed partial class ModuleEditingPopover : PopoverScreen
1313
{
1414
[Resolved(name: "EditingModule")]
1515
private Bindable<Module?> editingModule { get; set; } = null!;

‎VRCOSC.Game/Graphics/ModuleListing/Footer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
namespace VRCOSC.Game.Graphics.ModuleListing;
1414

15-
public sealed class Footer : Container
15+
public sealed partial class Footer : Container
1616
{
1717
[Resolved]
1818
private BindableBool modulesRunning { get; set; } = null!;

‎VRCOSC.Game/Graphics/ModuleListing/Header.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace VRCOSC.Game.Graphics.ModuleListing;
1010

11-
public sealed class Header : Container
11+
public sealed partial class Header : Container
1212
{
1313
public Header()
1414
{

‎VRCOSC.Game/Graphics/ModuleListing/Listing.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
namespace VRCOSC.Game.Graphics.ModuleListing;
1414

15-
public sealed class Listing : Container
15+
public sealed partial class Listing : Container
1616
{
1717
[Resolved]
1818
private ModuleManager moduleManager { get; set; } = null!;

‎VRCOSC.Game/Graphics/ModuleListing/ModuleCard.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
namespace VRCOSC.Game.Graphics.ModuleListing;
1616

17-
public sealed class ModuleCard : Container
17+
public sealed partial class ModuleCard : Container
1818
{
1919
public readonly Module Module;
2020

‎VRCOSC.Game/Graphics/ModuleListing/ModuleInfoPopover.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
namespace VRCOSC.Game.Graphics.ModuleListing;
1818

19-
public class ModuleInfoPopover : PopoverScreen
19+
public partial class ModuleInfoPopover : PopoverScreen
2020
{
2121
private readonly SpriteText title;
2222
private readonly TextFlowContainer description;
@@ -115,7 +115,7 @@ public ModuleInfoPopover()
115115
};
116116
}
117117

118-
private sealed class ParameterData : Container
118+
private sealed partial class ParameterData : Container
119119
{
120120
public string ParameterName { get; init; } = null!;
121121
public string Description { get; init; } = null!;

‎VRCOSC.Game/Graphics/ModuleListing/ModuleListingScreen.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
namespace VRCOSC.Game.Graphics.ModuleListing;
1212

1313
[Cached]
14-
public sealed class ModuleListingScreen : Container
14+
public sealed partial class ModuleListingScreen : Container
1515
{
1616
public ModuleListingScreen()
1717
{

0 commit comments

Comments
 (0)