Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into NamesScroll

Browse Source
This commit is contained in:
Florian Küpper authored and GitHub committed 2017-11-27 20:45:24 +01:00
2 parents bbe58f764c 709d517772
commit 82e7c0a5a6
9 files changed
+1102 -952
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Languages/English.xml
+2
View File
@@ -156,6 +156,8 @@
<string name="TR_SCREENSING_BUTTON_CANCEL">Stop singing</string>
<string name="TR_SCREENSING_BUTTON_CONTINUE">Continue</string>
<string name="TR_SCREENSING_BUTTON_SKIP">Skip this song</string>
<string name="TR_SCREENSING_BUTTON_RESTART_ROUND">Restart round</string>
<string name="TR_SCREENSING_BUTTON_RESTART_GAME">Restart game</string>
<string name="TR_SCREENSCORE_SCORES">Scores</string>
<string name="TR_SCREENSCORE_RATING">Rating</string>
<string name="TR_SCREENSCORE_POINTS">Points</string>
Output/Themes/Changelog/Changelog_ScreenSing.txt
+3 -1
View File
@@ -4,7 +4,9 @@ ScreenSing
Version 9
Add:
<StaticRatingBar$P$N$>
<ProgressBarRatingP$N$>
<ButtonRestartRound>
<ButtonRestartGame>
+++++++++
Version 8
Output/Themes/Genius/01_Standard.xml
+7 -1
View File
@@ -296,6 +296,12 @@
<B>0.027</B>
<A>1.000</A>
</RatingPerfect>
<TextPauseColor>
<R>1.000</R>
<G>1.000</G>
<B>1.000</B>
<A>0.900</A>
</TextPauseColor>
</Colors>
<Skins>
<BG_Default>BG_Default.png</BG_Default>
@@ -329,7 +335,7 @@
<Score>Score.png</Score>
<Star>Star.png</Star>
<SongMenu>SongMenu.png</SongMenu>
<PauseBG>Pause.png</PauseBG>
<PauseBG>PauseBG.png</PauseBG>
<EnergyBeam>EnergyBeam.png</EnergyBeam>
<SearchBar>SearchBar.png</SearchBar>
<PlaylistBG>PlaylistBG.png</PlaylistBG>
Output/Themes/Genius/02_Ice_Blue.xml
+7 -1
View File
@@ -296,6 +296,12 @@
<B>0.027</B>
<A>1.000</A>
</RatingPerfect>
<TextPauseColor>
<R>1.000</R>
<G>1.000</G>
<B>1.000</B>
<A>0.900</A>
</TextPauseColor>
</Colors>
<Skins>
<BG_Default>BG_Default.png</BG_Default>
@@ -329,7 +335,7 @@
<Score>Score.png</Score>
<Star>Star.png</Star>
<SongMenu>SongMenu.png</SongMenu>
<PauseBG>Pause.png</PauseBG>
<PauseBG>PauseBG.png</PauseBG>
<EnergyBeam>EnergyBeam.png</EnergyBeam>
<SearchBar>SearchBar.png</SearchBar>
<PlaylistBG>PlaylistBG.png</PlaylistBG>
Output/Themes/Genius/03_Crimson_Red.xml
+7 -1
View File
@@ -296,6 +296,12 @@
<B>0.027</B>
<A>1.000</A>
</RatingPerfect>
<TextPauseColor>
<R>1.000</R>
<G>1.000</G>
<B>1.000</B>
<A>0.900</A>
</TextPauseColor>
</Colors>
<Skins>
<BG_Default>BG_Default.png</BG_Default>
@@ -329,7 +335,7 @@
<Score>Score.png</Score>
<Star>Star.png</Star>
<SongMenu>SongMenu.png</SongMenu>
<PauseBG>Pause.png</PauseBG>
<PauseBG>PauseBG.png</PauseBG>
<EnergyBeam>EnergyBeam.png</EnergyBeam>
<SearchBar>SearchBar.png</SearchBar>
<PlaylistBG>PlaylistBG.png</PlaylistBG>
Output/Themes/Genius/Pause.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 114 KiB

Output/Themes/Genius/PauseBG.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

Output/Themes/Genius/Screens/ScreenSing.xml
+79 -9
View File
@@ -657,11 +657,11 @@
<Text /></Text>
<Text Name="TextPause">
<X>640</X>
<Y>350</Y>
<Y>450</Y>
<Z>-2.11</Z>
<H>40</H>
<H>100</H>
<MaxW>0</MaxW>
<Color Name="TextColor" />
<Color Name="TextPauseColor" />
<SelColor Name="TextSelColor" />
<Align>Center</Align>
<ResizeAlign>Center</ResizeAlign>
@@ -1302,8 +1302,8 @@
<Skin>Button</Skin>
<SkinSelected>Button</SkinSelected>
<Rect>
<X>775</X>
<Y>450</Y>
<X>985</X>
<Y>600</Y>
<W>150</W>
<H>50</H>
<Z>-2.11</Z>
@@ -1337,8 +1337,8 @@
<Skin>Button</Skin>
<SkinSelected>Button</SkinSelected>
<Rect>
<X>355</X>
<Y>450</Y>
<X>145</X>
<Y>600</Y>
<W>150</W>
<H>50</H>
<Z>-2.11</Z>
@@ -1372,8 +1372,8 @@
<Skin>Button</Skin>
<SkinSelected>Button</SkinSelected>
<Rect>
<X>565</X>
<Y>450</Y>
<X>355</X>
<Y>600</Y>
<W>150</W>
<H>50</H>
<Z>-2.11</Z>
@@ -1403,6 +1403,76 @@
<Space>10</Space>
</SelReflection>
</Button>
<Button Name="ButtonRestartRound">
<Skin>Button</Skin>
<SkinSelected>Button</SkinSelected>
<Rect>
<X>775</X>
<Y>600</Y>
<W>150</W>
<H>50</H>
<Z>-2.11</Z>
</Rect>
<Color Name="ButtonColor" />
<SelColor Name="ButtonSelColor" />
<Text Name="Text">
<X>75</X>
<Y>12</Y>
<Z>0</Z>
<H>27</H>
<MaxW>142</MaxW>
<Color Name="ButtonTextColor" />
<SelColor Name="ButtonTextSelColor" />
<Align>Center</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENSING_BUTTON_RESTART_ROUND</Text>
</Text>
<Reflection>
<Height>26</Height>
<Space>10</Space>
</Reflection>
<SelReflection>
<Height>26</Height>
<Space>10</Space>
</SelReflection>
</Button>
<Button Name="ButtonRestartGame">
<Skin>Button</Skin>
<SkinSelected>Button</SkinSelected>
<Rect>
<X>565</X>
<Y>600</Y>
<W>150</W>
<H>50</H>
<Z>-2.11</Z>
</Rect>
<Color Name="ButtonColor" />
<SelColor Name="ButtonSelColor" />
<Text Name="Text">
<X>75</X>
<Y>12</Y>
<Z>0</Z>
<H>27</H>
<MaxW>142</MaxW>
<Color Name="ButtonTextColor" />
<SelColor Name="ButtonTextSelColor" />
<Align>Center</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENSING_BUTTON_RESTART_GAME</Text>
</Text>
<Reflection>
<Height>26</Height>
<Space>10</Space>
</Reflection>
<SelReflection>
<Height>26</Height>
<Space>10</Space>
</SelReflection>
</Button>
</Buttons>
<SongMenus />
<Lyrics>
Vocaluxe/Screens/CScreenSing.cs
+997 -939
View File
File diff suppressed because it is too large. Load diff