Merge branch 'develop' of https://github.com/Vocaluxe/Vocaluxe into develop
This commit is contained in:
z3ro01 committed
commit
f529dd8bbf
6 files changed
+80
-90
No files matched your search
@@ -109,6 +109,7 @@
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<FloatingPointModel>Fast</FloatingPointModel>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
@@ -127,6 +128,7 @@
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<FloatingPointModel>Fast</FloatingPointModel>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
@@ -148,6 +150,7 @@
|
||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||
<FloatingPointModel>Fast</FloatingPointModel>
|
||||
<OmitFramePointers>false</OmitFramePointers>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
@@ -170,6 +173,7 @@
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||
<FloatingPointModel>Fast</FloatingPointModel>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
@@ -212,6 +216,6 @@
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
<Target Name="AfterBuild">
|
||||
<Message Text="VisualStudioVersion value is '$(VisualStudioVersion)'" Importance="normal"/>
|
||||
<Message Text="VisualStudioVersion value is '$(VisualStudioVersion)'" Importance="normal" />
|
||||
</Target>
|
||||
</Project>
|
||||
</Project>
|
||||
@@ -1,50 +0,0 @@
|
||||
__ __ _
|
||||
\ \ / /__ ___ __ _| |_ ___ _____
|
||||
\ \ / / _ \ / __/ _` | | | | \ \/ / _ \
|
||||
\ V / (_) | (_| (_| | | |_| |> < __/
|
||||
\_/ \___/ \___\__,_|_|\__,_/_/\_\___|
|
||||
|
||||
|
||||
=================================
|
||||
= 1. About =
|
||||
= 2. Download =
|
||||
= 3. Development Guidelines =
|
||||
= 4. Help & Support =
|
||||
=================================
|
||||
|
||||
|
||||
=================================
|
||||
= 1. About =
|
||||
=================================
|
||||
Vocaluxe is a free and open source singing game, inspired by the original UltraStar (developed by corvus5) and the great Ultrastar Deluxe project - yet it is an entirely new development in C#. It allows up to three players (currently) to sing along with music using microphones in order to score points, depending on the pitch of the voice and the rhythm of singing. It features mouse and keyboard navigation, a multi-language interface, and singer profiles with avatars and supports songs in CP1250/52 and UTF8 encodings.
|
||||
|
||||
Supported Operating Systems / Requirements:
|
||||
- WinXP, Vista, Windows 7 with .NET 4.0
|
||||
- 1 GHz CPU, 512 MB RAM, Graphics card with OpenGL 2.1 or DirectX 9.0 support
|
||||
|
||||
|
||||
=================================
|
||||
= 2. Download =
|
||||
=================================
|
||||
You can download precompiled Windows binaries at SourceForge:
|
||||
|
||||
http://sourceforge.net/projects/vocaluxe/
|
||||
|
||||
|
||||
=================================
|
||||
= 3. Development Guidelines =
|
||||
=================================
|
||||
The development of Vocaluxe uses this git branching model:
|
||||
|
||||
http://nvie.com/posts/a-successful-git-branching-model/
|
||||
|
||||
|
||||
=================================
|
||||
= 4. Help & Suppport =
|
||||
=================================
|
||||
GitHub Wiki: https://github.com/Vocaluxe/Vocaluxe/wiki
|
||||
GitGub Issues Tracker: https://github.com/Vocaluxe/Vocaluxe/issues
|
||||
Bug Tracker: http://84.200.73.138/redmine/projects/vocaluxe
|
||||
Translations: https://www.transifex.com/projects/p/vocaluxe/
|
||||
Support Forum (German): http://www.ultra-star.de
|
||||
Song-DataBase (USDB): http://usdb.animux.de/
|
||||
@@ -0,0 +1,50 @@
|
||||
|
||||
|
||||
[1. About](#1-about)
|
||||
[2. Download](#2-download)
|
||||
[3. Contributing](#3-contributing)
|
||||
[4. Help & Support](#4-help--support)
|
||||
|
||||
## 1. About
|
||||
Vocaluxe is a free and open source singing game, inspired by the original UltraStar (developed by corvus5) and the great Ultrastar Deluxe project - yet it is an entirely new development in C#.
|
||||
It allows up to six players to sing along with music using microphones in order to score points, depending on the pitch of the voice and the rhythm of singing.
|
||||
It features mouse, keyboard, gamepad and Wiimote navigation, a multi-language interface, and singer profiles with avatars and supports songs in CP1250/52 and UTF8 encodings.
|
||||
Vocaluxe offers diversified party modes and can optionally be controlled via Browser/App.
|
||||
|
||||
Supported Operating Systems / Requirements:
|
||||
- WinXP, Vista, Windows 7, Windows 8, Windows 8.1 and Windows 10 with .NET 4.0
|
||||
- Linux (tested on Arch Linux)
|
||||
- 1 GHz CPU, 512 MB RAM, Graphics card with OpenGL 2.1 or DirectX 9.0 support
|
||||
|
||||
|
||||
## 2. Download
|
||||
You can download precompiled Windows binaries at here:
|
||||
http://vocaluxe.sourceforge.net/index.php?p=download
|
||||
|
||||
Nightly builds are available here:
|
||||
https://github.com/Vocaluxe/Vocaluxe/releases
|
||||
|
||||
## 3. Contributing
|
||||
You want to fix a bug or add a cool new feature to Vocaluxe? Awesome!
|
||||
|
||||
### Build Vocaluxe
|
||||
Building Vocaluxe is easy:
|
||||
Just follow the guide on our wiki to clone the repository and create your own Vocaluxe build:
|
||||
[Build Vocaluxe (Windows)](https://github.com/Vocaluxe/Vocaluxe/wiki/HowTo:-Build-Vocaluxe-(Windows))
|
||||
|
||||
### Submit your change
|
||||
Upload your changes to your fork and open a new pull request.
|
||||
|
||||
The development of Vocaluxe uses this git branching model:
|
||||
http://nvie.com/posts/a-successful-git-branching-model/
|
||||
|
||||
### Questions
|
||||
You have a problem or a question implementing your change?
|
||||
Just [open an issue](https://github.com/Vocaluxe/Vocaluxe/issues/new) or mention `@Vocaluxe` in a comment on GitHub.
|
||||
|
||||
## 4. Help & Support
|
||||
GitHub Wiki: https://github.com/Vocaluxe/Vocaluxe/wiki
|
||||
GitHub Issues Tracker: https://github.com/Vocaluxe/Vocaluxe/issues
|
||||
Translations: https://www.transifex.com/projects/p/vocaluxe/
|
||||
Support Forum (German): http://www.ultra-star.de
|
||||
Song-Database (USDB): http://usdb.animux.de/
|
||||
@@ -37,7 +37,7 @@ namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
|
||||
#endif
|
||||
string gstreamerEnvVar = Environment.GetEnvironmentVariable(varName, EnvironmentVariableTarget.User);
|
||||
string dllDirectory;
|
||||
if (gstreamerEnvVar == null)
|
||||
if (gstreamerEnvVar == null || !Directory.Exists(gstreamerEnvVar))
|
||||
{
|
||||
#if ARCH_X86
|
||||
dllDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "libs\\unmanaged\\gstreamer86\\bin\\");
|
||||
|
||||
+22
-35
@@ -336,7 +336,9 @@
|
||||
<Content Include="Website\locales\tr.json">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<None Include="packages.config" />
|
||||
<None Include="packages.config">
|
||||
<SubType>Designer</SubType>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="Doc\Roadmap.txt" />
|
||||
@@ -506,41 +508,28 @@ powershell -command "(Get-Content -Encoding UTF8 '$(ProjectDir)Properties\Assemb
|
||||
</PostBuildEventDependsOn>
|
||||
</PropertyGroup>
|
||||
<Target Name="managedDepCopyAfterBuild" BeforeTargets="AfterBuild">
|
||||
<Message Text="move all libs to the managed dependencies folder" Importance="normal"/>
|
||||
<Message Text="move all libs to the managed dependencies folder" Importance="normal" />
|
||||
<ItemGroup>
|
||||
<RootDLLFilesToMove Include="$(TargetDir)*.dll"/>
|
||||
<RootDLLFilesToMove Include="$(TargetDir)*.dll" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<x64FolderFilesToMove Include="$(TargetDir)x64\*.*"/>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<x86FolderFilesToMove Include="$(TargetDir)x86\*.*"/>
|
||||
<x64FolderFilesToMove Include="$(TargetDir)x64\*.*" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<OtherFilesToMove Include="$(TargetDir)System.Data.SQLite.xml;"/>
|
||||
<ItemGroup>
|
||||
<x86FolderFilesToMove Include="$(TargetDir)x86\*.*" />
|
||||
</ItemGroup>
|
||||
<Copy
|
||||
SourceFiles="@(RootDLLFilesToMove)"
|
||||
DestinationFiles="@(RootDLLFilesToMove->'$(TargetDir)libs\managed\%(Filename)%(Extension)')"/>
|
||||
<Copy
|
||||
SourceFiles="@(x64FolderFilesToMove)"
|
||||
DestinationFiles="@(x64FolderFilesToMove->'$(TargetDir)libs\managed\x64\%(Filename)%(Extension)')"/>
|
||||
<Copy
|
||||
SourceFiles="@(x86FolderFilesToMove)"
|
||||
DestinationFiles="@(x86FolderFilesToMove->'$(TargetDir)libs\managed\x86\%(Filename)%(Extension)')"/>
|
||||
<Copy
|
||||
SourceFiles="@(OtherFilesToMove)"
|
||||
DestinationFiles="@(OtherFilesToMove->'$(TargetDir)libs\managed\%(Filename)%(Extension)')"/>
|
||||
<Delete
|
||||
Files="@(RootDLLFilesToMove)" />
|
||||
<Delete
|
||||
Files="@(x64FolderFilesToMove)" />
|
||||
<Delete
|
||||
Files="@(x86FolderFilesToMove)" />
|
||||
<Delete
|
||||
Files="@(OtherFilesToMove)" />
|
||||
<RemoveDir
|
||||
Directories="$(TargetDir)\x64\;$(TargetDir)\x86\" />
|
||||
<ItemGroup>
|
||||
<OtherFilesToMove Include="$(TargetDir)System.Data.SQLite.xml;" />
|
||||
</ItemGroup>
|
||||
<Copy SourceFiles="@(RootDLLFilesToMove)" DestinationFiles="@(RootDLLFilesToMove->'$(TargetDir)libs\managed\%(Filename)%(Extension)')" />
|
||||
<Copy SourceFiles="@(x64FolderFilesToMove)" DestinationFiles="@(x64FolderFilesToMove->'$(TargetDir)libs\managed\x64\%(Filename)%(Extension)')" />
|
||||
<Copy SourceFiles="@(x86FolderFilesToMove)" DestinationFiles="@(x86FolderFilesToMove->'$(TargetDir)libs\managed\x86\%(Filename)%(Extension)')" />
|
||||
<Copy SourceFiles="@(OtherFilesToMove)" DestinationFiles="@(OtherFilesToMove->'$(TargetDir)libs\managed\%(Filename)%(Extension)')" />
|
||||
<Delete Files="@(RootDLLFilesToMove)" />
|
||||
<Delete Files="@(x64FolderFilesToMove)" />
|
||||
<Delete Files="@(x86FolderFilesToMove)" />
|
||||
<Delete Files="@(OtherFilesToMove)" />
|
||||
<RemoveDir Directories="$(TargetDir)\x64\;$(TargetDir)\x86\" />
|
||||
</Target>
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
@@ -553,13 +542,12 @@ powershell -command "(Get-Content -Encoding UTF8 '$(ProjectDir)Properties\Assemb
|
||||
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.hidapi.1.0.1\build\vocaluxe.dependencies.hidapi.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.hidapi.1.0.1\build\vocaluxe.dependencies.hidapi.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.pitchtracker.1.0.1\build\vocaluxe.dependencies.pitchtracker.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.pitchtracker.1.0.1\build\vocaluxe.dependencies.pitchtracker.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.1\build\vocaluxe.dependencies.gstreamer.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.gstreamer.1.0.1\build\vocaluxe.dependencies.gstreamer.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.1.0.5\build\vocaluxe.dependencies.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.1.0.5\build\vocaluxe.dependencies.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.1.0.6\build\vocaluxe.dependencies.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.1.0.6\build\vocaluxe.dependencies.targets'))" />
|
||||
</Target>
|
||||
<Import Project="..\packages\vocaluxe.dependencies.acinerella.1.0.1\build\vocaluxe.dependencies.acinerella.targets" Condition="Exists('..\packages\vocaluxe.dependencies.acinerella.1.0.1\build\vocaluxe.dependencies.acinerella.targets')" />
|
||||
<Import Project="..\packages\vocaluxe.dependencies.aforgevideo.1.0.1\build\vocaluxe.dependencies.aforgevideo.targets" Condition="Exists('..\packages\vocaluxe.dependencies.aforgevideo.1.0.1\build\vocaluxe.dependencies.aforgevideo.targets')" />
|
||||
@@ -568,11 +556,10 @@ powershell -command "(Get-Content -Encoding UTF8 '$(ProjectDir)Properties\Assemb
|
||||
<Import Project="..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets" Condition="Exists('..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets')" />
|
||||
<Import Project="..\packages\vocaluxe.dependencies.hidapi.1.0.1\build\vocaluxe.dependencies.hidapi.targets" Condition="Exists('..\packages\vocaluxe.dependencies.hidapi.1.0.1\build\vocaluxe.dependencies.hidapi.targets')" />
|
||||
<Import Project="..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets" Condition="Exists('..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets')" />
|
||||
<Import Project="..\packages\vocaluxe.dependencies.pitchtracker.1.0.1\build\vocaluxe.dependencies.pitchtracker.targets" Condition="Exists('..\packages\vocaluxe.dependencies.pitchtracker.1.0.1\build\vocaluxe.dependencies.pitchtracker.targets')" />
|
||||
<Import Project="..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets" Condition="Exists('..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets')" />
|
||||
<Import Project="..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets" Condition="Exists('..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets')" />
|
||||
<Import Project="..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets" Condition="Exists('..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets')" />
|
||||
<Import Project="..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets" Condition="Exists('..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets')" />
|
||||
<Import Project="..\packages\vocaluxe.dependencies.gstreamer.1.0.1\build\vocaluxe.dependencies.gstreamer.targets" Condition="Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.1\build\vocaluxe.dependencies.gstreamer.targets')" />
|
||||
<Import Project="..\packages\vocaluxe.dependencies.1.0.5\build\vocaluxe.dependencies.targets" Condition="Exists('..\packages\vocaluxe.dependencies.1.0.5\build\vocaluxe.dependencies.targets')" />
|
||||
<Import Project="..\packages\vocaluxe.dependencies.1.0.6\build\vocaluxe.dependencies.targets" Condition="Exists('..\packages\vocaluxe.dependencies.1.0.6\build\vocaluxe.dependencies.targets')" />
|
||||
</Project>
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="vocaluxe.dependencies" version="1.0.5" targetFramework="net40" />
|
||||
<package id="vocaluxe.dependencies" version="1.0.6" targetFramework="net40" />
|
||||
<package id="vocaluxe.dependencies.acinerella" version="1.0.1" targetFramework="net40" />
|
||||
<package id="vocaluxe.dependencies.aforgevideo" version="1.0.1" targetFramework="net40" />
|
||||
<package id="vocaluxe.dependencies.csharpsqlite" version="1.0.1" targetFramework="net40" />
|
||||
@@ -9,7 +9,6 @@
|
||||
<package id="vocaluxe.dependencies.gstreamersharp" version="1.0.1" targetFramework="net40" />
|
||||
<package id="vocaluxe.dependencies.hidapi" version="1.0.1" targetFramework="net40" />
|
||||
<package id="vocaluxe.dependencies.opentk" version="1.0.1" targetFramework="net40" />
|
||||
<package id="vocaluxe.dependencies.pitchtracker" version="1.0.1" targetFramework="net40" />
|
||||
<package id="vocaluxe.dependencies.portaudiosharp" version="1.0.1" targetFramework="net40" />
|
||||
<package id="vocaluxe.dependencies.qrcoder" version="1.0.1" targetFramework="net40" />
|
||||
<package id="vocaluxe.dependencies.slimdx" version="1.0.1" targetFramework="net40" />
|
||||
|
||||
Reference in new issue
Block a user