Skip to content
This repository was archived by the owner on Jan 24, 2023. It is now read-only.

Commit c4164ff

Browse files
RequiDevRequiDev
committed
Merge branch 'master' into open-beta
2 parents ef99104 + 120cc22 commit c4164ff

6 files changed

Lines changed: 102 additions & 21 deletions

File tree

‎.github/FUNDING.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# These are supported funding model platforms
2+
3+
patreon: RequiDev

‎.github/workflows/main.yml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: main
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
jobs:
9+
build:
10+
11+
runs-on: windows-latest
12+
13+
steps:
14+
- uses: actions/checkout@v2
15+
with:
16+
submodules: recursive
17+
18+
- name: Bump version and push tag
19+
id: tag_version
20+
uses: mathieudutour/github-tag-action@v6.0
21+
with:
22+
github_token: ${{ secrets.GITHUB_TOKEN }}
23+
24+
- name: Checkout dependencies
25+
uses: actions/checkout@v2
26+
with:
27+
repository: ${{ secrets.LibsRepository }}
28+
token: ${{ secrets.LibsRepositoryToken }}
29+
path: 3rdparty/ml
30+
31+
- name: Setup .NET
32+
uses: actions/setup-dotnet@v1
33+
with:
34+
dotnet-version: 5.0.x
35+
36+
- name: Restore dependencies
37+
run: dotnet restore
38+
39+
- name: Build
40+
run: dotnet build --no-restore -c Release
41+
42+
- name: Publish a release
43+
uses: ncipollo/release-action@v1
44+
with:
45+
artifacts: |
46+
.build/Release (x64)/Modules/ReMod.Core.dll
47+
tag: ${{ steps.tag_version.outputs.new_tag }}
48+
name: Release ${{ steps.tag_version.outputs.new_tag }}
49+
body: ${{ steps.tag_version.outputs.changelog }}
50+
env:
51+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
.vs/
2+
/3rdparty/
3+
/.build/

‎ReMod.Core.csproj‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<DebugType>full</DebugType>
1919
<Optimize>false</Optimize>
2020
<PlatformTarget>x64</PlatformTarget>
21-
<OutputPath>..\.build\$(Configuration) ($(PlatformTarget))\Modules\$(ProjectName)\</OutputPath>
21+
<OutputPath>$(SolutionDir)\.build\$(Configuration) ($(PlatformTarget))\Modules\$(ProjectName)\</OutputPath>
2222
<BaseIntermediateOutputPath>..\.build</BaseIntermediateOutputPath>
2323
<IntermediateOutputPath>$(BaseIntermediateOutputPath)\tmp\$(Configuration) ($(PlatformTarget))\$(ProjectName)\</IntermediateOutputPath>
2424
<DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -30,7 +30,7 @@
3030
<DebugType>none</DebugType>
3131
<Optimize>true</Optimize>
3232
<PlatformTarget>x64</PlatformTarget>
33-
<OutputPath>..\.build\$(Configuration) ($(PlatformTarget))\Modules\$(ProjectName)\</OutputPath>
33+
<OutputPath>$(SolutionDir)\.build\$(Configuration) ($(PlatformTarget))\Modules\$(ProjectName)\</OutputPath>
3434
<BaseIntermediateOutputPath>..\.build</BaseIntermediateOutputPath>
3535
<IntermediateOutputPath>$(BaseIntermediateOutputPath)\tmp\$(Configuration) ($(PlatformTarget))\$(ProjectName)\</IntermediateOutputPath>
3636
<DefineConstants>TRACE</DefineConstants>
@@ -41,69 +41,69 @@
4141
</PropertyGroup>
4242
<ItemGroup>
4343
<Reference Include="Assembly-CSharp">
44-
<HintPath>..\3rdparty\ml\Managed\Assembly-CSharp.dll</HintPath>
44+
<HintPath>$(SolutionDir)\3rdparty\ml\Managed\Assembly-CSharp.dll</HintPath>
4545
<Private>False</Private>
4646
</Reference>
4747
<Reference Include="DataModel">
48-
<HintPath>..\3rdparty\ml\Managed\DataModel.dll</HintPath>
48+
<HintPath>$(SolutionDir)\3rdparty\ml\Managed\DataModel.dll</HintPath>
4949
<Private>False</Private>
5050
</Reference>
5151
<Reference Include="Il2Cppmscorlib">
52-
<HintPath>..\3rdparty\ml\Managed\Il2Cppmscorlib.dll</HintPath>
52+
<HintPath>$(SolutionDir)\3rdparty\ml\Managed\Il2Cppmscorlib.dll</HintPath>
5353
<Private>False</Private>
5454
</Reference>
5555
<Reference Include="MelonLoader">
56-
<HintPath>..\3rdparty\ml\MelonLoader.dll</HintPath>
56+
<HintPath>$(SolutionDir)\3rdparty\ml\MelonLoader.dll</HintPath>
5757
<Private>False</Private>
5858
</Reference>
5959
<Reference Include="Photon-DotNet">
60-
<HintPath>..\3rdparty\ml\Managed\Photon-DotNet.dll</HintPath>
60+
<HintPath>$(SolutionDir)\3rdparty\ml\Managed\Photon-DotNet.dll</HintPath>
6161
<Private>False</Private>
6262
</Reference>
6363
<Reference Include="System" />
6464
<Reference Include="System.Core" />
6565
<Reference Include="UnhollowerBaseLib">
66-
<HintPath>..\3rdparty\ml\Managed\UnhollowerBaseLib.dll</HintPath>
66+
<HintPath>$(SolutionDir)\3rdparty\ml\Managed\UnhollowerBaseLib.dll</HintPath>
6767
<Private>False</Private>
6868
</Reference>
6969
<Reference Include="Unity.TextMeshPro">
70-
<HintPath>..\3rdparty\ml\Managed\Unity.TextMeshPro.dll</HintPath>
70+
<HintPath>$(SolutionDir)\3rdparty\ml\Managed\Unity.TextMeshPro.dll</HintPath>
7171
<Private>False</Private>
7272
</Reference>
7373
<Reference Include="UnityEngine">
74-
<HintPath>..\3rdparty\ml\Managed\UnityEngine.dll</HintPath>
74+
<HintPath>$(SolutionDir)\3rdparty\ml\Managed\UnityEngine.dll</HintPath>
7575
<Private>False</Private>
7676
</Reference>
7777
<Reference Include="UnityEngine.CoreModule">
78-
<HintPath>..\3rdparty\ml\Managed\UnityEngine.CoreModule.dll</HintPath>
78+
<HintPath>$(SolutionDir)\3rdparty\ml\Managed\UnityEngine.CoreModule.dll</HintPath>
7979
<Private>False</Private>
8080
</Reference>
8181
<Reference Include="UnityEngine.ImageConversionModule">
82-
<HintPath>..\3rdparty\ml\Managed\UnityEngine.ImageConversionModule.dll</HintPath>
82+
<HintPath>$(SolutionDir)\3rdparty\ml\Managed\UnityEngine.ImageConversionModule.dll</HintPath>
8383
<Private>False</Private>
8484
</Reference>
8585
<Reference Include="UnityEngine.TextRenderingModule">
86-
<HintPath>..\3rdparty\ml\Managed\UnityEngine.TextRenderingModule.dll</HintPath>
86+
<HintPath>$(SolutionDir)\3rdparty\ml\Managed\UnityEngine.TextRenderingModule.dll</HintPath>
8787
<Private>False</Private>
8888
</Reference>
8989
<Reference Include="UnityEngine.UI">
90-
<HintPath>..\3rdparty\ml\Managed\UnityEngine.UI.dll</HintPath>
90+
<HintPath>$(SolutionDir)\3rdparty\ml\Managed\UnityEngine.UI.dll</HintPath>
9191
<Private>False</Private>
9292
</Reference>
9393
<Reference Include="VRC.UI.Core">
94-
<HintPath>..\3rdparty\ml\Managed\VRC.UI.Core.dll</HintPath>
94+
<HintPath>$(SolutionDir)\3rdparty\ml\Managed\VRC.UI.Core.dll</HintPath>
9595
<Private>False</Private>
9696
</Reference>
9797
<Reference Include="VRC.UI.Elements">
98-
<HintPath>..\3rdparty\ml\Managed\VRC.UI.Elements.dll</HintPath>
98+
<HintPath>$(SolutionDir)\3rdparty\ml\Managed\VRC.UI.Elements.dll</HintPath>
9999
<Private>False</Private>
100100
</Reference>
101101
<Reference Include="VRCCore-Standalone">
102-
<HintPath>..\3rdparty\ml\Managed\VRCCore-Standalone.dll</HintPath>
102+
<HintPath>$(SolutionDir)\3rdparty\ml\Managed\VRCCore-Standalone.dll</HintPath>
103103
<Private>False</Private>
104104
</Reference>
105105
<Reference Include="VRCSDKBase">
106-
<HintPath>..\3rdparty\ml\Managed\VRCSDKBase.dll</HintPath>
106+
<HintPath>$(SolutionDir)\3rdparty\ml\Managed\VRCSDKBase.dll</HintPath>
107107
<Private>False</Private>
108108
</Reference>
109109
</ItemGroup>
@@ -127,9 +127,9 @@
127127
<Compile Include="UI\QuickMenu\ReMenuButton.cs" />
128128
<Compile Include="UI\QuickMenu\ReMenuCategory.cs" />
129129
<Compile Include="UI\QuickMenu\ReMenuPage.cs" />
130-
<Compile Include="UI\QuickMenu\ReMenuSlider.cs" />
130+
<Compile Include="UI\QuickMenu\ReMenuSlider.cs" />
131131
<Compile Include="UI\QuickMenu\ReMenuToggle.cs" />
132-
<Compile Include="UI\QuickMenu\ReSliderCategory.cs" />
132+
<Compile Include="UI\QuickMenu\ReSliderCategory.cs" />
133133
<Compile Include="UI\QuickMenu\ReTabButton.cs" />
134134
<Compile Include="UI\ReUiButton.cs" />
135135
<Compile Include="UI\ReUiText.cs" />

‎ReMod.Core.sln‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.32126.317
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReMod.Core", "ReMod.Core.csproj", "{C87FE758-ACB9-4FA2-AF6F-10AA9AA0023C}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Any CPU = Debug|Any CPU
11+
Release|Any CPU = Release|Any CPU
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{C87FE758-ACB9-4FA2-AF6F-10AA9AA0023C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{C87FE758-ACB9-4FA2-AF6F-10AA9AA0023C}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{C87FE758-ACB9-4FA2-AF6F-10AA9AA0023C}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{C87FE758-ACB9-4FA2-AF6F-10AA9AA0023C}.Release|Any CPU.Build.0 = Release|Any CPU
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
GlobalSection(ExtensibilityGlobals) = postSolution
23+
SolutionGuid = {D28EDD8C-E2C7-4F07-87A4-973FE5B5E9F4}
24+
EndGlobalSection
25+
EndGlobal

‎UI/ReAvatarList.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public void Refresh(AvatarList avatars)
155155
_prevPageButton.Interactable = _currentPage > 0;
156156
_nextPageButton.Interactable = _currentPage < pagesCount;
157157

158-
Title = $"{_title} ({cutDown.Count}/{avatars.Count})";
158+
Title = $"{_title} ({cutDown.Count * (_currentPage + 1)}/{avatars.Count})";
159159

160160
_avatarList.StartRenderElementsCoroutine(cutDown);
161161
}

0 commit comments

Comments
 (0)