Merge remote-tracking branch 'upstream/develop' into medley
This commit is contained in:
commit
07bad380a3
81 files changed
+9135
-970
No files matched your search
@@ -0,0 +1,22 @@
|
||||
SceenNames
|
||||
|
||||
++++++++++
|
||||
Version 2:
|
||||
|
||||
Add:
|
||||
<NameSelection>
|
||||
A new Theme-element for name-selecting.
|
||||
|
||||
<StaticPlayer[1...6]> (One Static for each player): Static wich is used as drop-area
|
||||
<StaticPlayerAvatar[1...6]> (One Static for each player): Static wich shows the avatar of selected player
|
||||
<TextPlayer[1...6]> (One Text for each player): Text wich shows name of selected player
|
||||
<SelectSlidePlayerNumber>
|
||||
<StaticWarningProfiles>
|
||||
<TextWarningProfiles>
|
||||
|
||||
Rename:
|
||||
<StaticWarning> to <StaticWarningMics>
|
||||
<TextWarning> to <TextWarningMics>
|
||||
|
||||
Remove:
|
||||
<Button1Player>, <Button2Player>, <Button3Player>, <SelectSlidePlayerMic1>, <SelectSlidePlayerMic2>, <SelectSlidePlayerMic3>
|
||||
@@ -1,5 +1,12 @@
|
||||
ScreenOptionsTheme
|
||||
|
||||
++++++++++
|
||||
Version 3:
|
||||
|
||||
Add:
|
||||
<SelectSlideFadeInfo>
|
||||
and some texts and statics for description (Text9 and Static9)
|
||||
"TR_SCREENOTHEME_FADEINFO"
|
||||
++++++++++
|
||||
Version 2:
|
||||
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
ScreenOptionsTheme
|
||||
|
||||
++++++++++
|
||||
Version 2:
|
||||
|
||||
Add:
|
||||
<SelectSlideVideosToBackground>
|
||||
and some texts and statics for description (Text5)
|
||||
"TR_SCREENO_VIDEO_VIDEOSTOBACKGROUND"
|
||||
++++++++++
|
||||
@@ -0,0 +1,7 @@
|
||||
ScreenScore
|
||||
|
||||
++++++++++
|
||||
Version 2:
|
||||
|
||||
Add: Elements for up to 6 players! (Texts and statics!)
|
||||
++++++++++
|
||||
@@ -1,5 +1,14 @@
|
||||
ScreenSing
|
||||
|
||||
++++++++++
|
||||
Version 4:
|
||||
Added Elements for 6-player-singing!
|
||||
|
||||
Add:
|
||||
<StaticAvatarP$N$> (One for each player for each player-number>
|
||||
<TextNameP$N$> (One for each player for each player-number>
|
||||
|
||||
|
||||
++++++++++
|
||||
Version 3:
|
||||
|
||||
|
||||
Reference in new issue
Block a user