From 52727a5abc3f58dd1da5e778017e60d1101fc137 Mon Sep 17 00:00:00 2001 From: lukeIam <2lukeiam@gmail.com> Date: Sat, 19 Dec 2015 11:01:04 +0100 Subject: [PATCH 01/10] Removed the PitchTracker nuget packages as the PitchTracker.dll is generated from source (fixes #173) --- Vocaluxe/Vocaluxe.csproj | 57 ++++++++++++++++------------------------ Vocaluxe/packages.config | 3 +-- 2 files changed, 23 insertions(+), 37 deletions(-) diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj index b5064548..6c0011d3 100644 --- a/Vocaluxe/Vocaluxe.csproj +++ b/Vocaluxe/Vocaluxe.csproj @@ -336,7 +336,9 @@ PreserveNewest - + + Designer + @@ -506,41 +508,28 @@ powershell -command "(Get-Content -Encoding UTF8 '$(ProjectDir)Properties\Assemb - + - + - - - - + - - + + - - - - - - - - - + + + + + + + + + + + + @@ -553,13 +542,12 @@ powershell -command "(Get-Content -Encoding UTF8 '$(ProjectDir)Properties\Assemb - - + @@ -568,11 +556,10 @@ powershell -command "(Get-Content -Encoding UTF8 '$(ProjectDir)Properties\Assemb - - + \ No newline at end of file diff --git a/Vocaluxe/packages.config b/Vocaluxe/packages.config index 45a181a9..fe9f7814 100644 --- a/Vocaluxe/packages.config +++ b/Vocaluxe/packages.config @@ -1,6 +1,6 @@  - + @@ -9,7 +9,6 @@ - From f860afdbd4d5b828125798f958fe731cb32b49d1 Mon Sep 17 00:00:00 2001 From: lukeIam <2lukeiam@gmail.com> Date: Sat, 19 Dec 2015 14:33:45 +0100 Subject: [PATCH 02/10] Fallback to local GSTREAMER lib if the GSTREAMER EnvironmentVariable exists but the targeted folder does not exists --- .../Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs b/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs index 683e3d75..73c624f8 100644 --- a/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs +++ b/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs @@ -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\\"); From ee77df7523b45fb870b3dd568b9e79fe16e8fd2c Mon Sep 17 00:00:00 2001 From: lukeIam Date: Sun, 20 Dec 2015 12:47:31 +0100 Subject: [PATCH 03/10] Update and rename README to README.md Changed the README to markdown and updated the content. --- README | 50 -------------------------------------------------- README.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 50 deletions(-) delete mode 100644 README create mode 100644 README.md diff --git a/README b/README deleted file mode 100644 index 08e63a91..00000000 --- a/README +++ /dev/null @@ -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/ \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 00000000..1c4e3f93 --- /dev/null +++ b/README.md @@ -0,0 +1,49 @@ +![Vocaluxe Logo](https://raw.githubusercontent.com/Vocaluxe/Vocaluxe/develop/Output/Graphics/Logo.png) + +[1. About]() +[2. Download]() +[3. Contributing]() +[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. + +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 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 +GitGub 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/ From c1bb23d0f72889f6cb07f315568d64974aaaeb2c Mon Sep 17 00:00:00 2001 From: lukeIam Date: Sun, 20 Dec 2015 12:51:26 +0100 Subject: [PATCH 04/10] Add links to the toc --- README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1c4e3f93..26c2a17d 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,9 @@ ![Vocaluxe Logo](https://raw.githubusercontent.com/Vocaluxe/Vocaluxe/develop/Output/Graphics/Logo.png) -[1. About]() -[2. Download]() -[3. Contributing]() -[4. Help & Support]() - +[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#. From 67f37b440bdc89a872932a92f1920ea3947e391c Mon Sep 17 00:00:00 2001 From: lukeIam <2lukeiam@gmail.com> Date: Sun, 20 Dec 2015 13:48:19 +0100 Subject: [PATCH 05/10] Changed PitchTracker build to static linking to get rid of runtime version conficts (size increase is not huge: 52KB -> 267KB) --- PitchTracker/PitchTracker.vcxproj | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/PitchTracker/PitchTracker.vcxproj b/PitchTracker/PitchTracker.vcxproj index b5fb8ca0..77d7b228 100644 --- a/PitchTracker/PitchTracker.vcxproj +++ b/PitchTracker/PitchTracker.vcxproj @@ -109,6 +109,7 @@ true Fast false + MultiThreadedDebug Windows @@ -127,6 +128,7 @@ true Fast false + MultiThreadedDebug Windows @@ -148,6 +150,7 @@ Speed Fast false + MultiThreaded Windows @@ -170,6 +173,7 @@ true Speed Fast + MultiThreaded Windows @@ -212,6 +216,6 @@ - + - + \ No newline at end of file From 645d126911a8e07ead2c25311496b363f3f44154 Mon Sep 17 00:00:00 2001 From: lukeIam Date: Sun, 20 Dec 2015 15:17:59 +0100 Subject: [PATCH 06/10] Fixed Typo and added newer Windows systems --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 26c2a17d..a11e9432 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ It allows up to six players to sing along with music using microphones in order 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. Supported Operating Systems / Requirements: -- WinXP, Vista, Windows 7 with .NET 4.0 +- WinXP, Vista, Windows 7, Windows 8, Windows 8.1 and Windows 10 with .NET 4.0 - 1 GHz CPU, 512 MB RAM, Graphics card with OpenGL 2.1 or DirectX 9.0 support @@ -42,7 +42,7 @@ Just [open an issue](https://github.com/Vocaluxe/Vocaluxe/issues/new) or mention ## 4. Help & Support GitHub Wiki: https://github.com/Vocaluxe/Vocaluxe/wiki -GitGub Issues Tracker: https://github.com/Vocaluxe/Vocaluxe/issues +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/ From 4d22f4f80b357c8cda5765a8b20b8e6cdb8003a4 Mon Sep 17 00:00:00 2001 From: lukeIam Date: Sun, 20 Dec 2015 15:44:26 +0100 Subject: [PATCH 07/10] Added party modes and webserver to desc --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a11e9432..4cb7acdd 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ 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 From 1ecc5336cecc3f96059a879c547b3bfc5f530b0d Mon Sep 17 00:00:00 2001 From: lukeIam Date: Sun, 20 Dec 2015 15:45:28 +0100 Subject: [PATCH 08/10] Added a line break for better readability --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4cb7acdd..11e6ec80 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ ## 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. +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: From caa46763cd12f81832b5e9f39f5fc0ae08d06b1a Mon Sep 17 00:00:00 2001 From: lukeIam <2lukeiam@gmail.com> Date: Sun, 20 Dec 2015 16:01:26 +0100 Subject: [PATCH 09/10] Fixed Typos in the app --- Vocaluxe/Website/index.html | 2 +- Vocaluxe/Website/locales/de.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Vocaluxe/Website/index.html b/Vocaluxe/Website/index.html index c6731d36..6bfd5460 100644 --- a/Vocaluxe/Website/index.html +++ b/Vocaluxe/Website/index.html @@ -80,7 +80,7 @@
-

Volcaluxe

+

Vocaluxe

diff --git a/Vocaluxe/Website/locales/de.json b/Vocaluxe/Website/locales/de.json index 4d9812c3..1464ca30 100644 --- a/Vocaluxe/Website/locales/de.json +++ b/Vocaluxe/Website/locales/de.json @@ -15,7 +15,7 @@ "mainPageSelectProfile": "Profile", "mainPageSelectProfileDesc": "Listet alle Profile auf", "mainPageTakePhotoLink": "Nehme Foto auf", - "mainPageTakePhotoLinkDesc": "Nimmt ein Foto auf und zeigt es am ende der Runde an", + "mainPageTakePhotoLinkDesc": "Nimmt ein Foto auf und zeige es am Ende der Runde an", "mainPageKeyboard": "Tastatur", "mainPageKeyboardDesc": "Sende Tastatureingaben", "mainPageSelectUserAdmin": "Administration", From feafec755ee37077f18cb5e6c5908cacb6fbc1f9 Mon Sep 17 00:00:00 2001 From: lukeIam Date: Sun, 20 Dec 2015 17:00:49 +0100 Subject: [PATCH 10/10] Added Linux to the Supported OSs --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 11e6ec80..10cce868 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ Vocaluxe offers diversified party modes and can optionally be controlled via Bro 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