Skip to content

Commit

Permalink
Merge pull request #94 from geefr/macaroni
Browse files Browse the repository at this point in the history
Add Macaroni
  • Loading branch information
geefr authored Oct 29, 2021
2 parents 3ed971a + 28513bc commit 0e16fd2
Show file tree
Hide file tree
Showing 9 changed files with 77 additions and 10 deletions.
13 changes: 8 additions & 5 deletions Beataroni/Beataroni.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26124.0
# Visual Studio Version 16
VisualStudioVersion = 16.0.31410.357
MinimumVisualStudioVersion = 15.0.26124.0
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Beataroni", "Beataroni\Beataroni.csproj", "{165F30D5-92CF-40B1-9E38-CA398EBD15D3}"
EndProject
Expand All @@ -18,9 +18,6 @@ Global
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{165F30D5-92CF-40B1-9E38-CA398EBD15D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{165F30D5-92CF-40B1-9E38-CA398EBD15D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
Expand Down Expand Up @@ -59,4 +56,10 @@ Global
{88E1BFB8-83C1-42DD-8102-BCD47A498DE4}.Release|x86.ActiveCfg = Release|Any CPU
{88E1BFB8-83C1-42DD-8102-BCD47A498DE4}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F6C785E2-380F-48C9-B873-FC379E9B5308}
EndGlobalSection
EndGlobal
Binary file removed Beataroni/Beataroni/Assets/avalonia-logo.ico
Binary file not shown.
Binary file added Beataroni/Beataroni/Assets/macaroni_128.ico
Binary file not shown.
Binary file added Beataroni/Beataroni/Assets/macaroni_256.ico
Binary file not shown.
2 changes: 1 addition & 1 deletion Beataroni/Beataroni/Views/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Beataroni.Views.MainWindow"
Icon="/Assets/avalonia-logo.ico"
Icon="/Assets/macaroni_128.ico"
Title="Beataroni"
Content="{Binding Content}"
Width="400"
Expand Down
2 changes: 1 addition & 1 deletion Beataroni/Beataroni/Views/SettingsView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</Grid>
<Button HorizontalAlignment="Stretch" Command="{Binding ContinueButton}">Continue</Button>

<TextBlock HorizontalAlignment="Center">Notes</TextBlock>
<TextBlock HorizontalAlignment="Center">** Notes **</TextBlock>
<TextBlock HorizontalAlignment="Center">Beataroni only supports Steam installations</TextBlock>
<TextBlock HorizontalAlignment="Center">Linux is the primary target for now</TextBlock>
<TextBlock HorizontalAlignment="Center">For Windows use ModAssistant, it's way better</TextBlock>
Expand Down
8 changes: 5 additions & 3 deletions Beataroni/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Beataroni
Beataroni is a graphical mod installer for Linux. In the future it may gain more features/platforms.
Beataroni is a graphical BeatSaber mod installer for Linux. In the future it may gain more features/platforms.

Beataroni is a spiritual successor to QBeat, but has some major differences:
* It's written in C#
Expand Down Expand Up @@ -43,12 +43,14 @@ Install steps:
# Limitations/Known Bugs
* Beataroni is new code, there will be bugs
* Only Steam installations are supported (If you're somehow using oculus on Linux I'll happily add support, wouldn't be difficult)
* The packaging of BSIPA is currently a hack, there may be side effects of this
* The install package of Beataroni is a bit weird, as the binary is actually a shared library (Thanks Microsoft). Beataroni-Linux.sh will launch it correctly, or just ./Beataroni from a terminal window until i can work out a better solution.

# Thanks
Beataroni includes a copy of [BSIPA](https://github.com/bsmg/BeatSaber-IPA-Reloaded), which has been forked/minimised in order to create a Linux-native executable.
Beataroni includes a copy of [BSIPA](https://github.com/bsmg/BeatSaber-IPA-Reloaded), which has been forked/minimised in order to create a Linux-native executable. See [BSIPA Linux](https://github.com/geefr/BSIPA-Linux).

BSIPA is Copyright (c) 2019 Anairkoen Schno, distributed under the MIT licence.

Beataroni logo/icon by Ticia Schiffner (CC0 licence).

General thanks go to any early testers, all the mod developers, and the wider community. Stay awesome.

Binary file added Beataroni/macaroni.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
62 changes: 62 additions & 0 deletions Beataroni/macaroni.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0e16fd2

Please sign in to comment.