Skip to content

Commit

Permalink
Revert "Merge branch 'master' into master"
Browse files Browse the repository at this point in the history 
This reverts commit 6d15bcb, reversing
changes made to 43f8afe.
  • Loading branch information
@Ani-ki
Ani-ki committed Jan 21, 2023
1 parent 6d15bcb commit 9720edc
Show file tree
Hide file tree
Showing 7 changed files with 78 additions and 215 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/dotnet-desktop.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ jobs:
- name: Zip Release
uses: TheDoctor0/[email protected]
with:
filename: '../Anamnesis-IVCS.zip'
filename: '../Anamnesis.zip'
directory: './publish/'
exclusions: '*.pdb* *.xml*'

- name: Upload Release
uses: ncipollo/release-action@v1
with:
allowUpdates: true
artifacts: "Anamnesis-IVCS.zip"
artifacts: "Anamnesis.zip"
name: ${{ steps.version-date.outputs.formattedTime }}
tag: v${{ steps.version-date.outputs.formattedTime }}
#body: ${{ steps.Changelog.outputs.changelog }}
Expand Down
4 changes: 0 additions & 4 deletions Anamnesis/Actor/Posing/Views/PoseGUIView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,27 +80,23 @@
<local:BoneView Canvas.Left="118" Canvas.Top="145" BoneName="SpineB"/>
<local:BoneView Canvas.Left="118" Canvas.Top="180" BoneName="SpineA"/>
<local:BoneView Canvas.Left="118" Canvas.Top="210" BoneName="Waist"/>

<local:BoneView Canvas.Left="118" Canvas.Top="233" BoneName="iv_koumon"/>
<local:BoneView Canvas.Left="95" Canvas.Top="220" BoneName="iv_koumon_l" FlippedBoneName="iv_koumon_r"/>
<local:BoneView Canvas.Left="140" Canvas.Top="220" BoneName="iv_koumon_r" FlippedBoneName="iv_koumon_l"/>
<local:BoneView Canvas.Left="81" Canvas.Top="237" BoneName="iv_shiri_l" FlippedBoneName="iv_shiri_r"/>
<local:BoneView Canvas.Left="152" Canvas.Top="237" BoneName="iv_shiri_r" FlippedBoneName="iv_shiri_l"/>

<local:BoneView Canvas.Left="98" Canvas.Top="93" BoneName="ClavicleLeft" FlippedBoneName="ClavicleRight"/>
<local:BoneView Canvas.Left="138" Canvas.Top="93" BoneName="ClavicleRight" FlippedBoneName="ClavicleLeft"/>
<local:BoneView Canvas.Left="73" Canvas.Top="87" BoneName="ShoulderLeft" FlippedBoneName="ShoulderRight"/>
<local:BoneView Canvas.Left="165" Canvas.Top="87" BoneName="ShoulderRight" FlippedBoneName="ShoulderLeft"/>
<local:BoneView Canvas.Left="102" Canvas.Top="120" BoneName="BreastLeft" FlippedBoneName="BreastRight"/>

<local:BoneView Canvas.Left="95" Canvas.Top="142" BoneName="iv_c_mune_l" FlippedBoneName="iv_c_mune_r"/>
<local:BoneView Canvas.Left="135" Canvas.Top="120" BoneName="BreastRight" FlippedBoneName="BreastLeft"/>
<local:BoneView Canvas.Left="140" Canvas.Top="142" BoneName="iv_c_mune_r" FlippedBoneName="iv_c_mune_l"/>
<local:BoneView Canvas.Left="78" Canvas.Top="107" BoneName="ArmLeft" FlippedBoneName="ArmRight"/>
<local:BoneView Canvas.Left="55" Canvas.Top="127" BoneName="iv_nitoukin_l" FlippedBoneName="iv_nitoukin_r"/>
<local:BoneView Canvas.Left="158" Canvas.Top="107" BoneName="ArmRight" FlippedBoneName="ArmLeft"/>
<local:BoneView Canvas.Left="179" Canvas.Top="127" BoneName="iv_nitoukin_r" FlippedBoneName="iv_nitoukin_l"/>

<local:BoneView Canvas.Left="75" Canvas.Top="160" BoneName="ElbowLeft" FlippedBoneName="ElbowRight"/>
<local:BoneView Canvas.Left="160" Canvas.Top="160" BoneName="ElbowRight" FlippedBoneName="ElbowLeft"/>
<local:BoneView Canvas.Left="55" Canvas.Top="160" BoneName="ForearmLeft" FlippedBoneName="ForearmRight"/>
Expand Down
204 changes: 3 additions & 201 deletions Anamnesis/Actor/Posing/Views/PoseMatrixView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -367,81 +367,6 @@
</Grid>
</GroupBox>

<GroupBox>
<GroupBox.Header>
<Button Style="{StaticResource LinkButton}" Click="OnGroupClicked">
<XivToolsWpf:TextBlock Key="Pose_Matrix_GenitalCategory"/>
</Button>
</GroupBox.Header>

<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>

<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>

<XivToolsWpf:TextBlock Grid.Column="0" Key="Pose_Penis" Style="{DynamicResource Label}" Margin="16, 0, 3, 0"/>
<StackPanel Grid.Column="1" Grid.Row="0" Orientation="Horizontal" >
<local:BoneView BoneName="iv_ochinko_a" Label="1"/>
<local:BoneView BoneName="iv_ochinko_b" Label="2"/>
<local:BoneView BoneName="iv_ochinko_c" Label="3"/>
<local:BoneView BoneName="iv_ochinko_d" Label="4"/>
<local:BoneView BoneName="iv_ochinko_e" Label="5"/>
<local:BoneView BoneName="iv_ochinko_f" Label="6"/>
</StackPanel>

<XivToolsWpf:TextBlock Grid.Column="3" Key="Pose_Scrotum" Style="{DynamicResource Label}" Margin="16, 0, 3, 0"/>
<StackPanel Grid.Column="4" Grid.Row="0" Orientation="Horizontal" >
<local:BoneView BoneName="iv_kougan_l" Label="L"/>
<local:BoneView BoneName="iv_kougan_r" Label="R"/>
</StackPanel>

<XivToolsWpf:TextBlock Grid.Column="0" Grid.Row="1" Key="Pose_Vagina" Style="{DynamicResource Label}" Margin="16, 0, 3, 0"/>
<StackPanel Grid.Column="1" Grid.Row="1" Orientation="Horizontal" >
<local:BoneView BoneName="iv_omanko"/>
</StackPanel>

<XivToolsWpf:TextBlock Grid.Column="3" Grid.Row="1" Key="Pose_Clitoris" Style="{DynamicResource Label}" Margin="16, 0, 3, 0"/>
<StackPanel Grid.Column="4" Grid.Row="1" Orientation="Horizontal" >
<local:BoneView BoneName="iv_kuritto"/>
</StackPanel>

<XivToolsWpf:TextBlock Grid.Column="7" Grid.Row="1" Key="Pose_Labia" Style="{DynamicResource Label}" Margin="16, 0, 3, 0"/>
<StackPanel Grid.Column="8" Grid.Row="1" Orientation="Horizontal" >
<local:BoneView BoneName="iv_inshin_l" Label="L"/>
<local:BoneView BoneName="iv_inshin_r" Label="R"/>
</StackPanel>

<XivToolsWpf:TextBlock Grid.Column="0" Grid.Row="2" Key="Pose_Anus" Style="{DynamicResource Label}" Margin="16, 0, 3, 0"/>
<StackPanel Grid.Column="1" Grid.Row="2" Orientation="Horizontal" >
<local:BoneView BoneName="iv_koumon"/>
<local:BoneView BoneName="iv_koumon_l" Label="L"/>
<local:BoneView BoneName="iv_koumon_r" Label="R"/>
</StackPanel>

<XivToolsWpf:TextBlock Grid.Column="3" Grid.Row="2" Key="Pose_Buttocks" Style="{DynamicResource Label}" Margin="16, 0, 3, 0"/>
<StackPanel Grid.Column="4" Grid.Row="2" Orientation="Horizontal" >
<local:BoneView BoneName="iv_shiri_l" Label="L"/>
<local:BoneView BoneName="iv_shiri_r" Label="R"/>
</StackPanel>

</Grid>

</GroupBox>

<GroupBox>
<GroupBox.Header>
<Button Style="{StaticResource LinkButton}" Click="OnGroupClicked">
Expand Down Expand Up @@ -655,7 +580,6 @@
<local:BoneView BoneName="iv_naka_c_r" Label="3"/>
</StackPanel>


<XivToolsWpf:TextBlock Grid.Column="2" Grid.Row="1" Key="Pose_Ring" Style="{DynamicResource Label}" Margin="16, 0, 3, 0"/>
<StackPanel Grid.Column="3" Grid.Row="1" Orientation="Horizontal" >
<local:BoneView BoneName="RingARight" Label="1"/>
Expand All @@ -669,6 +593,7 @@
<local:BoneView BoneName="PinkyBRight" Label="2"/>
<local:BoneView BoneName="iv_ko_c_r" Label="3"/>
</StackPanel>

</Grid>
</GroupBox>

Expand Down Expand Up @@ -725,6 +650,7 @@
<local:BoneView BoneName="CalfRight" Label="R"/>
</StackPanel>

<XivToolsWpf:TextBlock Grid.Column="0" Grid.Row="1" Key="Pose_Sheathes" Style="{DynamicResource Label}" Margin="16, 0, 3, 0"/>
<StackPanel Grid.Column="1" Grid.Row="1" Orientation="Horizontal" >
<local:BoneView BoneName="SheatheLeft" Label="L"/>
<local:BoneView BoneName="SheatheRight" Label="R"/>
Expand All @@ -751,131 +677,7 @@
</Grid>
</GroupBox>

<GroupBox>
<GroupBox.Header>
<Button Style="{StaticResource LinkButton}" Click="OnGroupClicked">
<XivToolsWpf:TextBlock Key="Pose_Matrix_LeftFootCategory"/>
</Button>
</GroupBox.Header>

<Grid>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>

<XivToolsWpf:TextBlock Grid.Column="0" Grid.Row="0" Key="Pose_Foot" Style="{DynamicResource Label}" Margin="16, 0, 3, 0"/>
<local:BoneView Grid.Column="1" Grid.Row="0" BoneName="FootLeft"/>

<XivToolsWpf:TextBlock Grid.Column="2" Grid.Row="0" Key="Pose_Toes" Style="{DynamicResource Label}" Margin="16, 0, 3, 0"/>
<local:BoneView Grid.Column="3" Grid.Row="0" BoneName="ToesLeft"/>

<XivToolsWpf:TextBlock Grid.Column="4" Grid.Row="0" Key="Pose_BigToe" Style="{DynamicResource Label}" Margin="16, 0, 3, 0"/>
<StackPanel Orientation="Horizontal" Grid.Column="5" Grid.Row="0">
<local:BoneView BoneName="iv_asi_oya_a_l" Label="1"/>
<local:BoneView BoneName="iv_asi_oya_b_l" Label="2"/>
</StackPanel>

<XivToolsWpf:TextBlock Grid.Column="6" Grid.Row="0" Key="Pose_IndexToe" Style="{DynamicResource Label}" Margin="16, 0, 3, 0"/>
<StackPanel Orientation="Horizontal" Grid.Column="7" Grid.Row="0">
<local:BoneView BoneName="iv_asi_hito_a_l" Label="1"/>
<local:BoneView BoneName="iv_asi_hito_b_l" Label="2"/>
</StackPanel>

<XivToolsWpf:TextBlock Grid.Column="0" Grid.Row="1" Key="Pose_MiddleToe" Style="{DynamicResource Label}" Margin="16, 0, 3, 0"/>
<StackPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="1">
<local:BoneView BoneName="iv_asi_naka_a_l" Label="1"/>
<local:BoneView BoneName="iv_asi_naka_b_l" Label="2"/>
</StackPanel>

<XivToolsWpf:TextBlock Grid.Column="2" Grid.Row="1" Key="Pose_ForeToe" Style="{DynamicResource Label}" Margin="16, 0, 3, 0"/>
<StackPanel Orientation="Horizontal" Grid.Column="3" Grid.Row="1">
<local:BoneView BoneName="iv_asi_kusu_a_l" Label="1"/>
<local:BoneView BoneName="iv_asi_kusu_b_l" Label="2"/>
</StackPanel>

<XivToolsWpf:TextBlock Grid.Column="4" Grid.Row="1" Key="Pose_PinkyToe" Style="{DynamicResource Label}" Margin="16, 0, 3, 0"/>
<StackPanel Orientation="Horizontal" Grid.Column="5" Grid.Row="1">
<local:BoneView BoneName="iv_asi_ko_a_l" Label="1"/>
<local:BoneView BoneName="iv_asi_ko_b_l" Label="2"/>
</StackPanel>

</Grid>
</GroupBox>

<GroupBox>
<GroupBox.Header>
<Button Style="{StaticResource LinkButton}" Click="OnGroupClicked">
<XivToolsWpf:TextBlock Key="Pose_Matrix_RightFootCategory"/>
</Button>
</GroupBox.Header>

<Grid>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>

<XivToolsWpf:TextBlock Grid.Column="0" Grid.Row="0" Key="Pose_Foot" Style="{DynamicResource Label}" Margin="16, 0, 3, 0"/>
<local:BoneView Grid.Column="1" Grid.Row="0" BoneName="FootRight"/>

<XivToolsWpf:TextBlock Grid.Column="2" Grid.Row="0" Key="Pose_Toes" Style="{DynamicResource Label}" Margin="16, 0, 3, 0"/>
<local:BoneView Grid.Column="3" Grid.Row="0" BoneName="ToesRight"/>

<XivToolsWpf:TextBlock Grid.Column="4" Grid.Row="0" Key="Pose_BigToe" Style="{DynamicResource Label}" Margin="16, 0, 3, 0"/>
<StackPanel Orientation="Horizontal" Grid.Column="5" Grid.Row="0">
<local:BoneView BoneName="iv_asi_oya_a_r" Label="1"/>
<local:BoneView BoneName="iv_asi_oya_b_r" Label="2"/>
</StackPanel>

<XivToolsWpf:TextBlock Grid.Column="6" Grid.Row="0" Key="Pose_IndexToe" Style="{DynamicResource Label}" Margin="16, 0, 3, 0"/>
<StackPanel Orientation="Horizontal" Grid.Column="7" Grid.Row="0">
<local:BoneView BoneName="iv_asi_hito_a_r" Label="1"/>
<local:BoneView BoneName="iv_asi_hito_b_r" Label="2"/>
</StackPanel>

<XivToolsWpf:TextBlock Grid.Column="0" Grid.Row="1" Key="Pose_MiddleToe" Style="{DynamicResource Label}" Margin="16, 0, 3, 0"/>
<StackPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="1">
<local:BoneView BoneName="iv_asi_naka_a_r" Label="1"/>
<local:BoneView BoneName="iv_asi_naka_b_r" Label="2"/>
</StackPanel>

<XivToolsWpf:TextBlock Grid.Column="2" Grid.Row="1" Key="Pose_ForeToe" Style="{DynamicResource Label}" Margin="16, 0, 3, 0"/>
<StackPanel Orientation="Horizontal" Grid.Column="3" Grid.Row="1">
<local:BoneView BoneName="iv_asi_kusu_a_r" Label="1"/>
<local:BoneView BoneName="iv_asi_kusu_b_r" Label="2"/>
</StackPanel>

<XivToolsWpf:TextBlock Grid.Column="4" Grid.Row="1" Key="Pose_PinkyToe" Style="{DynamicResource Label}" Margin="16, 0, 3, 0"/>
<StackPanel Orientation="Horizontal" Grid.Column="5" Grid.Row="1">
<local:BoneView BoneName="iv_asi_ko_a_r" Label="1"/>
<local:BoneView BoneName="iv_asi_ko_b_r" Label="2"/>
</StackPanel>

</Grid>
</GroupBox>

<GroupBox>
<GroupBox>
<GroupBox.Header>
<Button Style="{StaticResource LinkButton}" Click="OnGroupClicked">
<XivToolsWpf:TextBlock Key="Pose_Matrix_LeftFootCategory"/>
Expand Down
3 changes: 1 addition & 2 deletions Anamnesis/Styles/Controls/QuaternionEditor.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -586,8 +586,7 @@ public Vector3D Drag(Point3D mousePosition)
if (Keyboard.IsKeyDown(Key.LeftCtrl))
speed = 0.5f;


if (Keyboard.IsKeyDown(Key.RightCtrl))r
if (Keyboard.IsKeyDown(Key.RightCtrl))
speed = 0.5f;

return this.Axis * (angle * speed);
Expand Down
4 changes: 2 additions & 2 deletions Anamnesis/Updater/UpdateService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ namespace Anamnesis.Updater;

public class UpdateService : ServiceBase<UpdateService>
{
private const string Repository = "Peebs-miqo/Anamnesis-IVCS";
private const string Repository = "imchillin/Anamnesis";

private readonly HttpClient httpClient = new HttpClient();
private Release? currentRelease;

private static string UpdateTempDir => Path.GetTempPath() + "/AnamnesisIVCSUpdateLatest/";
private static string UpdateTempDir => Path.GetTempPath() + "/AnamnesisUpdateLatest/";

public override async Task Initialize()
{
Expand Down
Loading

0 comments on commit 9720edc

Please sign in to comment.