Merge branch 'develop' into vocaluxe-2024-design-marwin89

This commit is contained in:
Marwin authored and GitHub committed 2023-12-31 13:53:41 +01:00
commit d3a85dc528
90 files changed
+1281 -292

No files matched your search

+10
View File
@@ -328,6 +328,15 @@
<NoteBackgroundLeft>NotesBGLeft.png</NoteBackgroundLeft>
<NoteBackgroundMiddle>NotesBGMid.png</NoteBackgroundMiddle>
<NoteBackgroundRight>NotesBGRight.png</NoteBackgroundRight>
<RapNoteLeft>RapNotesLeft.png</RapNoteLeft>
<RapNoteMiddle>RapNotesMid.png</RapNoteMiddle>
<RapNoteRight>RapNotesRight.png</RapNoteRight>
<RapNoteFillLeft>RapNotesFillLeft.png</RapNoteFillLeft>
<RapNoteFillMiddle>RapNotesFillMid.png</RapNoteFillMiddle>
<RapNoteFillRight>RapNotesFillRight.png</RapNoteFillRight>
<RapNoteBackgroundLeft>RapNotesBGLeft.png</RapNoteBackgroundLeft>
<RapNoteBackgroundMiddle>RapNotesBGMid.png</RapNoteBackgroundMiddle>
<RapNoteBackgroundRight>RapNotesBGRight.png</RapNoteBackgroundRight>
<PointsBar>PointsBar.png</PointsBar>
<PointsBarBG>PointsBarBG.png</PointsBarBG>
<LyricHelper>LyricHelper.png</LyricHelper>
@@ -340,6 +349,7 @@
<SearchBar>SearchBar.png</SearchBar>
<PlaylistBG>PlaylistBG.png</PlaylistBG>
<DuetIcon>DuetIcon.png</DuetIcon>
<RapIcon>RapIcon.png</RapIcon>
<VideoIcon>VideoIcon.png</VideoIcon>
<MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
<MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
+10
View File
@@ -328,6 +328,15 @@
<NoteBackgroundLeft>NotesBGLeft.png</NoteBackgroundLeft>
<NoteBackgroundMiddle>NotesBGMid.png</NoteBackgroundMiddle>
<NoteBackgroundRight>NotesBGRight.png</NoteBackgroundRight>
<RapNoteLeft>RapNotesLeft.png</RapNoteLeft>
<RapNoteMiddle>RapNotesMid.png</RapNoteMiddle>
<RapNoteRight>RapNotesRight.png</RapNoteRight>
<RapNoteFillLeft>RapNotesFillLeft.png</RapNoteFillLeft>
<RapNoteFillMiddle>RapNotesFillMid.png</RapNoteFillMiddle>
<RapNoteFillRight>RapNotesFillRight.png</RapNoteFillRight>
<RapNoteBackgroundLeft>RapNotesBGLeft.png</RapNoteBackgroundLeft>
<RapNoteBackgroundMiddle>RapNotesBGMid.png</RapNoteBackgroundMiddle>
<RapNoteBackgroundRight>RapNotesBGRight.png</RapNoteBackgroundRight>
<PointsBar>PointsBar.png</PointsBar>
<PointsBarBG>PointsBarBG.png</PointsBarBG>
<LyricHelper>LyricHelper.png</LyricHelper>
@@ -340,6 +349,7 @@
<SearchBar>SearchBar.png</SearchBar>
<PlaylistBG>PlaylistBG.png</PlaylistBG>
<DuetIcon>DuetIcon.png</DuetIcon>
<RapIcon>RapIcon.png</RapIcon>
<VideoIcon>VideoIcon.png</VideoIcon>
<MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
<MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
+10
View File
@@ -328,6 +328,15 @@
<NoteBackgroundLeft>NotesBGLeft.png</NoteBackgroundLeft>
<NoteBackgroundMiddle>NotesBGMid.png</NoteBackgroundMiddle>
<NoteBackgroundRight>NotesBGRight.png</NoteBackgroundRight>
<RapNoteLeft>RapNotesLeft.png</RapNoteLeft>
<RapNoteMiddle>RapNotesMid.png</RapNoteMiddle>
<RapNoteRight>RapNotesRight.png</RapNoteRight>
<RapNoteFillLeft>RapNotesFillLeft.png</RapNoteFillLeft>
<RapNoteFillMiddle>RapNotesFillMid.png</RapNoteFillMiddle>
<RapNoteFillRight>RapNotesFillRight.png</RapNoteFillRight>
<RapNoteBackgroundLeft>RapNotesBGLeft.png</RapNoteBackgroundLeft>
<RapNoteBackgroundMiddle>RapNotesBGMid.png</RapNoteBackgroundMiddle>
<RapNoteBackgroundRight>RapNotesBGRight.png</RapNoteBackgroundRight>
<PointsBar>PointsBar.png</PointsBar>
<PointsBarBG>PointsBarBG.png</PointsBarBG>
<LyricHelper>LyricHelper.png</LyricHelper>
@@ -340,6 +349,7 @@
<SearchBar>SearchBar.png</SearchBar>
<PlaylistBG>PlaylistBG.png</PlaylistBG>
<DuetIcon>DuetIcon.png</DuetIcon>
<RapIcon>RapIcon.png</RapIcon>
<VideoIcon>VideoIcon.png</VideoIcon>
<MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
<MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

+24 -1
View File
@@ -2,7 +2,7 @@
<Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Informations>
<ScreenName>ScreenSing</ScreenName>
<ScreenVersion>10</ScreenVersion>
<ScreenVersion>11</ScreenVersion>
</Informations>
<Backgrounds>
<Background Name="Background1">
@@ -694,6 +694,20 @@
<Font>Outline</Font>
<Text>TR_SCREENSING_PAUSE</Text>
</Text>
<Text Name="TextPauseSongName">
<X>640</X>
<Y>10</Y>
<Z>-2.11</Z>
<H>40</H>
<MaxW>0</MaxW>
<Color Name="White" />
<SelColor Name="White" />
<Align>Center</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Normal</Font>
<Text></Text>
</Text>
<Text Name="TextDuetName1">
<X>10</X>
<Y>55</Y>
@@ -1580,6 +1594,15 @@
<SkinBackgroundLeft>NoteBackgroundLeft</SkinBackgroundLeft>
<SkinBackgroundMiddle>NoteBackgroundMiddle</SkinBackgroundMiddle>
<SkinBackgroundRight>NoteBackgroundRight</SkinBackgroundRight>
<SkinRapLeft>RapNoteLeft</SkinRapLeft>
<SkinRapMiddle>RapNoteMiddle</SkinRapMiddle>
<SkinRapRight>RapNoteRight</SkinRapRight>
<SkinRapFillLeft>RapNoteFillLeft</SkinRapFillLeft>
<SkinRapFillMiddle>RapNoteFillMiddle</SkinRapFillMiddle>
<SkinRapFillRight>RapNoteFillRight</SkinRapFillRight>
<SkinRapBackgroundLeft>RapNoteBackgroundLeft</SkinRapBackgroundLeft>
<SkinRapBackgroundMiddle>RapNoteBackgroundMiddle</SkinRapBackgroundMiddle>
<SkinRapBackgroundRight>RapNoteBackgroundRight</SkinRapBackgroundRight>
<SkinGoldenStar>Star</SkinGoldenStar>
<SkinToneHelper>ToneHelper</SkinToneHelper>
<SkinPerfectNoteStart>Star</SkinPerfectNoteStart>
+31 -8
View File
@@ -846,6 +846,7 @@
<CoverBackground>CoverTile</CoverBackground>
<CoverBigBackground />
<DuetIcon>DuetIcon</DuetIcon>
<RapIcon>RapIcon</RapIcon>
<VideoIcon>VideoIcon</VideoIcon>
<MedleyCalcIcon>MedleyCalcIcon</MedleyCalcIcon>
<MedleyTagIcon>MedleyTagIcon</MedleyTagIcon>
@@ -958,18 +959,29 @@
<Skin>DuetIcon</Skin>
<Color Name="StaticColor" />
<Rect>
<X>200</X>
<X>160</X>
<Y>530</Y>
<W>40</W>
<H>40</H>
<Z>-1</Z>
</Rect>
</StaticDuetIcon>
<StaticRapIcon Name="StaticRapIcon">
<Skin>RapIcon</Skin>
<Color Name="StaticColor" />
<Rect>
<X>240</X>
<Y>530</Y>
<W>40</W>
<H>40</H>
<Z>-1</Z>
</Rect>
</StaticRapIcon>
<StaticVideoIcon Name="StaticVideoIcon">
<Skin>VideoIcon</Skin>
<Color Name="StaticColor" />
<Rect>
<X>120</X>
<X>80</X>
<Y>530</Y>
<W>40</W>
<H>40</H>
@@ -980,7 +992,7 @@
<Skin>MedleyCalcIcon</Skin>
<Color Name="StaticColor" />
<Rect>
<X>280</X>
<X>320</X>
<Y>530</Y>
<W>40</W>
<H>40</H>
@@ -991,7 +1003,7 @@
<Skin>MedleyTagIcon</Skin>
<Color Name="StaticColor" />
<Rect>
<X>280</X>
<X>320</X>
<Y>530</Y>
<W>40</W>
<H>40</H>
@@ -1099,18 +1111,29 @@
<Skin>DuetIcon</Skin>
<Color Name="StaticColor" />
<Rect>
<X>200</X>
<X>160</X>
<Y>530</Y>
<W>40</W>
<H>40</H>
<Z>-1</Z>
</Rect>
</StaticDuetIcon>
<StaticRapIcon Name="StaticRapIcon">
<Skin>RapIcon</Skin>
<Color Name="StaticColor" />
<Rect>
<X>240</X>
<Y>530</Y>
<W>40</W>
<H>40</H>
<Z>-1</Z>
</Rect>
</StaticRapIcon>
<StaticVideoIcon Name="StaticVideoIcon">
<Skin>VideoIcon</Skin>
<Color Name="TextColor" />
<Rect>
<X>120</X>
<X>80</X>
<Y>530</Y>
<W>40</W>
<H>40</H>
@@ -1121,7 +1144,7 @@
<Skin>MedleyCalcIcon</Skin>
<Color Name="TextColor" />
<Rect>
<X>280</X>
<X>320</X>
<Y>530</Y>
<W>40</W>
<H>40</H>
@@ -1132,7 +1155,7 @@
<Skin>MedleyTagIcon</Skin>
<Color Name="StaticColor" />
<Rect>
<X>280</X>
<X>320</X>
<Y>530</Y>
<W>40</W>
<H>40</H>