diff --git a/.appveyor/afterDeploy.ps1 b/.appveyor/afterDeploy.ps1 new file mode 100644 index 00000000..6fda8b82 --- /dev/null +++ b/.appveyor/afterDeploy.ps1 @@ -0,0 +1,9 @@ +Write-Host "Deployment finished -> do en empty commit on the gh-pages branch to update the page" +cd .. +git clone -q "https://github.com/Vocaluxe/Vocaluxe.git" -b "gh-pages" --single-branch "VocaluxeWeb" +cd VocaluxeWeb +git config --global user.email "noreply@vocaluxe.org" +git config --global user.name "VocaluxeBuildBot" +git commit --allow-empty -m "Trigger page update after a new publish (triggered by $Env:APPVEYOR_REPO_COMMIT_MESSAGE [$Env:APPVEYOR_REPO_COMMIT])" +git push -q "https://$($Env:GitHubKey):x-oauth-basic@github.com/Vocaluxe/Vocaluxe.git" "gh-pages" +cd ..\Vocaluxe \ No newline at end of file diff --git a/.appveyor/prepareDeploy.ps1 b/.appveyor/prepareDeploy.ps1 index 922a6550..e9db2bc9 100644 --- a/.appveyor/prepareDeploy.ps1 +++ b/.appveyor/prepareDeploy.ps1 @@ -7,6 +7,8 @@ else{ Return; } +$Env:IS_BETA_RELEASE = ($Env:APPVEYOR_REPO_TAG_NAME -match "beta") + $getRelaseInfoParams = @{ Uri = "https://api.github.com/repos/Vocaluxe/Vocaluxe/releases/tags/$targetTag"; Method = 'GET'; @@ -23,20 +25,26 @@ catch [System.Net.WebException] # No Release found for this tag $statusCode = [int]$_.Exception.Response.StatusCode $html = $_.Exception.Response.StatusDescription - Write-Host "No Release found for this tag ($html): $($Env:APPVEYOR_REPO_TAG_NAME)" + Write-Host "No Release found for this tag ($html): $targetTag" Return; } -$assetId = ($result.assets | where {$_.name -EQ "Vocaluxe_$($Env:APPVEYOR_REPO_TAG_NAME)_Windows_$($Env:PLATFORM).zip" } | Select-Object -first 1 ).id +$releaseId = $result.id -if(!$assetId){ - # No matching asset found in this release - Write-Host "No matching asset found in this release: Vocaluxe_$($Env:APPVEYOR_REPO_TAG_NAME)_Windows_$($Env:PLATFORM).zip" +if(!$releaseId){ + # No matching release found in this release + Write-Host "No matching release found" + Return; +} + +if($result.body -match $Env:APPVEYOR_REPO_COMMIT){ + # An other build already recreated the release + Write-Host "An other build already recreated the release" Return; } $deleteAssetParams = @{ - Uri = "https://api.github.com/repos/Vocaluxe/Vocaluxe/releases/assets/$assetId"; + Uri = "https://api.github.com/repos/Vocaluxe/Vocaluxe/releases/$releaseId"; Method = 'DELETE'; Headers = @{ Authorization = 'Basic ' + [Convert]::ToBase64String( @@ -45,14 +53,14 @@ $deleteAssetParams = @{ } try{ $result = Invoke-RestMethod @deleteAssetParams - Write-Host "Successfully deleted asset: Vocaluxe_$($Env:APPVEYOR_REPO_TAG_NAME)_Windows_$($Env:PLATFORM).zip" + Write-Host "Successfully deleted release for: $targetTag" } catch [System.Net.WebException] { - # Could not delete asset + # Could not delete release $statusCode = [int]$_.Exception.Response.StatusCode $html = $_.Exception.Response.StatusDescription - Write-Host "Could not delete asset ($html): Vocaluxe_$($Env:APPVEYOR_REPO_TAG_NAME)_Windows_$($Env:PLATFORM).zip" + Write-Host "Could not delete release ($html) for: $targetTag" Return; } \ No newline at end of file diff --git a/Vocaluxe/Linux/Build/PostBuildEvent.sh b/.build/linuxPostBuildEvent.sh old mode 100755 new mode 100644 similarity index 83% rename from Vocaluxe/Linux/Build/PostBuildEvent.sh rename to .build/linuxPostBuildEvent.sh index 92b73c10..fe52ac53 --- a/Vocaluxe/Linux/Build/PostBuildEvent.sh +++ b/.build/linuxPostBuildEvent.sh @@ -4,4 +4,5 @@ cd $PROJECT sed -i -r -e 's/AssemblyInformationalVersion\(".*?"\)/AssemblyInformationalVersion("GITVERSION")/' $PROJECT/Properties/AssemblyInfo.cs sed -i -r -e 's/AssemblyVersion\(".*?"\)/AssemblyVersion("SHORTVERSION")/' $PROJECT/Properties/AssemblyInfo.cs sed -i -r -e 's/AssemblyFileVersion\(".*?"\)/AssemblyFileVersion("SHORTVERSION")/' $PROJECT/Properties/AssemblyInfo.cs +sed -i -r -e 's/AssemblyTitle\(".*?"\)/AssemblyTitle("FULLVERSION")/' $PROJECT/Properties/AssemblyInfo.cs sed -i -e 's/var matchingServerVersion = "";/var matchingServerVersion = "'$(git describe --long)'";/' $PROJECT/../Output/Website/js/main.js diff --git a/.build/linuxPreBuildEvent.sh b/.build/linuxPreBuildEvent.sh new file mode 100644 index 00000000..329c0678 --- /dev/null +++ b/.build/linuxPreBuildEvent.sh @@ -0,0 +1,29 @@ +#!/bin/sh +PROJECT=$1 +cd $PROJECT +arch=$2 +version=$(git describe --long) +shortVersion=${version%%-*} +shortVersionClean=$(echo $shortVersion | sed -e 's/alpha/0/' -e 's/beta/1/' -e 's/rc/2/' -e 's/[[:alpha:]]//g') + +case ${shortVersion##*.} in +alpha*) + releaseType='Alpha' + ;; +beta*) + releaseType='Beta' + ;; +rc*) + releaseType='RC' + ;; +*) + releaseType='Release' + ;; +esac + +versionName=$(grep -oP "\"${shortVersionClean%.*}.\" *: *\"\K([^\"]+)(?=\")" ../.build/versionNames.json) +fullVersionName="Vocaluxe $([ "$versionName" == "" ] && echo "" || echo "'$versionName' ")$shortVersion ($arch) $([ "$releaseType" == "Release" ] && echo "" || echo "$releaseType ")($version)" + +sed -i -e s/GITVERSION/$(git describe --long)/ $PROJECT/Properties/AssemblyInfo.cs +sed -i -e s/SHORTVERSION/"$shortVersionClean"/ $PROJECT/Properties/AssemblyInfo.cs +sed -i -e s/FULLVERSION/"$fullVersionName"/ $PROJECT/Properties/AssemblyInfo.cs \ No newline at end of file diff --git a/.build/versionNames.json b/.build/versionNames.json new file mode 100644 index 00000000..2717f816 --- /dev/null +++ b/.build/versionNames.json @@ -0,0 +1,7 @@ +{ + "0.0.": "Unversioned Build", + "0.1.": "Rising Start", + "0.2.": "Sparkling Sky", + "0.3.": "Shining Heaven", + "0.4.": "Blue Sunrise" +} diff --git a/.build/winPostBuild.ps1 b/.build/winPostBuild.ps1 new file mode 100644 index 00000000..416353fc --- /dev/null +++ b/.build/winPostBuild.ps1 @@ -0,0 +1,23 @@ +param( + [Parameter(Mandatory=$true)] + [String]$ProjectDir +) + +if($Env:GIT_VERSION_TAG) +{ + $version = $Env:GIT_VERSION_TAG; +} +else +{ + $version = git describe --long; +} + +(Get-Content -Encoding UTF8 "$($ProjectDir)..\Output\Website\js\main.js") ` + | Foreach-Object {$_ -replace '(?<=var *matchingServerVersion * = *\")\w*(?=\" *;)', "$version"} ` + | Set-Content -Encoding UTF8 "$($ProjectDir)..\Output\Website\js\main.js" + +(Get-Content -Encoding UTF8 "$($ProjectDir)Properties\AssemblyInfo.cs") ` + | Foreach-Object {$_ -replace '(?<=AssemblyInformationalVersion\(\").*(?=\")', 'GITVERSION'} ` + | Foreach-Object {$_ -replace '(?<=(AssemblyVersion|AssemblyFileVersion)\(\").*(?=\")', 'SHORTVERSION'} ` + | Foreach-Object {$_ -replace '(?<=AssemblyTitle\(\").*(?=\")', 'FULLVERSION'} ` + | Set-Content -Encoding UTF8 "$($ProjectDir)Properties\AssemblyInfo.cs" \ No newline at end of file diff --git a/.build/winPreBuild.ps1 b/.build/winPreBuild.ps1 new file mode 100644 index 00000000..a26a9300 --- /dev/null +++ b/.build/winPreBuild.ps1 @@ -0,0 +1,40 @@ +param( + [Parameter(Mandatory=$true)] + [String]$ProjectDir, + [Parameter(Mandatory=$true)] + [String]$Arch +) + +if($Env:GIT_VERSION_TAG) +{ + $version = $Env:GIT_VERSION_TAG; +} +else +{ + $version = git describe --long; +} + +$shortVersion = $version.Split('-')[0]; + +[System.Reflection.Assembly]::LoadWithPartialName("System.Web.Extensions") +$versionName = (New-Object System.Web.Script.Serialization.JavaScriptSerializer).Deserialize((Get-Content "$($ProjectDir)..\.build\versionNames.json"), ` + [System.Collections.Hashtable])[([regex]"[0-9]+\.[0-9]+\.").Match($shortVersion).Value] + +$releaseType = switch -wildcard ($shortVersion.Split('.')[2]) +{ + "alpha*" {"Alpha"} + "beta*" {"Beta"} + "rc*" {"RC"} + default {"Release"} +}; + +$fullVersionName = "Vocaluxe $(if($versionName) {"'"+$versionName+"' "} else {''})$shortVersion ($Arch) $(if($releaseType -ne "Release") {'$releaseType '} else {''})($version)" + +(Get-Content -Encoding UTF8 "$($ProjectDir)Properties\AssemblyInfo.cs") ` + | Foreach-Object {$_ ` + -replace '(?<=AssemblyInformationalVersion\(").*(?=")', $version ` + -replace '(?<=(AssemblyVersion|AssemblyFileVersion)\(").*(?=")', ` + ($version.Split('-')[0].replace('alpha','0').replace('beta','1').replace('rc','2') -replace "[a-zA-Z]+","")` + -replace '(?<=AssemblyTitle\(").*(?=")', $fullVersionName ` + -replace '(?<=AssemblyCopyright\(".*)[0-9]+(?=")', (Get-Date).Year} ` + | Set-Content -Encoding UTF8 "$($ProjectDir)Properties\AssemblyInfo.cs" \ No newline at end of file diff --git a/.gitignore b/.gitignore index 9de55a61..16254856 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ obj PitchTracker.dll Thumbs.db .transifexrc +.vs tx.exe *.mp4 *.pdb @@ -30,6 +31,7 @@ tx.exe *.user *.VC.db *.VC.opendb +*.dll.config /*.vsp /*.ctl /Output/Config.xml @@ -48,16 +50,16 @@ tx.exe /Output/Songs /Output/Playlists/*.xml /Output/Profiles/*.xml +/Output/Profiles/*.png /Output/PartyModes/*/Code/* /PartyModes/*/*/*.dll /VocaluxeLib/bin /ServerLib/bin/ClientServerLib.dll /Installer/setup-cache -/Installer/setup-SetupFiles -/Installer/vocaluxe-*-setup.exe -/Installer/Vocaluxe*.rar -/Installer/Prerequisites/GStreamer x64/gstreamer-1.0-x86_64-1.4.1.msi -/Installer/Prerequisites/GStreamer x86/gstreamer-1.0-x86-1.4.1.msi +/Installer/Files +/Installer/log.txt +/Installer/setup-cache +/Installer/Setup Files /WebserverInitalConfig/bin /PhoneGap/ /TestResults diff --git a/Installer/Prerequisites/.NET Framework 4.0 Client Profile/dotNetFx40_Client_x86_x64.exe b/Installer/Prerequisites/.NET Framework 4.0 Client Profile/dotNetFx40_Client_x86_x64.exe deleted file mode 100644 index 80ce5d46..00000000 Binary files a/Installer/Prerequisites/.NET Framework 4.0 Client Profile/dotNetFx40_Client_x86_x64.exe and /dev/null differ diff --git a/Installer/Prerequisites/DirectX 9/dxwebsetup.exe b/Installer/Prerequisites/DirectX 9/dxwebsetup.exe deleted file mode 100644 index c15749ed..00000000 Binary files a/Installer/Prerequisites/DirectX 9/dxwebsetup.exe and /dev/null differ diff --git a/Installer/Prerequisites/Visual C++ 2008 SP1 Redistributable/vcredist_x86.exe b/Installer/Prerequisites/Visual C++ 2008 SP1 Redistributable/vcredist_x86.exe deleted file mode 100644 index 05d0a05e..00000000 Binary files a/Installer/Prerequisites/Visual C++ 2008 SP1 Redistributable/vcredist_x86.exe and /dev/null differ diff --git a/Installer/Prerequisites/Visual C++ Redistributable for Visual Studio 2012 x64/vcredist_x64.exe b/Installer/Prerequisites/Visual C++ Redistributable for Visual Studio 2012 x64/vcredist_x64.exe deleted file mode 100644 index 9b5df432..00000000 Binary files a/Installer/Prerequisites/Visual C++ Redistributable for Visual Studio 2012 x64/vcredist_x64.exe and /dev/null differ diff --git a/Installer/Prerequisites/Visual C++ Redistributable for Visual Studio 2012 x86/vcredist_x86.exe b/Installer/Prerequisites/Visual C++ Redistributable for Visual Studio 2012 x86/vcredist_x86.exe deleted file mode 100644 index c247e7e6..00000000 Binary files a/Installer/Prerequisites/Visual C++ Redistributable for Visual Studio 2012 x86/vcredist_x86.exe and /dev/null differ diff --git a/Installer/build.bat b/Installer/build.bat deleted file mode 100644 index f4830f67..00000000 --- a/Installer/build.bat +++ /dev/null @@ -1,14 +0,0 @@ -REM compile x64 -call "%VS110COMNTOOLS%\..\..\VC\vcvarsall.bat" x64 -devenv.com ..\Vocaluxe.sln /Rebuild "InstallerWin|x64" - -REM remove old x64 executables if found and rename -if exist "..\Output\Vocaluxe_x64.exe" del "..\Output\Vocaluxe_x64.exe" -ren "..\Output\Vocaluxe.exe" "Vocaluxe_x64.exe" - -REM compile x86 -call "%VS110COMNTOOLS%\..\..\VC\vcvarsall.bat" x86 -devenv.com ..\Vocaluxe.sln /Rebuild "InstallerWin|x86" - -REM compile installer -AdvancedInstaller.com /rebuild setup.aip \ No newline at end of file diff --git a/Installer/buildinstaller.bat b/Installer/buildinstaller.bat new file mode 100644 index 00000000..ce4e3898 --- /dev/null +++ b/Installer/buildinstaller.bat @@ -0,0 +1,74 @@ +:: Build script for vocaluxe installer (x86 and x64 versions) +:: +:: Requirements +:: - wget.exe: http://gnuwin32.sourceforge.net/packages/wget.htm +:: - unzip.exe: http://gnuwin32.sourceforge.net/packages/unzip.htm +:: - nuget.exe: https://www.nuget.org/downloads +:: - Visual Studio with devenv.exe (should be located in somewhere in Visual Studio folder, e.g. C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE) +:: - AdvancedInstaller + +@ECHO OFF +echo Cloning vocaluxe from github and checkout master +if exist "Files" ( + cd Files + git checkout -q develop >> log.txt + git pull -q >> log.txt + cd ../ +) else ( + git clone -q https://github.com/Vocaluxe/Vocaluxe.git Files > log.txt + cd Files + git checkout -q develop >> log.txt + cd ../ +) +echo - Done +echo. + +echo Download ambient videos and move them to themes folder +wget --append-output=log.txt -q -O videos.zip https://github.com/lukeIam/VocaluxeDependencies/blob/master/zips/themes/vocaluxe.themes.ambient.video.zip?raw=true || goto :error +unzip -q -o -d Files/Output videos.zip || goto :error +del /q videos.zip >> log.txt || goto :error +echo - Done +echo. + +echo Delete lib-folder to prevent packing wrong dlls +del /q Files\Output\libs >> log.txt || goto :error +echo - Done +echo. + +echo Restore dependencies and build x64 +nuget restore Files/Vocaluxe.sln >> log.txt || goto :error +devenv Files/Vocaluxe.sln /Build "InstallerWin|x64" >> log.txt || goto :error +echo - Done +echo. + +echo Build x64 installer +AdvancedInstaller.com /rebuild setup.aip -buildslist x64 >> log.txt || goto :error +echo - Done +echo. + +echo Delete lib-folder to prevent packing wrong dlls +del /q Files\Output\libs >> log.txt || goto :error +echo - Done +echo. + +echo Restore dependencies and build x86 +nuget restore Files/Vocaluxe.sln >> log.txt || goto :error +devenv Files/Vocaluxe.sln /Build "InstallerWin|x86" >> log.txt || goto :error +echo - Done +echo. + +echo Build x86 installer +AdvancedInstaller.com /rebuild setup.aip -buildslist x86 >> log.txt || goto :error +echo - Done +echo. + +echo Everything is done! + +pause +goto :EOF + +:error +echo Failed with error #%errorlevel%. +echo See log.txt for more details. +pause +exit /b %errorlevel% \ No newline at end of file diff --git a/Installer/buildportable.bat b/Installer/buildportable.bat deleted file mode 100644 index 1b7aa978..00000000 --- a/Installer/buildportable.bat +++ /dev/null @@ -1,20 +0,0 @@ -@echo off -SET version=v0.3.0 -SET status=Beta -SET buildnum=0081 -SET buildname=Vocaluxe %version% %status% (%buildnum%).rar - -REM compile x64 -call "%VS110COMNTOOLS%\..\..\VC\vcvarsall.bat" x64 -devenv.com ..\Vocaluxe.sln /Rebuild "ReleaseWin|x64" - -REM remove old x64 executables if found and rename -if exist "..\Output\Vocaluxe_x64.exe" del "..\Output\Vocaluxe_x64.exe" -ren "..\Output\Vocaluxe.exe" "Vocaluxe_x64.exe" - -REM compile x86 -call "%VS110COMNTOOLS%\..\..\VC\vcvarsall.bat" x86 -devenv.com ..\Vocaluxe.sln /Rebuild "ReleaseWin|x86" - -REM package -rar a -r -ep1 -x..\Output\CoverDB.sqlite -x..\Output\HighscoreDB.sqlite -x..\Output\*.log -x..\Output\*.pdb -x..\Output\Config.xml -x..\Output\Vocaluxe.vshost* -x..\Output\Songs -x..\Output\Screenshots -x..\Output\Playlists "%buildname%" "..\Output\*" \ No newline at end of file diff --git a/Installer/setup.aip b/Installer/setup.aip index 90e1b4e3..1309ecc0 100644 --- a/Installer/setup.aip +++ b/Installer/setup.aip @@ -1,645 +1,3793 @@ - + + + + - + + - - - + + + + + - - - - + + - - - + + - + - - + + - + - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + - - - + + - - - - - - - - + + + + + + + + + + + - - - + @@ -653,27 +3801,46 @@ + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + - - + + - + @@ -683,36 +3850,29 @@ - - + + - - - - + - - - - - - - - + + - - + + + + @@ -722,69 +3882,20 @@ + - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -794,6 +3905,7 @@ + @@ -803,144 +3915,86 @@ - + + + + + - + + - - - - - - - - - - - + + + - + - - - + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - + + - - + + - + - - - - + + + - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + @@ -951,71 +4005,35 @@ - - - - - - - - - - - - + + + - - - - - - - - - - - - - + - - - - + + - + - - - - - - - - + + + + - - - - - - - - - - - - + + + diff --git a/Output/Cover/Ambient Blue/No Cover.png b/Output/Cover/Ambient Blue/No Cover.png deleted file mode 100644 index 73a0e4b1..00000000 Binary files a/Output/Cover/Ambient Blue/No Cover.png and /dev/null differ diff --git a/Output/Cover/Ambient Blue/Normal.png b/Output/Cover/Ambient Blue/Normal.png deleted file mode 100644 index 73a0e4b1..00000000 Binary files a/Output/Cover/Ambient Blue/Normal.png and /dev/null differ diff --git a/Output/Cover/Ambient Blue/Resources/Normal.psd b/Output/Cover/Ambient Blue/Resources/Normal.psd deleted file mode 100644 index 5cc517a3..00000000 Binary files a/Output/Cover/Ambient Blue/Resources/Normal.psd and /dev/null differ diff --git a/Output/Cover/Ambient Green.xml b/Output/Cover/Ambient Green.xml deleted file mode 100644 index 3e652377..00000000 --- a/Output/Cover/Ambient Green.xml +++ /dev/null @@ -1,166 +0,0 @@ - - - - Ambient Green - Ambient Green - flokuep - - - - - - - %TEXT% - - Normal - - - - 550 - - - - - 0.709 - 0.968 - 0.674 - 0.9 - - - - 24 - - - 100 - - - 1 - 1 - 1 - 1 - - - Normal.png - - 1.0 - - True - - - - - %TEXT% - - Normal - - - - 550 - - - - - 0.709 - 0.968 - 0.674 - 0.9 - - - - -150 - - - 100 - - - 1 - 1 - 1 - 1 - - - Normal.png - - 1.0 - - True - - - - - %TEXT% - - Normal - - - - 550 - - - - - 0.709 - 0.968 - 0.674 - 0.9 - - - - 150 - - - 100 - - - 1 - 1 - 1 - 1 - - - Normal.png - - 1.0 - - True - - - - - %TEXT% - - Normal - - - - 120 - - - - - 0.709 - 0.968 - 0.674 - 0.9 - - - - -150 - - - 100 - - - 1 - 1 - 1 - 1 - - - Normal.png - - 1.0 - - True - - diff --git a/Output/Cover/Ambient Green/No Cover.png b/Output/Cover/Ambient Green/No Cover.png deleted file mode 100644 index 2a1612cb..00000000 Binary files a/Output/Cover/Ambient Green/No Cover.png and /dev/null differ diff --git a/Output/Cover/Ambient Green/Normal.png b/Output/Cover/Ambient Green/Normal.png deleted file mode 100644 index 2a1612cb..00000000 Binary files a/Output/Cover/Ambient Green/Normal.png and /dev/null differ diff --git a/Output/Cover/Ambient Green/Resources/Normal.psd b/Output/Cover/Ambient Green/Resources/Normal.psd deleted file mode 100644 index 8f973d02..00000000 Binary files a/Output/Cover/Ambient Green/Resources/Normal.psd and /dev/null differ diff --git a/Output/Cover/Ambient Red.xml b/Output/Cover/Ambient Red.xml deleted file mode 100644 index fa65f01d..00000000 --- a/Output/Cover/Ambient Red.xml +++ /dev/null @@ -1,166 +0,0 @@ - - - - Ambient Red - Ambient Red - flokuep - - - - - - - %TEXT% - - Normal - - - - 550 - - - - - 0.968 - 0.674 - 0.674 - 0.9 - - - - 24 - - - 100 - - - 1 - 1 - 1 - 1 - - - Normal.png - - 1.0 - - True - - - - - %TEXT% - - Normal - - - - 550 - - - - - 0.968 - 0.674 - 0.674 - 0.9 - - - - -150 - - - 100 - - - 1 - 1 - 1 - 1 - - - Normal.png - - 1.0 - - True - - - - - %TEXT% - - Normal - - - - 550 - - - - - 0.968 - 0.674 - 0.674 - 0.9 - - - - 150 - - - 100 - - - 1 - 1 - 1 - 1 - - - Normal.png - - 1.0 - - True - - - - - %TEXT% - - Normal - - - - 120 - - - - - 0.968 - 0.674 - 0.674 - 0.9 - - - - -150 - - - 100 - - - 1 - 1 - 1 - 1 - - - Normal.png - - 1.0 - - True - - diff --git a/Output/Cover/Ambient Red/No Cover.png b/Output/Cover/Ambient Red/No Cover.png deleted file mode 100644 index 1bf01057..00000000 Binary files a/Output/Cover/Ambient Red/No Cover.png and /dev/null differ diff --git a/Output/Cover/Ambient Red/Normal.png b/Output/Cover/Ambient Red/Normal.png deleted file mode 100644 index 1bf01057..00000000 Binary files a/Output/Cover/Ambient Red/Normal.png and /dev/null differ diff --git a/Output/Cover/Ambient Red/Resources/Normal.psd b/Output/Cover/Ambient Red/Resources/Normal.psd deleted file mode 100644 index db9fb4ed..00000000 Binary files a/Output/Cover/Ambient Red/Resources/Normal.psd and /dev/null differ diff --git a/Output/Cover/Ambient Yellow.xml b/Output/Cover/Ambient Yellow.xml deleted file mode 100644 index 7636b2fa..00000000 --- a/Output/Cover/Ambient Yellow.xml +++ /dev/null @@ -1,166 +0,0 @@ - - - - Ambient Yellow - Ambient Yellow - flokuep - - - - - - - %TEXT% - - Normal - - - - 550 - - - - - 0.968 - 0.956 - 0.674 - 0.9 - - - - 24 - - - 100 - - - 1 - 1 - 1 - 1 - - - Normal.png - - 1.0 - - True - - - - - %TEXT% - - Normal - - - - 550 - - - - - 0.968 - 0.956 - 0.674 - 0.9 - - - - -150 - - - 100 - - - 1 - 1 - 1 - 1 - - - Normal.png - - 1.0 - - True - - - - - %TEXT% - - Outline - - - - 550 - - - - - 0.968 - 0.956 - 0.674 - 0.9 - - - - 150 - - - 100 - - - 1 - 1 - 1 - 1 - - - Normal.png - - 1.0 - - True - - - - - %TEXT% - - Normal - - - - 120 - - - - - 0.968 - 0.956 - 0.674 - 0.9 - - - - -150 - - - 100 - - - 1 - 1 - 1 - 1 - - - Normal.png - - 1.0 - - True - - diff --git a/Output/Cover/Ambient Yellow/No Cover.png b/Output/Cover/Ambient Yellow/No Cover.png deleted file mode 100644 index e7be3e62..00000000 Binary files a/Output/Cover/Ambient Yellow/No Cover.png and /dev/null differ diff --git a/Output/Cover/Ambient Yellow/Normal.png b/Output/Cover/Ambient Yellow/Normal.png deleted file mode 100644 index e7be3e62..00000000 Binary files a/Output/Cover/Ambient Yellow/Normal.png and /dev/null differ diff --git a/Output/Cover/Ambient Yellow/Resources/Normal.psd b/Output/Cover/Ambient Yellow/Resources/Normal.psd deleted file mode 100644 index ebc648a0..00000000 Binary files a/Output/Cover/Ambient Yellow/Resources/Normal.psd and /dev/null differ diff --git a/Output/Cover/Ambient Blue.xml b/Output/Cover/Genius Standard.xml similarity index 91% rename from Output/Cover/Ambient Blue.xml rename to Output/Cover/Genius Standard.xml index f1f91328..e2352316 100644 --- a/Output/Cover/Ambient Blue.xml +++ b/Output/Cover/Genius Standard.xml @@ -1,9 +1,9 @@  - Ambient Blue - Ambient Blue - flokuep + Genius Standard + Genius + Jiiniasu @@ -21,9 +21,9 @@ - 0.675 - 0.890 - 0.969 + 1.000 + 1.000 + 1.000 0.8 @@ -40,7 +40,7 @@ 1 - Normal.png + Cover.png 1.0 @@ -60,9 +60,9 @@ - 0.675 - 0.890 - 0.969 + 1.000 + 1.000 + 1.000 0.8 @@ -79,7 +79,7 @@ 1 - Normal.png + Cover.png 1.0 @@ -99,9 +99,9 @@ - 0.675 - 0.890 - 0.969 + 1.000 + 1.000 + 1.000 0.8 @@ -118,7 +118,7 @@ 1 - Normal.png + Cover.png 1.0 @@ -138,14 +138,14 @@ - 0.675 - 0.890 - 0.969 + 1.000 + 1.000 + 1.000 0.8 - -150 + -150 100 @@ -157,7 +157,7 @@ 1 - Normal.png + Cover.png 1.0 diff --git a/Output/Cover/Genius/Cover.png b/Output/Cover/Genius/Cover.png new file mode 100644 index 00000000..fdd337df Binary files /dev/null and b/Output/Cover/Genius/Cover.png differ diff --git a/Output/Cover/Genius/NoCover.png b/Output/Cover/Genius/NoCover.png new file mode 100644 index 00000000..fdd337df Binary files /dev/null and b/Output/Cover/Genius/NoCover.png differ diff --git a/Output/Languages/Czech.xml b/Output/Languages/Czech.xml index a34fe68f..fe288daf 100644 --- a/Output/Languages/Czech.xml +++ b/Output/Languages/Czech.xml @@ -73,6 +73,8 @@ Celkem Normální Rozšířené + Uvést vše + Uvést nejlepší Vlastní hudba a hudba na pozadí Žádná vlastní hudba Pouze vlastní hudba @@ -183,6 +185,7 @@ Karty Obtížnost hry Režim časomíry + Styl pro nejlepší výsledky Nastavení nahrávání Zařízení Vstup @@ -201,6 +204,7 @@ Zdroj hudby na pozadí Hlasitost ukázky Hlasitost hry + Efekt Karaoke Nastavení tématu Téma Vzhled diff --git a/Output/Languages/French.xml b/Output/Languages/French.xml index fe0c7149..5820b536 100644 --- a/Output/Languages/French.xml +++ b/Output/Languages/French.xml @@ -46,6 +46,7 @@ Niveau 2 Niveau 3 Max + Afficher Caroussel Damier Livre @@ -72,6 +73,8 @@ Total Normal Développé + Tout afficher + Afficher les meilleurs Musique personnelle et Musique de fond Pas de Musique personnelle Seulement la Musique personnelle @@ -79,6 +82,10 @@ Tout Seulement noms et avatars Rien + Remplir + Sauter + Glisser + Zoomer En bas En haut En haut et en bas @@ -178,6 +185,7 @@ Dossiers Difficulté du Jeu Mode du Minuteur + Style meilleur score Options d'Enregistrement Appareil Entrée @@ -196,6 +204,7 @@ Source de la Musique de fond Volume de la Musique de prévisualisation Volume de la Musique du jeu + Effet Karaoké Options du Thème Thème Environnement graphique diff --git a/Output/Languages/Italian.xml b/Output/Languages/Italian.xml index 8fce81fc..57fd6652 100644 --- a/Output/Languages/Italian.xml +++ b/Output/Languages/Italian.xml @@ -46,6 +46,7 @@ Livello 2 Livello 3 Max + Elenco Dreidel Scacchiera Libro @@ -72,6 +73,8 @@ Totale Normale Espanso + Elenco tutti + Elenco migliori Musica personale e musica di sfondo Nessuna musica personale Solo musica personale @@ -79,6 +82,9 @@ Tutto Solo nomi e avatar Niente + Riempi + Salta + Zoom Sotto Sopra Sopra e sotto @@ -196,6 +202,7 @@ Sorgente musica di sfondo Anteprima volume musica Volume musica di gioco + Effetto karaoke Opzioni tema Tema Skin diff --git a/Output/Languages/Spanish.xml b/Output/Languages/Spanish.xml index ed040314..400027a8 100644 --- a/Output/Languages/Spanish.xml +++ b/Output/Languages/Spanish.xml @@ -46,6 +46,7 @@ Nivel 2 Nivel 3 Máx + Listado Dreidel Cuadrícula Libro @@ -72,6 +73,8 @@ Total Normal Expandido + Ver todo + Mejores puntuaciones Canciones del juego y tema Vocaluxe Sin canciones del juego Solo canciones del juego @@ -79,6 +82,10 @@ Todas Solo nombres y avatares Nada + Rellenar + Saltar + Deslizar + Zoom Abajo Arriba Arriba y abajo @@ -89,11 +96,22 @@ cargadas Menú Principal Cantar + Fiesta Opciones Perfiles ¡No se encuentra perfil! + Selección del modo fiesta + Modo fiesta + Descripción + Autor + Versión + No se puede cargar este modo de fiesta ¡No hay micrófonos configurados! ¡Se necesitan %d micrófonos para este modo fiesta! + Audiencia objetiva + No hay equipos + Número de equipos + Número de jugadores Selección de Jugadores Jugador 1 Jugador @@ -107,7 +125,19 @@ Advertencia: ¡No hay perfil asignados al jugador %v! Advertencia: ¡No hay perfiles asignados a los jugadores %v! Selección de Canciones + Cantar + Añadir a lista de reproducción + Cerrar + Seleccionar una canción aleatoriamente + Seleccionar una categoria aleatoriamente + Cantar todas las canciones + Cantar todas las canciones visibles + Abrir lista de reproducción Seleccionar + Cantar una versión corta de canción aleatoria + Cantar versión corta de canción + Nueva lista de reproducción + Opciones de canción Buscar: Sin Idioma Sin Año @@ -155,6 +185,7 @@ Etiquetas Dificultad del Juego Modo del Timer + Estilo de puntuación máxima Opciones de Grabación Dispositivo Entrada @@ -173,6 +204,7 @@ Origen de la Música de Fondo Volumen de la música de la vista previa Volumen de la música del juego + Efecto karaoke Opciones de Estilo Estilo Skin diff --git a/Output/PartyModes/Challenge/Languages/Czech.xml b/Output/PartyModes/Challenge/Languages/Czech.xml index 5dc3a83d..c0fce8eb 100644 --- a/Output/PartyModes/Challenge/Languages/Czech.xml +++ b/Output/PartyModes/Challenge/Languages/Czech.xml @@ -15,6 +15,8 @@ Počet hráčů Počet mikrofonů Počet kol + Počet žolíků + Doplnit žolíky každé kolo Soutěžní režim: Výběr hráče Vybrat náhodně Soutěžní režim: Přehled diff --git a/Output/PartyModes/Challenge/Languages/French.xml b/Output/PartyModes/Challenge/Languages/French.xml index 7ff1b981..27ece675 100644 --- a/Output/PartyModes/Challenge/Languages/French.xml +++ b/Output/PartyModes/Challenge/Languages/French.xml @@ -15,6 +15,8 @@ Nombre de joueurs Nombre de micros Nombre de tours + Nombre de jokers + Remplir de nouveau les jokers à tour Mode Challenge: Choix des joueurs Sélectionner au hasard Mode Challenge: Résumé diff --git a/Output/PartyModes/Challenge/Languages/Spanish.xml b/Output/PartyModes/Challenge/Languages/Spanish.xml index 60b91f04..e2352f20 100644 --- a/Output/PartyModes/Challenge/Languages/Spanish.xml +++ b/Output/PartyModes/Challenge/Languages/Spanish.xml @@ -15,6 +15,8 @@ TODO: Number of players TODO: Number of mics TODO: Number of rounds + Número de comodines + Rellenar comodines cada ronda TODO: Challenge Mode: Choose Player Seleccionar aleatoriamente TODO: Challenge Mode: Overview diff --git a/Output/PartyModes/Challenge/Themes/Default.xml b/Output/PartyModes/Challenge/Themes/Default.xml index 5999e8cc..10e1c461 100644 --- a/Output/PartyModes/Challenge/Themes/Default.xml +++ b/Output/PartyModes/Challenge/Themes/Default.xml @@ -1,6 +1,6 @@  - 5 + 6 Default brunzel diff --git a/Output/PartyModes/Challenge/Themes/Genius.xml b/Output/PartyModes/Challenge/Themes/Genius.xml new file mode 100644 index 00000000..7a551898 --- /dev/null +++ b/Output/PartyModes/Challenge/Themes/Genius.xml @@ -0,0 +1,10 @@ + + + 6 + + Genius + Jiiniasu + 0 + 1 + + \ No newline at end of file diff --git a/Output/PartyModes/Challenge/Themes/Genius/Genius.xml b/Output/PartyModes/Challenge/Themes/Genius/Genius.xml new file mode 100644 index 00000000..2db98024 --- /dev/null +++ b/Output/PartyModes/Challenge/Themes/Genius/Genius.xml @@ -0,0 +1,13 @@ + + + 4 + + Genius + Jiiniasu + 0 + 1 + + + + + \ No newline at end of file diff --git a/Output/PartyModes/Challenge/Themes/Genius/Screens/PartyScreenChallengeConfig.xml b/Output/PartyModes/Challenge/Themes/Genius/Screens/PartyScreenChallengeConfig.xml new file mode 100644 index 00000000..97b70135 --- /dev/null +++ b/Output/PartyModes/Challenge/Themes/Genius/Screens/PartyScreenChallengeConfig.xml @@ -0,0 +1,407 @@ + + + + PartyScreenChallengeConfig + 3 + + + + Video + + + BG_Default + + + + + + + + + 0 + 40 + 1280 + 45 + 1 + + + + + + 640 + 50 + 0 + 27 + 0 + + + Center + Center + + Outline + TR_SCREENCONFIG_TITLE + + + 75 + 105 + 0 + 27 + 0 + + + Left + Center + + Outline + TR_SCREENCONFIG_NUMPLAYERS + + + 75 + 165 + 0 + 27 + 0 + + + Left + Center + + Outline + TR_SCREENCONFIG_NUMMICS + + + 75 + 225 + 0 + 27 + 0 + + + Left + Center + + Outline + TR_SCREENCONFIG_NUMROUNDS + + + 75 + 285 + 0 + 27 + 0 + + + Left + Center + + Outline + TR_SCREENCONFIG_NUMJOKERS + + + 75 + 345 + 0 + 27 + 0 + + + Left + Center + + Outline + TR_SCREENCONFIG_REFILLJOKERS + + + + + + + + + + + + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + SelectSlideArrowLeft + SelectSlideArrowRight + + 500 + 100 + 700 + 50 + 0 + + + 505 + 105 + 40 + 40 + 0 + + + 1155 + 105 + 40 + 40 + 0 + + + + + + + + 27 + 50 + 0 + 200 + Outline + Bold + 9 + + + + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + SelectSlideArrowLeft + SelectSlideArrowRight + + 500 + 160 + 700 + 50 + 0 + + + 505 + 165 + 40 + 40 + 0 + + + 1155 + 165 + 40 + 40 + 0 + + + + + + + + 27 + 50 + 0 + 200 + Outline + Bold + 2 + + + + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + SelectSlideArrowLeft + SelectSlideArrowRight + + 500 + 220 + 700 + 50 + 0 + + + 505 + 225 + 40 + 40 + 0 + + + 1155 + 225 + 40 + 40 + 0 + + + + + + + + 27 + 50 + 0 + 200 + Outline + Bold + 10 + + + + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + SelectSlideArrowLeft + SelectSlideArrowRight + + 500 + 280 + 700 + 50 + 0 + + + 505 + 285 + 40 + 40 + 0 + + + 1155 + 285 + 40 + 40 + 0 + + + + + + + + 27 + 50 + 0 + 200 + Outline + Bold + 10 + + + + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + SelectSlideArrowLeft + SelectSlideArrowRight + + 500 + 340 + 700 + 50 + 0 + + + 505 + 345 + 40 + 40 + 0 + + + 1155 + 345 + 40 + 40 + 0 + + + + + + + + 27 + 50 + 0 + 200 + Outline + Bold + 2 + + + + + + + + + \ No newline at end of file diff --git a/Output/PartyModes/Challenge/Themes/Genius/Screens/PartyScreenChallengeMain.xml b/Output/PartyModes/Challenge/Themes/Genius/Screens/PartyScreenChallengeMain.xml new file mode 100644 index 00000000..c8752d0f --- /dev/null +++ b/Output/PartyModes/Challenge/Themes/Genius/Screens/PartyScreenChallengeMain.xml @@ -0,0 +1,557 @@ + + + + PartyScreenChallengeMain + 1 + + + + Video + + + BG_Default + + + + + + + + + 0 + 40 + 1280 + 45 + 1 + + + + PopupBG + + + 0 + 0 + 1280 + 720 + -1 + + + + + + + 0 + 0 + 100 + 100 + 0 + + + + + + 640 + 50 + 0 + 27 + 0 + + + Center + Center + + Outline + TR_SCREENMAIN_TITLE + + + 40 + 135 + 0 + 27 + 0 + + + Right + Center + + Outline + TR_SCREENMAIN_TABLE_POS + + + 50 + 135 + 0 + 27 + 130 + + + Left + Center + + Outline + TR_SCREENMAIN_TABLE_PLAYERNAME + + + 260 + 135 + 0 + 27 + 0 + + + Right + Center + + Outline + TR_SCREENMAIN_TABLE_NUMPLAYED + + + 340 + 135 + 0 + 27 + 0 + + + Right + Center + + Outline + TR_SCREENMAIN_TABLE_WON + + + 490 + 135 + 0 + 27 + 0 + + + Right + Center + + Outline + TR_SCREENMAIN_TABLE_SINGPOINTS + + + 590 + 135 + 0 + 27 + 0 + + + Right + Center + + Outline + TR_SCREENMAIN_TABLE_GAMEPOINTS + + + 0 + 0 + 0 + 27 + 100 + + + Center + Center + + Outline + + + + 640 + 270 + -1.01 + 27 + 380 + + + Center + Center + + Outline + TR_SCREENMAIN_POPUP_REALLYEXIT + + + 660 + 135 + 0 + 27 + 0 + + + Right + Center + + Outline + + + + 0 + 0 + 0 + 27 + 0 + + + Center + Center + + Outline + + + + 0 + 0 + 0 + 27 + 0 + + + Center + Center + + Outline + + + + 640 + 520 + 0 + 44 + 0 + + + Center + Center + + Outline + TR_SCREENMAIN_FINISH + + + 640 + 575 + 0 + 31 + 770 + + + Center + Center + + Outline + + + + 640 + 515 + 0 + 27 + 0 + + + Center + Center + + Outline + TR_SCREENMAIN_NEXT_PLAYER + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Output/PartyModes/Challenge/Themes/Genius/Screens/PartyScreenChallengeNames.xml b/Output/PartyModes/Challenge/Themes/Genius/Screens/PartyScreenChallengeNames.xml new file mode 100644 index 00000000..2ce1d175 --- /dev/null +++ b/Output/PartyModes/Challenge/Themes/Genius/Screens/PartyScreenChallengeNames.xml @@ -0,0 +1,382 @@ + + + + PartyScreenChallengeNames + 1 + + + + Video + + + BG_Default + + + + + + + + + 0 + 40 + 1280 + 45 + 1 + + + + + + 640 + 50 + 0 + 27 + 0 + + + Center + Center + + Outline + TR_SCREENNAMES_TITLE + + + + + + + + + + + + + + + + + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + SelectSlideArrowLeft + SelectSlideArrowRight + + 40 + 100 + 1200 + 50 + 0 + + + 45 + 105 + 40 + 40 + 0 + + + 1195 + 105 + 40 + 40 + 0 + + + + + + + + 27 + 50 + 0 + 200 + Outline + Bold + 2 + + + + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlidePlayer + SelectSlideArrowLeft + SelectSlideArrowRight + + 40 + 160 + 1200 + 150 + 0 + + + 45 + 210 + 40 + 40 + 0 + + + 1195 + 210 + 40 + 40 + 0 + + + + + + + + 27 + 50 + 5 + 200 + Outline + Bold + 8 + + + + + + + 95 + 350 + 1200 + 393 + 0 + + CoverTile + + PlayerSelector + + 100 + 100 + 10 + 2 + 10 + 10 + + -20 + 17 + Outline + + + + + + + + + + + \ No newline at end of file diff --git a/Output/PartyModes/ChallengeMedley/Themes/Default.xml b/Output/PartyModes/ChallengeMedley/Themes/Default.xml index 5999e8cc..10e1c461 100644 --- a/Output/PartyModes/ChallengeMedley/Themes/Default.xml +++ b/Output/PartyModes/ChallengeMedley/Themes/Default.xml @@ -1,6 +1,6 @@  - 5 + 6 Default brunzel diff --git a/Output/PartyModes/ChallengeMedley/Themes/Genius.xml b/Output/PartyModes/ChallengeMedley/Themes/Genius.xml new file mode 100644 index 00000000..7a551898 --- /dev/null +++ b/Output/PartyModes/ChallengeMedley/Themes/Genius.xml @@ -0,0 +1,10 @@ + + + 6 + + Genius + Jiiniasu + 0 + 1 + + \ No newline at end of file diff --git a/Output/PartyModes/ChallengeMedley/Themes/Genius/Genius.xml b/Output/PartyModes/ChallengeMedley/Themes/Genius/Genius.xml new file mode 100644 index 00000000..2db98024 --- /dev/null +++ b/Output/PartyModes/ChallengeMedley/Themes/Genius/Genius.xml @@ -0,0 +1,13 @@ + + + 4 + + Genius + Jiiniasu + 0 + 1 + + + + + \ No newline at end of file diff --git a/Output/PartyModes/ChallengeMedley/Themes/Genius/Screens/PartyScreenChallengeMedleyConfig.xml b/Output/PartyModes/ChallengeMedley/Themes/Genius/Screens/PartyScreenChallengeMedleyConfig.xml new file mode 100644 index 00000000..1ddc136c --- /dev/null +++ b/Output/PartyModes/ChallengeMedley/Themes/Genius/Screens/PartyScreenChallengeMedleyConfig.xml @@ -0,0 +1,491 @@ + + + + PartyScreenChallengeMedleyConfig + 2 + + + + Video + + + BG_Default + + + + + + + + + 0 + 40 + 1280 + 45 + 1 + + + + + + 640 + 50 + 0 + 27 + 0 + + + Center + Center + + Outline + TR_SCREENCONFIG_TITLE + + + 75 + 105 + 0 + 27 + 0 + + + Left + Center + + Outline + TR_SCREENCONFIG_NUMPLAYERS + + + 75 + 165 + 0 + 27 + 0 + + + Left + Center + + Outline + TR_SCREENCONFIG_NUMMICS + + + 75 + 225 + 0 + 27 + 0 + + + Left + Center + + Outline + TR_SCREENCONFIG_NUMROUNDS + + + 75 + 285 + 0 + 27 + 0 + + + Left + Center + + Outline + TR_SCREENCONFIG_NUMSONGS + + + 75 + 345 + 0 + 27 + 0 + + + Left + Center + + Outline + TR_SCREENCONFIG_SONGSOURCE + + + + + + + + + + + + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + SelectSlideArrowLeft + SelectSlideArrowRight + + 500 + 100 + 700 + 50 + 0 + + + 505 + 105 + 40 + 40 + 0 + + + 1155 + 105 + 40 + 40 + 0 + + + + + + + + 27 + 50 + 0 + 200 + Outline + Bold + 9 + + + + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + SelectSlideArrowLeft + SelectSlideArrowRight + + 500 + 160 + 700 + 50 + 0 + + + 505 + 165 + 40 + 40 + 0 + + + 1155 + 165 + 40 + 40 + 0 + + + + + + + + 27 + 50 + 0 + 200 + Outline + Bold + 2 + + + + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + SelectSlideArrowLeft + SelectSlideArrowRight + + 500 + 220 + 700 + 50 + 0 + + + 505 + 225 + 40 + 40 + 0 + + + 1155 + 225 + 40 + 40 + 0 + + + + + + + + 27 + 50 + 0 + 200 + Outline + Bold + 10 + + + + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + SelectSlideArrowLeft + SelectSlideArrowRight + + 500 + 280 + 700 + 50 + 0 + + + 505 + 285 + 40 + 40 + 0 + + + 1155 + 285 + 40 + 40 + 0 + + + + + + + + 27 + 50 + 0 + 200 + Outline + Bold + 10 + + + + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + SelectSlideArrowLeft + SelectSlideArrowRight + + 500 + 340 + 700 + 50 + 0 + + + 505 + 345 + 40 + 40 + 0 + + + 1155 + 345 + 40 + 40 + 0 + + + + + + + + 27 + 50 + 0 + 200 + Outline + Bold + 3 + + + + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + SelectSlideArrowLeft + SelectSlideArrowRight + + 500 + 400 + 700 + 50 + 0 + + + 505 + 405 + 40 + 40 + 0 + + + 1155 + 405 + 40 + 40 + 0 + + + + + + + + 27 + 50 + 0 + 700 + Outline + Bold + 1 + + + + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + SelectSlideArrowLeft + SelectSlideArrowRight + + 500 + 400 + 700 + 50 + 0 + + + 505 + 405 + 40 + 40 + 0 + + + 1155 + 405 + 40 + 40 + 0 + + + + + + + + 27 + 50 + 0 + 700 + Outline + Bold + 1 + + + + + + + + + \ No newline at end of file diff --git a/Output/PartyModes/ChallengeMedley/Themes/Genius/Screens/PartyScreenChallengeMedleyMain.xml b/Output/PartyModes/ChallengeMedley/Themes/Genius/Screens/PartyScreenChallengeMedleyMain.xml new file mode 100644 index 00000000..56371aea --- /dev/null +++ b/Output/PartyModes/ChallengeMedley/Themes/Genius/Screens/PartyScreenChallengeMedleyMain.xml @@ -0,0 +1,557 @@ + + + + PartyScreenChallengeMedleyMain + 1 + + + + Video + + + BG_Default + + + + + + + + + 0 + 40 + 1280 + 45 + 1 + + + + PopupBG + + + 0 + 0 + 1280 + 720 + -1 + + + + + + + 0 + 0 + 100 + 100 + 0 + + + + + + 640 + 50 + 0 + 27 + 0 + + + Center + Center + + Outline + TR_SCREENMAIN_TITLE + + + 40 + 135 + 0 + 27 + 0 + + + Right + Center + + Outline + TR_SCREENMAIN_TABLE_POS + + + 50 + 135 + 0 + 27 + 130 + + + Left + Center + + Outline + TR_SCREENMAIN_TABLE_PLAYERNAME + + + 260 + 135 + 0 + 27 + 0 + + + Right + Center + + Outline + TR_SCREENMAIN_TABLE_NUMPLAYED + + + 340 + 135 + 0 + 27 + 0 + + + Right + Center + + Outline + TR_SCREENMAIN_TABLE_WON + + + 490 + 135 + 0 + 27 + 0 + + + Right + Center + + Outline + TR_SCREENMAIN_TABLE_SINGPOINTS + + + 590 + 135 + 0 + 27 + 0 + + + Right + Center + + Outline + TR_SCREENMAIN_TABLE_GAMEPOINTS + + + 0 + 0 + 0 + 27 + 100 + + + Center + Center + + Outline + + + + 640 + 270 + -1.01 + 27 + 380 + + + Center + Center + + Outline + TR_SCREENMAIN_POPUP_REALLYEXIT + + + 660 + 135 + 0 + 27 + 0 + + + Right + Center + + Outline + + + + 0 + 0 + 0 + 27 + 0 + + + Center + Center + + Outline + + + + 0 + 0 + 0 + 27 + 0 + + + Center + Center + + Outline + + + + 640 + 520 + 0 + 44 + 0 + + + Center + Center + + Outline + TR_SCREENMAIN_FINISH + + + 640 + 575 + 0 + 31 + 770 + + + Center + Center + + Outline + + + + 640 + 515 + 0 + 27 + 0 + + + Center + Center + + Outline + TR_SCREENMAIN_NEXT_PLAYER + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Output/PartyModes/ChallengeMedley/Themes/Genius/Screens/PartyScreenChallengeMedleyNames.xml b/Output/PartyModes/ChallengeMedley/Themes/Genius/Screens/PartyScreenChallengeMedleyNames.xml new file mode 100644 index 00000000..0b00f1de --- /dev/null +++ b/Output/PartyModes/ChallengeMedley/Themes/Genius/Screens/PartyScreenChallengeMedleyNames.xml @@ -0,0 +1,382 @@ + + + + PartyScreenChallengMedleyNames + 1 + + + + Video + + + BG_Default + + + + + + + + + 0 + 40 + 1280 + 45 + 1 + + + + + + 640 + 50 + 0 + 27 + 0 + + + Center + Center + + Outline + TR_SCREENNAMES_TITLE + + + + + + + + + + + + + + + + + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + SelectSlideArrowLeft + SelectSlideArrowRight + + 40 + 100 + 1200 + 50 + 0 + + + 45 + 105 + 40 + 40 + 0 + + + 1195 + 105 + 40 + 40 + 0 + + + + + + + + 27 + 50 + 0 + 200 + Outline + Bold + 2 + + + + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlidePlayer + SelectSlideArrowLeft + SelectSlideArrowRight + + 40 + 160 + 1200 + 150 + 0 + + + 45 + 210 + 40 + 40 + 0 + + + 1195 + 210 + 40 + 40 + 0 + + + + + + + + 27 + 50 + 5 + 200 + Outline + Bold + 8 + + + + + + + 95 + 350 + 1200 + 393 + 0 + + CoverTile + + PlayerSelector + + 100 + 100 + 10 + 2 + 10 + 10 + + -20 + 17 + Outline + + + + + + + + + + + \ No newline at end of file diff --git a/Output/PartyModes/TicTacToe/Themes/Default.xml b/Output/PartyModes/TicTacToe/Themes/Default.xml index 5999e8cc..10e1c461 100644 --- a/Output/PartyModes/TicTacToe/Themes/Default.xml +++ b/Output/PartyModes/TicTacToe/Themes/Default.xml @@ -1,6 +1,6 @@  - 5 + 6 Default brunzel diff --git a/Output/PartyModes/TicTacToe/Themes/Genius.xml b/Output/PartyModes/TicTacToe/Themes/Genius.xml new file mode 100644 index 00000000..7a551898 --- /dev/null +++ b/Output/PartyModes/TicTacToe/Themes/Genius.xml @@ -0,0 +1,10 @@ + + + 6 + + Genius + Jiiniasu + 0 + 1 + + \ No newline at end of file diff --git a/Output/PartyModes/TicTacToe/Themes/Genius/Genius.xml b/Output/PartyModes/TicTacToe/Themes/Genius/Genius.xml new file mode 100644 index 00000000..e556735e --- /dev/null +++ b/Output/PartyModes/TicTacToe/Themes/Genius/Genius.xml @@ -0,0 +1,13 @@ + + + 4 + + Genius + Jiiniasu + 0 + 1 + + + + + diff --git a/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeConfig.xml b/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeConfig.xml new file mode 100644 index 00000000..a38e7694 --- /dev/null +++ b/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeConfig.xml @@ -0,0 +1,379 @@ + + + + PartyScreenTicTacToeConfig + 1 + + + + Video + + + BG_Default + + + + + + + + + 0 + 40 + 1280 + 45 + 1 + + + + + + 640 + 50 + 0 + 27 + 0 + + + Center + Center + + Outline + TR_SCREENCONFIG_TITLE + + + 75 + 105 + 0 + 27 + 0 + + + Left + Center + + Outline + TR_SCREENCONFIG_NUMFIELDS + + + 75 + 165 + 0 + 27 + 0 + + + Left + Center + + Outline + TR_SCREENCONFIG_SONGSOURCE + + + 75 + 285 + 0 + 27 + 0 + + + Left + Center + + Outline + TR_SCREENCONFIG_GAMEMODE + + + + + + + + + + + + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + SelectSlideArrowLeft + SelectSlideArrowRight + + 500 + 100 + 700 + 50 + 0 + + + 505 + 105 + 40 + 40 + 0 + + + 1155 + 105 + 40 + 40 + 0 + + + + + + + + 27 + 50 + 0 + 205.33 + Outline + Bold + 3 + + + + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + SelectSlideArrowLeft + SelectSlideArrowRight + + 500 + 160 + 700 + 50 + 0 + + + 505 + 165 + 40 + 40 + 0 + + + 1155 + 165 + 40 + 40 + 0 + + + + + + + + 27 + 50 + 0 + 205.33 + Outline + Bold + 3 + + + + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + SelectSlideArrowLeft + SelectSlideArrowRight + + 500 + 220 + 700 + 50 + 0 + + + 505 + 225 + 40 + 40 + 0 + + + 1155 + 225 + 40 + 40 + 0 + + + + + + + + 27 + 50 + 0 + 205.33 + Outline + Bold + 1 + + + + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + SelectSlideArrowLeft + SelectSlideArrowRight + + 500 + 220 + 700 + 50 + 0 + + + 505 + 225 + 40 + 40 + 0 + + + 1155 + 225 + 40 + 40 + 0 + + + + + + + + 27 + 50 + 0 + 205.33 + Outline + Bold + 1 + + + + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + SelectSlideArrowLeft + SelectSlideArrowRight + + 500 + 280 + 700 + 50 + 0 + + + 505 + 285 + 40 + 40 + 0 + + + 1155 + 285 + 40 + 40 + 0 + + + + + + + + 27 + 50 + 0 + 205.33 + Outline + Bold + 1 + + + + + + + + + \ No newline at end of file diff --git a/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeMain.xml b/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeMain.xml new file mode 100644 index 00000000..471a2294 --- /dev/null +++ b/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeMain.xml @@ -0,0 +1,497 @@ + + + + PartyScreenTicTacToeMain + 1 + + + + Video + + + BG_Default + + + + + + + + + 0 + 40 + 1280 + 45 + 1 + + + + PopupBG + + + 0 + 0 + 1280 + 720 + -2 + + + + PopupBG + + + 10 + 200 + 100 + 100 + -1 + + + + PopupBG + + + 1170 + 200 + 100 + 100 + -1 + + + + + + 640 + 50 + 0 + 27 + 0 + + + Center + Center + + Outline + TR_SCREENMAIN_TITLE + + + 640 + 270 + -2.01 + 27 + 380 + + + Center + Center + + Outline + TR_SCREENMAIN_POPUP_REALLYEXIT + + + 640 + 90 + 0 + 35 + 0 + + + Center + Center + + Outline + + + + 640 + 90 + 0 + 35 + 0 + + + Center + Center + + Outline + + + + 160 + 150 + 0 + 35 + 0 + + + Center + Center + + Outline + TR_SCREENMAIN_NEXT_PLAYER + + + 1120 + 150 + 0 + 35 + 0 + + + Center + Center + + Outline + TR_SCREENMAIN_NEXT_PLAYER + + + 120 + 230 + 0 + 35 + 0 + + + Left + Center + + Outline + + + + 1160 + 230 + 0 + 40 + 0 + + + Right + Center + + Outline + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeNames.xml b/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeNames.xml new file mode 100644 index 00000000..1e27c09c --- /dev/null +++ b/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeNames.xml @@ -0,0 +1,382 @@ + + + + PartyScreenTicTacToeNames + 1 + + + + Video + + + BG_Default + + + + + + + + + 0 + 40 + 1280 + 45 + 1 + + + + + + 640 + 50 + 0 + 27 + 0 + + + Center + Center + + Outline + TR_SCREENNAMES_TITLE + + + + + + + + + + + + + + + + + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + SelectSlideArrowLeft + SelectSlideArrowRight + + 40 + 100 + 1055 + 50 + 0 + + + 45 + 105 + 40 + 40 + 0 + + + 1050 + 105 + 40 + 40 + 0 + + + + + + + + 27 + 50 + 0 + 200 + Outline + Bold + 2 + + + + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlidePlayer + SelectSlideArrowLeft + SelectSlideArrowRight + + 40 + 160 + 1055 + 150 + 0 + + + 45 + 210 + 40 + 40 + 0 + + + 1050 + 210 + 40 + 40 + 0 + + + + + + + + 27 + 50 + 5 + 200 + Outline + Bold + 8 + + + + + + + 95 + 350 + 1200 + 393 + 0 + + CoverTile + + PlayerSelector + + 100 + 100 + 10 + 2 + 10 + 10 + + -20 + 17 + Outline + + + + + + + + + + + \ No newline at end of file diff --git a/Output/Profiles/guest3.xml b/Output/Profiles/guest3.xml index ad3c3eb5..f8b196f8 100644 --- a/Output/Profiles/guest3.xml +++ b/Output/Profiles/guest3.xml @@ -2,7 +2,7 @@ Guest 3 TR_CONFIG_EASY - TR_USERROLE_NORMAL + TR_USERROLE_GUEST TR_CONFIG_ON Avatar_m.png \ No newline at end of file diff --git a/Output/Readme.txt b/Output/Readme.txt index 2b12b84a..2cdffb4b 100644 --- a/Output/Readme.txt +++ b/Output/Readme.txt @@ -1,4 +1,4 @@ -Vocaluxe 0.3 README +Vocaluxe 0.4 README ---------------------------- ================================= @@ -23,25 +23,29 @@ Vocaluxe is an entirely new development in C#, inspired by the original UltraSta and the great Ultrastar Deluxe project. Supported Operating Systems / Requirements: -- WinXP, Vista, Windows 7 or Windows 8 with .NET 4.0 +- Windows Vista, Windows 7, Windows 8 or Windows 10 with .NET 4.0 +- Linux (no official support) - 1 GHz CPU, 512 MB RAM, Graphics card with OpenGL 2.1 or DirectX 9.0 support -- Visual C++ Redistributable Packages 2008 and 2012 +- Visual C++ Redistributable Package 2010 ================================= = 2. Release Notes = ================================= -- The program supports 32bit and 64bit (Vocaluxe_x64.exe) operating systems. +- The program supports 32bit and 64bit (appropriate download package) operating systems. -- To add your existing song collection to Vocaluxe, put your songs into the 'Songs' subfolder. +- When using installer, you can find all mentioned folder in 'Documents/Vocaluxe', otherwise + they should be created just next to 'Vocaluxe.exe' + +- To add your existing song collection to Vocaluxe, put your songs into the 'Songs' subfolder. Alternatively, you can add multiple song paths to Vocaluxe by editing your Config.xml: - - C:\Vocaluxe\Songs - D:\EvenMore\Songs + + C:\Vocaluxe\Songs + D:\EvenMore\Songs - To use your highscore database from UltraStar deluxe 1.0.1, UltraStar deluxe CMD Mod or UltraStar deluxe 1.1, simply copy your Ultrastar.db (rename if necessary) into the main @@ -101,6 +105,8 @@ or from the console: load playlist from this path. Example: Vocaluxe.exe -PlaylistFolder D:\MyPlaylists + +-OldTheme yes : Try to load theme that is created for vocaluxe 0.2 or older (or some pre-release version of 0.3). Enter theme editor and save your theme to convert every file to new syntax. This will be removed in a future version. Complete example: @@ -128,14 +134,18 @@ Vocaluxe.exe -ConfigFile MyConfig.xml -ScoreFile C:\Vocaluxe\Highscores\MyHighsc Song screen [F3] to open/close the song search menu [SPACE] to open/close the song menu +[TAB] to switch selection of song menu and playlist (if opened) [CTRL] + [R] to select a random song [CTRL] + [A] to sing all songs +[CTRL] + [S] to sing current song in medley version [CTRL] + [V] to sing all songs from a category [NUM_1]..[NUM_6] to use a Joker for team 1..6 [A]..[Z] to jump to category/song title starting with that letter Name selection screen [1]..[6] to activate player selection. +[P] to activate fast player selection +[+] or [-] to increase/decrease number of player [Cursor] to select a profile. [Enter] to confirm a selection. @@ -145,20 +155,25 @@ Sing screen [T] to change the time format of the timer. [I] to change view of player information. [W] to activate the configured webcam. +[V] to change video aspect ratio + +Score and highscore screen +[LEFT] or [RIGHT] to show (high)scores of another round (if there is more than one) ================================= = 5. Help & Suppport = ================================= -Bug Tracker: http://84.200.73.138/redmine/projects/vocaluxe +Vocaluxe Homepage: https://vocaluxe.org +Bug Tracker: https://github.com/Vocaluxe/Vocaluxe/issues Translations: https://www.transifex.com/projects/p/vocaluxe/ GitHub Wiki: https://github.com/Vocaluxe/Vocaluxe/wiki -Support Forum (German): http://www.ultra-star.de -Song-DataBase (USDB): http://usdb.animux.de/ +Support Forum (German): http://www.ultra-star.de +Song-DataBase (USDB): http://usdb.animux.de/ ================================= = 6. Source Code = ================================= -Source Code (GitHub): https://github.com/Vocaluxe/Vocaluxe -SF.Net Page: http://sourceforge.net/projects/vocaluxe/ \ No newline at end of file +Source Code (GitHub): https://github.com/Vocaluxe/Vocaluxe +SF.Net Page (outdated): http://sourceforge.net/projects/vocaluxe/ diff --git a/Output/Themes/Ambient.xml b/Output/Themes/Ambient.xml deleted file mode 100644 index 91b0c674..00000000 --- a/Output/Themes/Ambient.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - 5 - - Ambient - bohning - 0 - 2 - - - Cursor - 40 - 40 - - - \ No newline at end of file diff --git a/Output/Themes/Ambient/Button.png b/Output/Themes/Ambient/Button.png deleted file mode 100644 index 47a97da5..00000000 Binary files a/Output/Themes/Ambient/Button.png and /dev/null differ diff --git a/Output/Themes/Ambient/Close.png b/Output/Themes/Ambient/Close.png deleted file mode 100644 index b8b8a994..00000000 Binary files a/Output/Themes/Ambient/Close.png and /dev/null differ diff --git a/Output/Themes/Ambient/CoverBackground.png b/Output/Themes/Ambient/CoverBackground.png deleted file mode 100644 index 353322df..00000000 Binary files a/Output/Themes/Ambient/CoverBackground.png and /dev/null differ diff --git a/Output/Themes/Ambient/Cursor.png b/Output/Themes/Ambient/Cursor.png deleted file mode 100644 index 9c9e8288..00000000 Binary files a/Output/Themes/Ambient/Cursor.png and /dev/null differ diff --git a/Output/Themes/Ambient/Delete.png b/Output/Themes/Ambient/Delete.png deleted file mode 100644 index 46a686ad..00000000 Binary files a/Output/Themes/Ambient/Delete.png and /dev/null differ diff --git a/Output/Themes/Ambient/DuetIcon.png b/Output/Themes/Ambient/DuetIcon.png deleted file mode 100644 index 1ba7a353..00000000 Binary files a/Output/Themes/Ambient/DuetIcon.png and /dev/null differ diff --git a/Output/Themes/Ambient/EnergyBeam.png b/Output/Themes/Ambient/EnergyBeam.png deleted file mode 100644 index 80802776..00000000 Binary files a/Output/Themes/Ambient/EnergyBeam.png and /dev/null differ diff --git a/Output/Themes/Ambient/LyricHelper.png b/Output/Themes/Ambient/LyricHelper.png deleted file mode 100644 index c4788bfd..00000000 Binary files a/Output/Themes/Ambient/LyricHelper.png and /dev/null differ diff --git a/Output/Themes/Ambient/Lyrics.png b/Output/Themes/Ambient/Lyrics.png deleted file mode 100644 index f27b96de..00000000 Binary files a/Output/Themes/Ambient/Lyrics.png and /dev/null differ diff --git a/Output/Themes/Ambient/MedleyCalcIcon.png b/Output/Themes/Ambient/MedleyCalcIcon.png deleted file mode 100644 index 25b73f10..00000000 Binary files a/Output/Themes/Ambient/MedleyCalcIcon.png and /dev/null differ diff --git a/Output/Themes/Ambient/MedleyTagIcon.png b/Output/Themes/Ambient/MedleyTagIcon.png deleted file mode 100644 index 2bf40bdc..00000000 Binary files a/Output/Themes/Ambient/MedleyTagIcon.png and /dev/null differ diff --git a/Output/Themes/Ambient/Menu.png b/Output/Themes/Ambient/Menu.png deleted file mode 100644 index c5c56a49..00000000 Binary files a/Output/Themes/Ambient/Menu.png and /dev/null differ diff --git a/Output/Themes/Ambient/Minus.png b/Output/Themes/Ambient/Minus.png deleted file mode 100644 index 9bdede57..00000000 Binary files a/Output/Themes/Ambient/Minus.png and /dev/null differ diff --git a/Output/Themes/Ambient/NextIcon.png b/Output/Themes/Ambient/NextIcon.png deleted file mode 100644 index fb6bf6c4..00000000 Binary files a/Output/Themes/Ambient/NextIcon.png and /dev/null differ diff --git a/Output/Themes/Ambient/Pause.png b/Output/Themes/Ambient/Pause.png deleted file mode 100644 index 50e73658..00000000 Binary files a/Output/Themes/Ambient/Pause.png and /dev/null differ diff --git a/Output/Themes/Ambient/PauseIcon.png b/Output/Themes/Ambient/PauseIcon.png deleted file mode 100644 index 6f9c8870..00000000 Binary files a/Output/Themes/Ambient/PauseIcon.png and /dev/null differ diff --git a/Output/Themes/Ambient/PerfectNoteStar.png b/Output/Themes/Ambient/PerfectNoteStar.png deleted file mode 100644 index 9b29e9b3..00000000 Binary files a/Output/Themes/Ambient/PerfectNoteStar.png and /dev/null differ diff --git a/Output/Themes/Ambient/PlayIcon.png b/Output/Themes/Ambient/PlayIcon.png deleted file mode 100644 index 5f34140b..00000000 Binary files a/Output/Themes/Ambient/PlayIcon.png and /dev/null differ diff --git a/Output/Themes/Ambient/PlayerSelector.png b/Output/Themes/Ambient/PlayerSelector.png deleted file mode 100644 index c57ab300..00000000 Binary files a/Output/Themes/Ambient/PlayerSelector.png and /dev/null differ diff --git a/Output/Themes/Ambient/Plus.png b/Output/Themes/Ambient/Plus.png deleted file mode 100644 index 5b813c53..00000000 Binary files a/Output/Themes/Ambient/Plus.png and /dev/null differ diff --git a/Output/Themes/Ambient/Popup.png b/Output/Themes/Ambient/Popup.png deleted file mode 100644 index 80868001..00000000 Binary files a/Output/Themes/Ambient/Popup.png and /dev/null differ diff --git a/Output/Themes/Ambient/PreviousIcon.png b/Output/Themes/Ambient/PreviousIcon.png deleted file mode 100644 index 9a92bf23..00000000 Binary files a/Output/Themes/Ambient/PreviousIcon.png and /dev/null differ diff --git a/Output/Themes/Ambient/Random.png b/Output/Themes/Ambient/Random.png deleted file mode 100644 index b07ecf7b..00000000 Binary files a/Output/Themes/Ambient/Random.png and /dev/null differ diff --git a/Output/Themes/Ambient/RepeatIcon.png b/Output/Themes/Ambient/RepeatIcon.png deleted file mode 100644 index ecf82df1..00000000 Binary files a/Output/Themes/Ambient/RepeatIcon.png and /dev/null differ diff --git a/Output/Themes/Ambient/Save.png b/Output/Themes/Ambient/Save.png deleted file mode 100644 index 1afc3113..00000000 Binary files a/Output/Themes/Ambient/Save.png and /dev/null differ diff --git a/Output/Themes/Ambient/Score.png b/Output/Themes/Ambient/Score.png deleted file mode 100644 index 98ac51e3..00000000 Binary files a/Output/Themes/Ambient/Score.png and /dev/null differ diff --git a/Output/Themes/Ambient/ScrollDown.png b/Output/Themes/Ambient/ScrollDown.png deleted file mode 100644 index 94bd2e14..00000000 Binary files a/Output/Themes/Ambient/ScrollDown.png and /dev/null differ diff --git a/Output/Themes/Ambient/ScrollUp.png b/Output/Themes/Ambient/ScrollUp.png deleted file mode 100644 index c3b4c6b9..00000000 Binary files a/Output/Themes/Ambient/ScrollUp.png and /dev/null differ diff --git a/Output/Themes/Ambient/SelectSlide.png b/Output/Themes/Ambient/SelectSlide.png deleted file mode 100644 index 167beb4e..00000000 Binary files a/Output/Themes/Ambient/SelectSlide.png and /dev/null differ diff --git a/Output/Themes/Ambient/SelectSlideArrowLeft.png b/Output/Themes/Ambient/SelectSlideArrowLeft.png deleted file mode 100644 index 313fe280..00000000 Binary files a/Output/Themes/Ambient/SelectSlideArrowLeft.png and /dev/null differ diff --git a/Output/Themes/Ambient/SelectSlideArrowRight.png b/Output/Themes/Ambient/SelectSlideArrowRight.png deleted file mode 100644 index 7dfd68c0..00000000 Binary files a/Output/Themes/Ambient/SelectSlideArrowRight.png and /dev/null differ diff --git a/Output/Themes/Ambient/SelectSlidePlayer.png b/Output/Themes/Ambient/SelectSlidePlayer.png deleted file mode 100644 index 2a100dbd..00000000 Binary files a/Output/Themes/Ambient/SelectSlidePlayer.png and /dev/null differ diff --git a/Output/Themes/Ambient/Sing.png b/Output/Themes/Ambient/Sing.png deleted file mode 100644 index c7daf961..00000000 Binary files a/Output/Themes/Ambient/Sing.png and /dev/null differ diff --git a/Output/Themes/Ambient/Skin Green.xml b/Output/Themes/Ambient/Skin Green.xml deleted file mode 100644 index 3b6e3ba8..00000000 --- a/Output/Themes/Ambient/Skin Green.xml +++ /dev/null @@ -1,262 +0,0 @@ - - - 4 - - Green - bohning - 0 - 0 - - - - 0.000 - 0.000 - 1.000 - 1.000 - - - 1.000 - 0.000 - 0.000 - 1.000 - - - 0.000 - 1.000 - 0.000 - 1.000 - - - 0.500 - 0.000 - 1.000 - 1.000 - - - 1.000 - 0.800 - 0.000 - 1.000 - - - 1.000 - 0.000 - 0.500 - 1.000 - - - 0.000 - 0.750 - 0.000 - 1.000 - - - 0.709 - 0.968 - 0.674 - 1.000 - - - 0.709 - 0.968 - 0.674 - 0.500 - - - 0.709 - 0.968 - 0.674 - 0.600 - - - 0.709 - 0.968 - 0.674 - 0.300 - - - 0.709 - 0.968 - 0.674 - 1.000 - - - 0.709 - 0.968 - 0.674 - 0.500 - - - 0.709 - 0.968 - 0.674 - 1.000 - - - 0.709 - 0.968 - 0.674 - 1.000 - - - 0.709 - 0.968 - 0.674 - 0.500 - - - 0.709 - 0.968 - 0.674 - 0.300 - - - 0.709 - 0.968 - 0.674 - 1.000 - - - 0.709 - 0.968 - 0.674 - 0.500 - - - 0.709 - 0.968 - 0.674 - 1.000 - - - 1.000 - 0.000 - 0.000 - 1.000 - - - 0.000 - 0.000 - 0.000 - 1.000 - - - 1.000 - 1.000 - 1.000 - 1.000 - - - 1.000 - 1.000 - 1.000 - 1.000 - - - 1.000 - 1.000 - 1.000 - 0.000 - - - 0.000 - 1.000 - 0.000 - 1.000 - - - 0.000 - 0.000 - 0.000 - 1.000 - - - 0.300 - 0.300 - 0.300 - 1.000 - - - 0.000 - 1.000 - 0.000 - 0.500 - - - 0.800 - 1.000 - 0.811 - 0.500 - - - 0.800 - 1.000 - 0.811 - 0.811 - - - - [Green]BG_Default.png - [Green]BG_Options.png - Menu.png - - CoverTile.png - CoverBackground.png - Cursor.png - TimeBar.png - TimeLine.png - Pointer.png - SelectSlide.png - SelectSlidePlayer.png - SelectSlideArrowLeft.png - SelectSlideArrowRight.png - notes_left.png - notes_mid.png - notes_right.png - notes_bg_left.png - notes_bg_mid.png - notes_bg_right.png - points_bar.png - points_bar_bg.png - Lyrics.png - LyricHelper.png - ToneHelper.png - TextBG.png - Score.png - Star.png - Snowflake.png - SongMenu.png - PerfectNoteStar.png - Pause.png - EnergyBeam.png - DuetIcon.png - VideoIcon.png - VideoIconCO.png - VideoIconBG.png - MedleyCalcIcon.png - MedleyTagIcon.png - PlayerSelector.png - PreviousIcon.png - NextIcon.png - PlayIcon.png - PauseIcon.png - RepeatIcon.png - SongMenuBG.png - Close.png - Delete.png - Save.png - Sing.png - Minus.png - Plus.png - Random.png - Popup.png - ScrollUp.png - ScrollDown.png - - - [Green]BG_Video.mp4 - [Green]IntroIn.mp4 - [Green]IntroMid.mp4 - [Green]IntroOut.mp4 - - \ No newline at end of file diff --git a/Output/Themes/Ambient/Skin Red.xml b/Output/Themes/Ambient/Skin Red.xml deleted file mode 100644 index 0f65931e..00000000 --- a/Output/Themes/Ambient/Skin Red.xml +++ /dev/null @@ -1,262 +0,0 @@ - - - 4 - - Red - bohning - 0 - 0 - - - - 0.000 - 0.000 - 1.000 - 1.000 - - - 1.000 - 0.000 - 0.000 - 1.000 - - - 0.000 - 1.000 - 0.000 - 1.000 - - - 0.500 - 0.000 - 1.000 - 1.000 - - - 1.000 - 0.800 - 0.000 - 1.000 - - - 1.000 - 0.000 - 0.500 - 1.000 - - - 0.750 - 0.000 - 0.000 - 1.000 - - - 0.968 - 0.674 - 0.674 - 1.000 - - - 0.968 - 0.674 - 0.674 - 0.500 - - - 0.968 - 0.674 - 0.674 - 0.600 - - - 0.968 - 0.674 - 0.674 - 0.300 - - - 0.968 - 0.674 - 0.674 - 1.000 - - - 0.968 - 0.674 - 0.674 - 0.500 - - - 0.968 - 0.674 - 0.674 - 1.000 - - - 0.968 - 0.674 - 0.674 - 1.000 - - - 0.968 - 0.674 - 0.674 - 0.500 - - - 0.968 - 0.674 - 0.674 - 0.300 - - - 0.968 - 0.674 - 0.674 - 1.000 - - - 0.968 - 0.674 - 0.674 - 0.500 - - - 0.968 - 0.674 - 0.674 - 1.000 - - - 1.000 - 0.000 - 0.000 - 1.000 - - - 0.000 - 0.000 - 0.000 - 1.000 - - - 1.000 - 1.000 - 1.000 - 1.000 - - - 1.000 - 1.000 - 1.000 - 1.000 - - - 1.000 - 1.000 - 1.000 - 0.000 - - - 1.000 - 0.000 - 0.000 - 1.000 - - - 0.000 - 0.000 - 0.000 - 1.000 - - - 0.300 - 0.300 - 0.300 - 1.000 - - - 1.000 - 0.000 - 0.000 - 0.500 - - - 1.000 - 0.800 - 0.800 - 0.500 - - - 1.000 - 0.800 - 0.800 - 0.850 - - - - [Red]BG_Default.png - [Red]BG_Options.png - Menu.png - - CoverTile.png - CoverBackground.png - Cursor.png - TimeBar.png - TimeLine.png - Pointer.png - SelectSlide.png - SelectSlidePlayer.png - SelectSlideArrowLeft.png - SelectSlideArrowRight.png - notes_left.png - notes_mid.png - notes_right.png - notes_bg_left.png - notes_bg_mid.png - notes_bg_right.png - points_bar.png - points_bar_bg.png - Lyrics.png - LyricHelper.png - ToneHelper.png - TextBG.png - Score.png - Star.png - Snowflake.png - SongMenu.png - PerfectNoteStar.png - Pause.png - EnergyBeam.png - DuetIcon.png - VideoIcon.png - VideoIconCO.png - VideoIconBG.png - MedleyCalcIcon.png - MedleyTagIcon.png - PlayerSelector.png - PreviousIcon.png - NextIcon.png - PlayIcon.png - PauseIcon.png - RepeatIcon.png - SongMenuBG.png - Close.png - Delete.png - Save.png - Sing.png - Minus.png - Plus.png - Random.png - Popup.png - ScrollUp.png - ScrollDown.png - - - [Red]BG_Video.mp4 - [Red]IntroIn.mp4 - [Red]IntroMid.mp4 - [Red]IntroOut.mp4 - - \ No newline at end of file diff --git a/Output/Themes/Ambient/Skin Yellow.xml b/Output/Themes/Ambient/Skin Yellow.xml deleted file mode 100644 index 48c2176b..00000000 --- a/Output/Themes/Ambient/Skin Yellow.xml +++ /dev/null @@ -1,262 +0,0 @@ - - - 4 - - Yellow - bohning - 0 - 0 - - - - 0.000 - 0.000 - 1.000 - 1.000 - - - 1.000 - 0.000 - 0.000 - 1.000 - - - 0.000 - 1.000 - 0.000 - 1.000 - - - 0.500 - 0.000 - 1.000 - 1.000 - - - 1.000 - 0.800 - 0.000 - 1.000 - - - 1.000 - 0.000 - 0.500 - 1.000 - - - 0.750 - 0.750 - 0.000 - 1.000 - - - 0.968 - 0.956 - 0.674 - 1.000 - - - 0.968 - 0.956 - 0.674 - 0.500 - - - 0.968 - 0.956 - 0.674 - 0.600 - - - 0.968 - 0.956 - 0.674 - 0.300 - - - 0.968 - 0.956 - 0.674 - 1.000 - - - 0.968 - 0.956 - 0.674 - 0.500 - - - 0.968 - 0.956 - 0.674 - 1.000 - - - 0.968 - 0.956 - 0.674 - 1.000 - - - 0.968 - 0.956 - 0.674 - 0.500 - - - 0.968 - 0.956 - 0.674 - 0.300 - - - 0.968 - 0.956 - 0.674 - 1.000 - - - 0.968 - 0.956 - 0.674 - 0.500 - - - 0.968 - 0.956 - 0.674 - 1.000 - - - 1.000 - 0.000 - 0.000 - 1.000 - - - 0.000 - 0.000 - 0.000 - 1.000 - - - 1.000 - 1.000 - 1.000 - 1.000 - - - 1.000 - 1.000 - 1.000 - 1.000 - - - 1.000 - 1.000 - 1.000 - 0.000 - - - 1.000 - 1.000 - 0.000 - 1.000 - - - 0.000 - 0.000 - 0.000 - 1.000 - - - 0.300 - 0.300 - 0.300 - 1.000 - - - 1.000 - 1.000 - 0.000 - 0.500 - - - 0.949 - 1.000 - 0.800 - 0.500 - - - 0.949 - 1.000 - 0.800 - 0.850 - - - - [Yellow]BG_Default.png - [Yellow]BG_Options.png - Menu.png - - CoverTile.png - CoverBackground.png - Cursor.png - TimeBar.png - TimeLine.png - Pointer.png - SelectSlide.png - SelectSlidePlayer.png - SelectSlideArrowLeft.png - SelectSlideArrowRight.png - notes_left.png - notes_mid.png - notes_right.png - notes_bg_left.png - notes_bg_mid.png - notes_bg_right.png - points_bar.png - points_bar_bg.png - Lyrics.png - LyricHelper.png - ToneHelper.png - TextBG.png - Score.png - Star.png - Snowflake.png - SongMenu.png - PerfectNoteStar.png - Pause.png - EnergyBeam.png - DuetIcon.png - VideoIcon.png - VideoIconCO.png - VideoIconBG.png - MedleyCalcIcon.png - MedleyTagIcon.png - PlayerSelector.png - PreviousIcon.png - NextIcon.png - PlayIcon.png - PauseIcon.png - RepeatIcon.png - SongMenuBG.png - Close.png - Delete.png - Save.png - Sing.png - Minus.png - Plus.png - Random.png - Popup.png - ScrollUp.png - ScrollDown.png - - - [Yellow]BG_Video.mp4 - [Yellow]IntroIn.mp4 - [Yellow]IntroMid.mp4 - [Yellow]IntroOut.mp4 - - \ No newline at end of file diff --git a/Output/Themes/Ambient/Snowflake.png b/Output/Themes/Ambient/Snowflake.png deleted file mode 100644 index 6ca81fdd..00000000 Binary files a/Output/Themes/Ambient/Snowflake.png and /dev/null differ diff --git a/Output/Themes/Ambient/SongMenu.png b/Output/Themes/Ambient/SongMenu.png deleted file mode 100644 index 6e6b0c6b..00000000 Binary files a/Output/Themes/Ambient/SongMenu.png and /dev/null differ diff --git a/Output/Themes/Ambient/SongMenuBG.png b/Output/Themes/Ambient/SongMenuBG.png deleted file mode 100644 index a7333adb..00000000 Binary files a/Output/Themes/Ambient/SongMenuBG.png and /dev/null differ diff --git a/Output/Themes/Ambient/Star.png b/Output/Themes/Ambient/Star.png deleted file mode 100644 index d866cfb6..00000000 Binary files a/Output/Themes/Ambient/Star.png and /dev/null differ diff --git a/Output/Themes/Ambient/TextBG.png b/Output/Themes/Ambient/TextBG.png deleted file mode 100644 index d565435d..00000000 Binary files a/Output/Themes/Ambient/TextBG.png and /dev/null differ diff --git a/Output/Themes/Ambient/TimeBar.png b/Output/Themes/Ambient/TimeBar.png deleted file mode 100644 index a3e1bf10..00000000 Binary files a/Output/Themes/Ambient/TimeBar.png and /dev/null differ diff --git a/Output/Themes/Ambient/TimeBar2.png b/Output/Themes/Ambient/TimeBar2.png deleted file mode 100644 index 64b4264a..00000000 Binary files a/Output/Themes/Ambient/TimeBar2.png and /dev/null differ diff --git a/Output/Themes/Ambient/TimeLine.png b/Output/Themes/Ambient/TimeLine.png deleted file mode 100644 index 664fb882..00000000 Binary files a/Output/Themes/Ambient/TimeLine.png and /dev/null differ diff --git a/Output/Themes/Ambient/ToneHelper.png b/Output/Themes/Ambient/ToneHelper.png deleted file mode 100644 index 91dce055..00000000 Binary files a/Output/Themes/Ambient/ToneHelper.png and /dev/null differ diff --git a/Output/Themes/Ambient/VideoIcon.png b/Output/Themes/Ambient/VideoIcon.png deleted file mode 100644 index 4abc12a6..00000000 Binary files a/Output/Themes/Ambient/VideoIcon.png and /dev/null differ diff --git a/Output/Themes/Ambient/VideoIconBG.png b/Output/Themes/Ambient/VideoIconBG.png deleted file mode 100644 index ff0950fe..00000000 Binary files a/Output/Themes/Ambient/VideoIconBG.png and /dev/null differ diff --git a/Output/Themes/Ambient/VideoIconCO.png b/Output/Themes/Ambient/VideoIconCO.png deleted file mode 100644 index 3c76dd30..00000000 Binary files a/Output/Themes/Ambient/VideoIconCO.png and /dev/null differ diff --git a/Output/Themes/Ambient/Warning.png b/Output/Themes/Ambient/Warning.png deleted file mode 100644 index 208f5730..00000000 Binary files a/Output/Themes/Ambient/Warning.png and /dev/null differ diff --git a/Output/Themes/Ambient/[Blue]BG_Default.png b/Output/Themes/Ambient/[Blue]BG_Default.png deleted file mode 100644 index 53bd3603..00000000 Binary files a/Output/Themes/Ambient/[Blue]BG_Default.png and /dev/null differ diff --git a/Output/Themes/Ambient/[Blue]BG_Options.png b/Output/Themes/Ambient/[Blue]BG_Options.png deleted file mode 100644 index dfb174e6..00000000 Binary files a/Output/Themes/Ambient/[Blue]BG_Options.png and /dev/null differ diff --git a/Output/Themes/Ambient/[Green]BG_Default.png b/Output/Themes/Ambient/[Green]BG_Default.png deleted file mode 100644 index 77891e93..00000000 Binary files a/Output/Themes/Ambient/[Green]BG_Default.png and /dev/null differ diff --git a/Output/Themes/Ambient/[Green]BG_Options.png b/Output/Themes/Ambient/[Green]BG_Options.png deleted file mode 100644 index 44da3862..00000000 Binary files a/Output/Themes/Ambient/[Green]BG_Options.png and /dev/null differ diff --git a/Output/Themes/Ambient/[Red]BG_Default.png b/Output/Themes/Ambient/[Red]BG_Default.png deleted file mode 100644 index 61f1900b..00000000 Binary files a/Output/Themes/Ambient/[Red]BG_Default.png and /dev/null differ diff --git a/Output/Themes/Ambient/[Red]BG_Options.png b/Output/Themes/Ambient/[Red]BG_Options.png deleted file mode 100644 index 6ca46be7..00000000 Binary files a/Output/Themes/Ambient/[Red]BG_Options.png and /dev/null differ diff --git a/Output/Themes/Ambient/[Yellow]BG_Default.png b/Output/Themes/Ambient/[Yellow]BG_Default.png deleted file mode 100644 index 97dc8eb4..00000000 Binary files a/Output/Themes/Ambient/[Yellow]BG_Default.png and /dev/null differ diff --git a/Output/Themes/Ambient/[Yellow]BG_Options.png b/Output/Themes/Ambient/[Yellow]BG_Options.png deleted file mode 100644 index e7563e3f..00000000 Binary files a/Output/Themes/Ambient/[Yellow]BG_Options.png and /dev/null differ diff --git a/Output/Themes/Ambient/copyright Neon Glow Icons.txt b/Output/Themes/Ambient/copyright Neon Glow Icons.txt deleted file mode 100644 index 25a29b81..00000000 --- a/Output/Themes/Ambient/copyright Neon Glow Icons.txt +++ /dev/null @@ -1 +0,0 @@ -http://www.webdesign-guru.co.uk/icon/neon-glow-icons/ diff --git a/Output/Themes/Ambient/notes_bg_left.png b/Output/Themes/Ambient/notes_bg_left.png deleted file mode 100644 index 14dee215..00000000 Binary files a/Output/Themes/Ambient/notes_bg_left.png and /dev/null differ diff --git a/Output/Themes/Ambient/notes_bg_mid.png b/Output/Themes/Ambient/notes_bg_mid.png deleted file mode 100644 index 4161d17b..00000000 Binary files a/Output/Themes/Ambient/notes_bg_mid.png and /dev/null differ diff --git a/Output/Themes/Ambient/notes_bg_right.png b/Output/Themes/Ambient/notes_bg_right.png deleted file mode 100644 index fd3fb69a..00000000 Binary files a/Output/Themes/Ambient/notes_bg_right.png and /dev/null differ diff --git a/Output/Themes/Ambient/notes_left.png b/Output/Themes/Ambient/notes_left.png deleted file mode 100644 index 310c7e87..00000000 Binary files a/Output/Themes/Ambient/notes_left.png and /dev/null differ diff --git a/Output/Themes/Ambient/notes_mid.png b/Output/Themes/Ambient/notes_mid.png deleted file mode 100644 index ddf450c1..00000000 Binary files a/Output/Themes/Ambient/notes_mid.png and /dev/null differ diff --git a/Output/Themes/Ambient/notes_right.png b/Output/Themes/Ambient/notes_right.png deleted file mode 100644 index 681b4aa4..00000000 Binary files a/Output/Themes/Ambient/notes_right.png and /dev/null differ diff --git a/Output/Themes/Ambient/points_bar.png b/Output/Themes/Ambient/points_bar.png deleted file mode 100644 index e5032bc5..00000000 Binary files a/Output/Themes/Ambient/points_bar.png and /dev/null differ diff --git a/Output/Themes/Ambient/points_bar_bg.png b/Output/Themes/Ambient/points_bar_bg.png deleted file mode 100644 index 968860cb..00000000 Binary files a/Output/Themes/Ambient/points_bar_bg.png and /dev/null differ diff --git a/Output/Themes/Changelog/Changelog_ScreenSing.txt b/Output/Themes/Changelog/Changelog_ScreenSing.txt index dd1ef423..3d735b97 100644 --- a/Output/Themes/Changelog/Changelog_ScreenSing.txt +++ b/Output/Themes/Changelog/Changelog_ScreenSing.txt @@ -1,5 +1,15 @@ ScreenSing ++++++++++ +Version 8 + +Add: + + + + +Skins for separated note fill graphics + +++++++++ Version 7 diff --git a/Output/Themes/Changelog/Changelog_SkinSystem.txt b/Output/Themes/Changelog/Changelog_SkinSystem.txt index ce2085ae..41b5d672 100644 --- a/Output/Themes/Changelog/Changelog_SkinSystem.txt +++ b/Output/Themes/Changelog/Changelog_SkinSystem.txt @@ -12,9 +12,6 @@ Added videos: -++++++++++ - - ++++++++++ Version 2: diff --git a/Output/Themes/Changelog/Changelog_ThemeSystem.txt b/Output/Themes/Changelog/Changelog_ThemeSystem.txt index fceb7c3f..16b3e6b1 100644 --- a/Output/Themes/Changelog/Changelog_ThemeSystem.txt +++ b/Output/Themes/Changelog/Changelog_ThemeSystem.txt @@ -1,5 +1,14 @@ Theme System +++++++++++ +Version 6 +Added to : + + + + +Changed: +Graphics handling of notes - background, base and fill of notes will be layered on each other without any resizing differences between the textures. ++++++++++ Version 5 (yes it's still 5!): diff --git a/Output/Themes/Genius.xml b/Output/Themes/Genius.xml new file mode 100644 index 00000000..f560470f --- /dev/null +++ b/Output/Themes/Genius.xml @@ -0,0 +1,16 @@ + + + 6 + + Genius + Jiiniasu + 0 + 7 + + + Cursor + 32 + 32 + + + \ No newline at end of file diff --git a/Output/Themes/Ambient/Skin Blue.xml b/Output/Themes/Genius/01_Standard.xml similarity index 51% rename from Output/Themes/Ambient/Skin Blue.xml rename to Output/Themes/Genius/01_Standard.xml index b1ab5aa9..d0daa747 100644 --- a/Output/Themes/Ambient/Skin Blue.xml +++ b/Output/Themes/Genius/01_Standard.xml @@ -2,136 +2,160 @@ 4 - Blue - bohning + Standard + Jiiniasu 0 - 0 + 7 0.000 - 0.000 - 1.000 + 0.580 + 0.792 1.000 - 1.000 - 0.000 - 0.000 + 0.882 + 0.149 + 0.110 1.000 0.000 - 1.000 - 0.000 + 0.659 + 0.533 1.000 - 0.500 - 0.000 - 1.000 + 0.757 + 0.160 + 0.725 1.000 1.000 - 0.800 + 0.870 0.000 1.000 - 1.000 - 0.000 - 0.500 + 1.00 + 0.322 + 0.000 1.000 + + 0.980 + 0.980 + 0.980 + 0.200 + + + 1.000 + 1.000 + 1.000 + 1.000 + 0.000 0.000 - 0.750 + 0.000 1.000 + + 0.000 + 0.000 + 0.000 + 0.700 + - 0.675 - 0.890 - 0.969 + 0.980 + 0.980 + 0.980 1.000 - 0.675 - 0.890 - 0.969 - 0.500 + 0.980 + 0.980 + 0.980 + 0.700 - 0.675 - 0.890 - 0.969 - 0.600 + 0.882 + 0.149 + 0.110 + 0.700 - 0.675 + 0.890 0.890 - 0.969 + 0.890 0.300 - 0.675 + 0.890 0.890 - 0.969 + 0.890 1.000 - 0.675 - 0.890 - 0.969 - 0.500 + 0.690 + 0.690 + 0.690 + 0.700 - 0.675 + 0.890 0.890 - 0.969 + 0.890 1.000 - 0.675 + 0.890 0.890 - 0.969 - 1.000 + 0.890 + 0.500 - 0.675 + 0.890 0.890 - 0.969 - 0.500 + 0.890 + 0.700 - 0.675 + 0.890 0.890 - 0.969 - 0.500 + 0.890 + 1.000 - 0.675 + 0.890 0.890 - 0.969 + 0.890 0.300 - 0.675 + 0.890 0.890 - 0.969 + 0.890 1.000 - 0.675 - 0.890 - 0.969 - 0.500 + 0.980 + 0.980 + 0.980 + 1.000 + + 0.580 + 0.580 + 0.580 + 0.700 + - 0.675 - 0.890 - 0.969 + 0.980 + 0.980 + 0.980 1.000 @@ -166,48 +190,85 @@ 0.000 - 0.000 - 1.000 + 0.580 + 0.792 1.000 - - 0.000 - 0.000 - 0.000 + + 0.882 + 0.149 + 0.110 1.000 + + + 1.000 + 1.000 + 1.000 + 0.800 - 0.300 - 0.300 - 0.300 - 1.000 + 0.600 + 0.600 + 0.600 + 0.700 0.000 - 0.000 - 1.000 - 0.500 + 0.580 + 0.792 + 0.700 + + 0.882 + 0.149 + 0.110 + 0.700 + - 0.800 + 0.950 0.950 - 1.000 - 0.500 + 0.950 + 0.700 - 0.800 + 0.950 0.950 - 1.000 - 0.850 + 0.950 + 0.900 + + 1.000 + 1.000 + 1.000 + 0.900 + + + 1.000 + 1.000 + 1.000 + 0.200 + + + 1.000 + 1.000 + 1.000 + 0.700 + + + 1.000 + 1.000 + 1.000 + 0.700 + - [Blue]BG_Default.png - [Blue]BG_Options.png - Menu.png + BG_Default.png + BG_Default.png + BG_Loading.png + SongMenu.png CoverTile.png - CoverBackground.png + CoverTextBackground.png Cursor.png TimeBar.png TimeLine.png @@ -216,29 +277,28 @@ SelectSlidePlayer.png SelectSlideArrowLeft.png SelectSlideArrowRight.png - notes_left.png - notes_mid.png - notes_right.png - notes_bg_left.png - notes_bg_mid.png - notes_bg_right.png - points_bar.png - points_bar_bg.png - Lyrics.png + NotesLeft.png + NotesMid.png + NotesRight.png + NotesFillLeft.png + NotesFillMid.png + NotesFillRight.png + NotesBGLeft.png + NotesBGMid.png + NotesBGRight.png + PointsBar.png + PointsBarBG.png LyricHelper.png ToneHelper.png - TextBG.png Score.png Star.png - Snowflake.png SongMenu.png - PerfectNoteStar.png Pause.png EnergyBeam.png + SearchBar.png + PlaylistBG.png DuetIcon.png VideoIcon.png - VideoIconCO.png - VideoIconBG.png MedleyCalcIcon.png MedleyTagIcon.png PlayerSelector.png @@ -247,22 +307,28 @@ PlayIcon.png PauseIcon.png RepeatIcon.png - SongMenuBG.png Close.png - Delete.png - Save.png - Sing.png - Minus.png - Plus.png - Random.png - Popup.png + DeleteIcon.png + SaveIcon.png + SingIcon.png + MinusIcon.png + PlusIcon.png + VolUp.png + VolDown.png + RandomIcon.png + PopupBG.png ScrollUp.png ScrollDown.png + VocaluxeLogo.png + SongSelectButton.png + Warning.png + PlayerSelBG.png + CalibrationBG.png - [Blue]BG_Video.mp4 - [Blue]IntroIn.mp4 - [Blue]IntroMid.mp4 - [Blue]IntroOut.mp4 + BG_Video.mp4 + Introin.mp4 + IntroMid.mp4 + IntroOut.mp4 \ No newline at end of file diff --git a/Output/Themes/Genius/02_Ice_Blue.xml b/Output/Themes/Genius/02_Ice_Blue.xml new file mode 100644 index 00000000..c2d71ec4 --- /dev/null +++ b/Output/Themes/Genius/02_Ice_Blue.xml @@ -0,0 +1,334 @@ + + + 4 + + Ice Blue + Jiiniasu + 0 + 7 + + + + 0.000 + 0.580 + 0.792 + 1.000 + + + 0.882 + 0.149 + 0.110 + 1.000 + + + 0.000 + 0.659 + 0.533 + 1.000 + + + 0.757 + 0.160 + 0.725 + 1.000 + + + 1.000 + 0.870 + 0.000 + 1.000 + + + 1.00 + 0.322 + 0.000 + 1.000 + + + 0.647 + 0.949 + 0.953 + 0.200 + + + 1.000 + 1.000 + 1.000 + 1.000 + + + 0.000 + 0.000 + 0.000 + 1.000 + + + 0.000 + 0.000 + 0.000 + 0.700 + + + 0.647 + 0.949 + 0.953 + 1.000 + + + 0.647 + 0.949 + 0.953 + 0.700 + + + 0.882 + 0.149 + 0.110 + 0.700 + + + 0.647 + 0.949 + 0.953 + 0.300 + + + 0.647 + 0.949 + 0.953 + 1.000 + + + 0.655 + 0.737 + 0.745 + 0.700 + + + 0.855 + 0.937 + 0.945 + 1.000 + + + 0.647 + 0.949 + 0.953 + 0.500 + + + 0.647 + 0.949 + 0.953 + 0.700 + + + 0.647 + 0.949 + 0.953 + 1.000 + + + 0.647 + 0.949 + 0.953 + 0.300 + + + 0.647 + 0.949 + 0.953 + 1.000 + + + 0.855 + 0.937 + 0.945 + 1.000 + + + 0.455 + 0.537 + 0.545 + 0.700 + + + 0.855 + 0.937 + 0.945 + 1.000 + + + 1.000 + 0.000 + 0.000 + 1.000 + + + 0.000 + 0.000 + 0.000 + 1.000 + + + 1.000 + 1.000 + 1.000 + 1.000 + + + 1.000 + 1.000 + 1.000 + 1.000 + + + 1.000 + 1.000 + 1.000 + 0.000 + + + 0.000 + 0.580 + 0.792 + 1.000 + + + 0.882 + 0.149 + 0.110 + 1.000 + + + 1.000 + 1.000 + 1.000 + 0.800 + + + 0.600 + 0.600 + 0.600 + 0.700 + + + 0.000 + 0.580 + 0.792 + 0.700 + + + 0.882 + 0.149 + 0.110 + 0.700 + + + 0.855 + 0.937 + 0.945 + 0.700 + + + 0.647 + 0.949 + 0.953 + 0.900 + + + 0.855 + 0.937 + 0.945 + 0.900 + + + 0.647 + 0.949 + 0.953 + 0.200 + + + 1.000 + 1.000 + 1.000 + 0.700 + + + 0.855 + 0.937 + 0.945 + 0.700 + + + + BG_Default.png + BG_Default.png + BG_Loading.png + SongMenu.png + + CoverTile.png + CoverTextBackground.png + Cursor.png + TimeBar.png + TimeLine.png + Pointer.png + SelectSlide.png + SelectSlidePlayer.png + SelectSlideArrowLeft.png + SelectSlideArrowRight.png + NotesLeft.png + NotesMid.png + NotesRight.png + NotesFillLeft.png + NotesFillMid.png + NotesFillRight.png + NotesBGLeft.png + NotesBGMid.png + NotesBGRight.png + PointsBar.png + PointsBarBG.png + LyricHelper.png + ToneHelper.png + Score.png + Star.png + SongMenu.png + Pause.png + EnergyBeam.png + SearchBar.png + PlaylistBG.png + DuetIcon.png + VideoIcon.png + MedleyCalcIcon.png + MedleyTagIcon.png + PlayerSelector.png + PreviousIcon.png + NextIcon.png + PlayIcon.png + PauseIcon.png + RepeatIcon.png + Close.png + DeleteIcon.png + SaveIcon.png + SingIcon.png + MinusIcon.png + PlusIcon.png + VolUp.png + VolDown.png + RandomIcon.png + PopupBG.png + ScrollUp.png + ScrollDown.png + VocaluxeLogo.png + SongSelectButton.png + Warning.png + PlayerSelBG.png + CalibrationBG.png + + + BG_Video.mp4 + Introin.mp4 + IntroMid.mp4 + IntroOut.mp4 + + \ No newline at end of file diff --git a/Output/Themes/Genius/03_Crimson_Red.xml b/Output/Themes/Genius/03_Crimson_Red.xml new file mode 100644 index 00000000..87f0b965 --- /dev/null +++ b/Output/Themes/Genius/03_Crimson_Red.xml @@ -0,0 +1,334 @@ + + + 4 + + Crimson Red + Jiiniasu + 0 + 7 + + + + 0.000 + 0.580 + 0.792 + 1.000 + + + 0.882 + 0.149 + 0.110 + 1.000 + + + 0.000 + 0.659 + 0.533 + 1.000 + + + 0.757 + 0.160 + 0.725 + 1.000 + + + 1.000 + 0.870 + 0.000 + 1.000 + + + 1.00 + 0.322 + 0.000 + 1.000 + + + 0.690 + 0.203 + 0.302 + 0.200 + + + 1.000 + 1.000 + 1.000 + 1.000 + + + 0.000 + 0.000 + 0.000 + 1.000 + + + 0.000 + 0.000 + 0.000 + 0.700 + + + 0.690 + 0.203 + 0.302 + 1.000 + + + 0.690 + 0.203 + 0.302 + 0.700 + + + 0.882 + 0.149 + 0.110 + 0.700 + + + 0.690 + 0.203 + 0.302 + 0.300 + + + 0.690 + 0.203 + 0.302 + 1.000 + + + 0.788 + 0.482 + 0.533 + 0.700 + + + 0.988 + 0.682 + 0.733 + 1.000 + + + 0.690 + 0.203 + 0.302 + 0.500 + + + 0.690 + 0.203 + 0.302 + 0.700 + + + 0.690 + 0.203 + 0.302 + 1.000 + + + 0.690 + 0.203 + 0.302 + 0.300 + + + 0.690 + 0.203 + 0.302 + 1.000 + + + 0.988 + 0.682 + 0.733 + 1.000 + + + 0.588 + 0.282 + 0.333 + 0.700 + + + 0.988 + 0.682 + 0.733 + 1.000 + + + 1.000 + 0.000 + 0.000 + 1.000 + + + 0.000 + 0.000 + 0.000 + 1.000 + + + 1.000 + 1.000 + 1.000 + 1.000 + + + 1.000 + 1.000 + 1.000 + 1.000 + + + 1.000 + 1.000 + 1.000 + 0.000 + + + 0.882 + 0.149 + 0.110 + 1.000 + + + 0.000 + 0.580 + 0.792 + 1.000 + + + 1.000 + 1.000 + 1.000 + 0.800 + + + 0.600 + 0.600 + 0.600 + 0.700 + + + 0.882 + 0.149 + 0.110 + 0.700 + + + 0.000 + 0.580 + 0.792 + 0.700 + + + 0.950 + 0.950 + 0.950 + 0.700 + + + 0.690 + 0.203 + 0.302 + 0.900 + + + 0.988 + 0.682 + 0.733 + 0.900 + + + 0.678 + 0.110 + 0.259 + 0.200 + + + 1.000 + 1.000 + 1.000 + 0.700 + + + 0.988 + 0.682 + 0.733 + 0.700 + + + + BG_Default.png + BG_Default.png + BG_Loading.png + SongMenu.png + + CoverTile.png + CoverTextBackground.png + Cursor.png + TimeBar.png + TimeLine.png + Pointer.png + SelectSlide.png + SelectSlidePlayer.png + SelectSlideArrowLeft.png + SelectSlideArrowRight.png + NotesLeft.png + NotesMid.png + NotesRight.png + NotesFillLeft.png + NotesFillMid.png + NotesFillRight.png + NotesBGLeft.png + NotesBGMid.png + NotesBGRight.png + PointsBar.png + PointsBarBG.png + LyricHelper.png + ToneHelper.png + Score.png + Star.png + SongMenu.png + Pause.png + EnergyBeam.png + SearchBar.png + PlaylistBG.png + DuetIcon.png + VideoIcon.png + MedleyCalcIcon.png + MedleyTagIcon.png + PlayerSelector.png + PreviousIcon.png + NextIcon.png + PlayIcon.png + PauseIcon.png + RepeatIcon.png + Close.png + DeleteIcon.png + SaveIcon.png + SingIcon.png + MinusIcon.png + PlusIcon.png + VolUp.png + VolDown.png + RandomIcon.png + PopupBG.png + ScrollUp.png + ScrollDown.png + VocaluxeLogo.png + SongSelectButton.png + Warning.png + PlayerSelBG.png + CalibrationBG.png + + + BG_Video.mp4 + Introin.mp4 + IntroMid.mp4 + IntroOut.mp4 + + \ No newline at end of file diff --git a/Output/Themes/Genius/BG_Default.png b/Output/Themes/Genius/BG_Default.png new file mode 100644 index 00000000..3ab2750a Binary files /dev/null and b/Output/Themes/Genius/BG_Default.png differ diff --git a/Output/Themes/Genius/BG_Loading.png b/Output/Themes/Genius/BG_Loading.png new file mode 100644 index 00000000..8f6eeb16 Binary files /dev/null and b/Output/Themes/Genius/BG_Loading.png differ diff --git a/Output/Themes/Genius/Button.png b/Output/Themes/Genius/Button.png new file mode 100644 index 00000000..ae6003ea Binary files /dev/null and b/Output/Themes/Genius/Button.png differ diff --git a/Output/Themes/Genius/CalibrationBG.png b/Output/Themes/Genius/CalibrationBG.png new file mode 100644 index 00000000..cc95bda2 Binary files /dev/null and b/Output/Themes/Genius/CalibrationBG.png differ diff --git a/Output/Themes/Genius/Close.png b/Output/Themes/Genius/Close.png new file mode 100644 index 00000000..07515397 Binary files /dev/null and b/Output/Themes/Genius/Close.png differ diff --git a/Output/Themes/Genius/CoverTextBackground.png b/Output/Themes/Genius/CoverTextBackground.png new file mode 100644 index 00000000..8b3a7db4 Binary files /dev/null and b/Output/Themes/Genius/CoverTextBackground.png differ diff --git a/Output/Themes/Ambient/CoverTile.png b/Output/Themes/Genius/CoverTile.png similarity index 100% rename from Output/Themes/Ambient/CoverTile.png rename to Output/Themes/Genius/CoverTile.png diff --git a/Output/Themes/Genius/Cursor.png b/Output/Themes/Genius/Cursor.png new file mode 100644 index 00000000..55069a35 Binary files /dev/null and b/Output/Themes/Genius/Cursor.png differ diff --git a/Output/Themes/Genius/DeleteIcon.png b/Output/Themes/Genius/DeleteIcon.png new file mode 100644 index 00000000..20dd7fe3 Binary files /dev/null and b/Output/Themes/Genius/DeleteIcon.png differ diff --git a/Output/Themes/Genius/DuetIcon.png b/Output/Themes/Genius/DuetIcon.png new file mode 100644 index 00000000..016d1987 Binary files /dev/null and b/Output/Themes/Genius/DuetIcon.png differ diff --git a/Output/Themes/Genius/EnergyBeam.png b/Output/Themes/Genius/EnergyBeam.png new file mode 100644 index 00000000..72927f3d Binary files /dev/null and b/Output/Themes/Genius/EnergyBeam.png differ diff --git a/Output/Themes/Genius/LyricHelper.png b/Output/Themes/Genius/LyricHelper.png new file mode 100644 index 00000000..be09c707 Binary files /dev/null and b/Output/Themes/Genius/LyricHelper.png differ diff --git a/Output/Themes/Genius/MedleyCalcIcon.png b/Output/Themes/Genius/MedleyCalcIcon.png new file mode 100644 index 00000000..c861e369 Binary files /dev/null and b/Output/Themes/Genius/MedleyCalcIcon.png differ diff --git a/Output/Themes/Genius/MedleyTagIcon.png b/Output/Themes/Genius/MedleyTagIcon.png new file mode 100644 index 00000000..e434ffec Binary files /dev/null and b/Output/Themes/Genius/MedleyTagIcon.png differ diff --git a/Output/Themes/Genius/MinusIcon.png b/Output/Themes/Genius/MinusIcon.png new file mode 100644 index 00000000..bc2c6fdc Binary files /dev/null and b/Output/Themes/Genius/MinusIcon.png differ diff --git a/Output/Themes/Genius/NextIcon.png b/Output/Themes/Genius/NextIcon.png new file mode 100644 index 00000000..4ea3a217 Binary files /dev/null and b/Output/Themes/Genius/NextIcon.png differ diff --git a/Output/Themes/Genius/NotesBGLeft.png b/Output/Themes/Genius/NotesBGLeft.png new file mode 100644 index 00000000..0c321303 Binary files /dev/null and b/Output/Themes/Genius/NotesBGLeft.png differ diff --git a/Output/Themes/Genius/NotesBGMid.png b/Output/Themes/Genius/NotesBGMid.png new file mode 100644 index 00000000..989fa118 Binary files /dev/null and b/Output/Themes/Genius/NotesBGMid.png differ diff --git a/Output/Themes/Genius/NotesBGRight.png b/Output/Themes/Genius/NotesBGRight.png new file mode 100644 index 00000000..4d3b8238 Binary files /dev/null and b/Output/Themes/Genius/NotesBGRight.png differ diff --git a/Output/Themes/Genius/NotesFillLeft.png b/Output/Themes/Genius/NotesFillLeft.png new file mode 100644 index 00000000..732b0313 Binary files /dev/null and b/Output/Themes/Genius/NotesFillLeft.png differ diff --git a/Output/Themes/Genius/NotesFillMid.png b/Output/Themes/Genius/NotesFillMid.png new file mode 100644 index 00000000..172b394a Binary files /dev/null and b/Output/Themes/Genius/NotesFillMid.png differ diff --git a/Output/Themes/Genius/NotesFillRight.png b/Output/Themes/Genius/NotesFillRight.png new file mode 100644 index 00000000..2a0c56b4 Binary files /dev/null and b/Output/Themes/Genius/NotesFillRight.png differ diff --git a/Output/Themes/Genius/NotesLeft.png b/Output/Themes/Genius/NotesLeft.png new file mode 100644 index 00000000..ee6365d9 Binary files /dev/null and b/Output/Themes/Genius/NotesLeft.png differ diff --git a/Output/Themes/Genius/NotesMid.png b/Output/Themes/Genius/NotesMid.png new file mode 100644 index 00000000..42146d41 Binary files /dev/null and b/Output/Themes/Genius/NotesMid.png differ diff --git a/Output/Themes/Genius/NotesRight.png b/Output/Themes/Genius/NotesRight.png new file mode 100644 index 00000000..0de874d0 Binary files /dev/null and b/Output/Themes/Genius/NotesRight.png differ diff --git a/Output/Themes/Genius/Pause.png b/Output/Themes/Genius/Pause.png new file mode 100644 index 00000000..2ea49e27 Binary files /dev/null and b/Output/Themes/Genius/Pause.png differ diff --git a/Output/Themes/Genius/PauseIcon.png b/Output/Themes/Genius/PauseIcon.png new file mode 100644 index 00000000..8cfb6723 Binary files /dev/null and b/Output/Themes/Genius/PauseIcon.png differ diff --git a/Output/Themes/Genius/PlayIcon.png b/Output/Themes/Genius/PlayIcon.png new file mode 100644 index 00000000..d1467b3f Binary files /dev/null and b/Output/Themes/Genius/PlayIcon.png differ diff --git a/Output/Themes/Genius/PlayerSelBG.png b/Output/Themes/Genius/PlayerSelBG.png new file mode 100644 index 00000000..b8535a6c Binary files /dev/null and b/Output/Themes/Genius/PlayerSelBG.png differ diff --git a/Output/Themes/Genius/PlayerSelector.png b/Output/Themes/Genius/PlayerSelector.png new file mode 100644 index 00000000..52c64145 Binary files /dev/null and b/Output/Themes/Genius/PlayerSelector.png differ diff --git a/Output/Themes/Genius/PlaylistBG.png b/Output/Themes/Genius/PlaylistBG.png new file mode 100644 index 00000000..50ccfb84 Binary files /dev/null and b/Output/Themes/Genius/PlaylistBG.png differ diff --git a/Output/Themes/Genius/PlusIcon.png b/Output/Themes/Genius/PlusIcon.png new file mode 100644 index 00000000..5f63c725 Binary files /dev/null and b/Output/Themes/Genius/PlusIcon.png differ diff --git a/Output/Themes/Ambient/Pointer.png b/Output/Themes/Genius/Pointer.png similarity index 100% rename from Output/Themes/Ambient/Pointer.png rename to Output/Themes/Genius/Pointer.png diff --git a/Output/Themes/Genius/PointsBar.png b/Output/Themes/Genius/PointsBar.png new file mode 100644 index 00000000..696f0192 Binary files /dev/null and b/Output/Themes/Genius/PointsBar.png differ diff --git a/Output/Themes/Genius/PointsBarBG.png b/Output/Themes/Genius/PointsBarBG.png new file mode 100644 index 00000000..153eaff2 Binary files /dev/null and b/Output/Themes/Genius/PointsBarBG.png differ diff --git a/Output/Themes/Genius/PopupBG.png b/Output/Themes/Genius/PopupBG.png new file mode 100644 index 00000000..387e33c9 Binary files /dev/null and b/Output/Themes/Genius/PopupBG.png differ diff --git a/Output/Themes/Genius/PreviousIcon.png b/Output/Themes/Genius/PreviousIcon.png new file mode 100644 index 00000000..df72a9d8 Binary files /dev/null and b/Output/Themes/Genius/PreviousIcon.png differ diff --git a/Output/Themes/Genius/RandomIcon.png b/Output/Themes/Genius/RandomIcon.png new file mode 100644 index 00000000..995270fb Binary files /dev/null and b/Output/Themes/Genius/RandomIcon.png differ diff --git a/Output/Themes/Genius/RepeatIcon.png b/Output/Themes/Genius/RepeatIcon.png new file mode 100644 index 00000000..d22dc60f Binary files /dev/null and b/Output/Themes/Genius/RepeatIcon.png differ diff --git a/Output/Themes/Genius/SaveIcon.png b/Output/Themes/Genius/SaveIcon.png new file mode 100644 index 00000000..9d9c2435 Binary files /dev/null and b/Output/Themes/Genius/SaveIcon.png differ diff --git a/Output/Themes/Genius/Score.png b/Output/Themes/Genius/Score.png new file mode 100644 index 00000000..32114cf5 Binary files /dev/null and b/Output/Themes/Genius/Score.png differ diff --git a/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml b/Output/Themes/Genius/Screens/PopupScreenPlayerControl.xml similarity index 79% rename from Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml rename to Output/Themes/Genius/Screens/PopupScreenPlayerControl.xml index f4300e82..1e40bbd6 100644 --- a/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml +++ b/Output/Themes/Genius/Screens/PopupScreenPlayerControl.xml @@ -7,38 +7,38 @@ - Menu - + + - 49 + 0 0 - 1181 - 42 - 0 + 1280 + 40 + -1 CoverBackground - + 55 2 38 38 - 0 + -2 - 410 + 640 8 - 0 + -2 27 769 - + - Left + Center Center Outline @@ -50,18 +50,18 @@ PlayIcon PlayIcon - 146 - 8 - 28 - 28 - 0 + 41 + 5 + 30 + 30 + -2 75 2 - 0 + -2 32 142 @@ -77,18 +77,18 @@ PauseIcon PauseIcon - 145 - 8 - 28 - 28 - 0 + 41 + 5 + 30 + 30 + -2 75 2 - 0 + -2 32 142 @@ -104,18 +104,18 @@ PreviousIcon PreviousIcon - 100 - 2 - 38 - 38 - 0 + 10 + 7 + 26 + 26 + -2 75 2 - 0 + -2 32 142 @@ -131,18 +131,18 @@ NextIcon NextIcon - 185 - 2 - 38 - 38 - 0 + 76 + 7 + 26 + 26 + -2 190 25 - 0 + -2 32 142 @@ -158,18 +158,18 @@ RepeatIcon RepeatIcon - 225 - 2 - 38 - 38 - 0 + 112 + 10 + 20 + 20 + -2 405 25 - 0 + -2 32 142 @@ -182,21 +182,21 @@