Merge branch 'develop' into rap
This commit is contained in:
BuildTools committed
commit
b7b736a49d
10 files changed
+182
-25
No files matched your search
@@ -19,9 +19,11 @@
|
||||
<string name="TR_SCREENCONFIG_NUMFIELDS">Number of fields</string>
|
||||
<string name="TR_SCREENCONFIG_REFILLJOKERS">Refill jokers every round</string>
|
||||
<string name="TR_SCREENNAMES_TITLE">Tic-Tac-Toe: Choose Player</string>
|
||||
<string name="TR_SCREENNAMES_SELPLAYERSTITLE">Selected players for this team:</string>
|
||||
<string name="TR_SCREENNAMES_TEAM1">Team 1</string>
|
||||
<string name="TR_SCREENNAMES_TEAM2">Team 2</string>
|
||||
<string name="TR_SCREENNAMES_BUTTON_RANDOM">Select random</string>
|
||||
<string name="TR_SCREENNAMES_HELPMESSAGE">Add at least one player to both teams! / Drag player avatars to add them to the selected players list! / Right click avatar of selected players to remove them!</string>
|
||||
<string name="TR_SCREENMAIN_TITLE">Tic-Tac-Toe</string>
|
||||
<string name="TR_SCREENMAIN_TEAM_CHOOSE">Choose a field.</string>
|
||||
<string name="TR_SCREENMAIN_NEXT_PLAYER">Next player</string>
|
||||
|
||||
@@ -19,9 +19,11 @@
|
||||
<string name="TR_SCREENCONFIG_NUMFIELDS">Anzahl der Felder</string>
|
||||
<string name="TR_SCREENCONFIG_REFILLJOKERS">Joker nach jeder Runde auffüllen</string>
|
||||
<string name="TR_SCREENNAMES_TITLE">Tic-Tac-Toe: Spielerwahl</string>
|
||||
<string name="TR_SCREENNAMES_SELPLAYERSTITLE">Ausgewählte Spieler für dieses Team:</string>
|
||||
<string name="TR_SCREENNAMES_TEAM1">Team 1</string>
|
||||
<string name="TR_SCREENNAMES_TEAM2">Team 2</string>
|
||||
<string name="TR_SCREENNAMES_BUTTON_RANDOM">Zufällig auswählen</string>
|
||||
<string name="TR_SCREENNAMES_HELPMESSAGE">Füge mindestens einen Spieler zu beiden Teams hinzu! / Zum Hinzufügen den Spieleravatar auf die Liste der ausgewählten Spieler ziehen! / Zum Entfernen den Spieleravatar mit rechter Maustaste anklicken!</string>
|
||||
<string name="TR_SCREENMAIN_TITLE">Tic-Tac-Toe</string>
|
||||
<string name="TR_SCREENMAIN_TEAM_CHOOSE">Wählt ein Feld aus.</string>
|
||||
<string name="TR_SCREENMAIN_NEXT_PLAYER">Nächster Spieler</string>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<Informations>
|
||||
<ScreenName>PartyScreenTicTacToeMain</ScreenName>
|
||||
<ScreenVersion>1</ScreenVersion>
|
||||
<ScreenVersion>2</ScreenVersion>
|
||||
</Informations>
|
||||
<Backgrounds>
|
||||
<Background Name="Background1">
|
||||
@@ -44,7 +44,7 @@
|
||||
<Y>200</Y>
|
||||
<W>100</W>
|
||||
<H>100</H>
|
||||
<Z>-1</Z>
|
||||
<Z>-3</Z>
|
||||
</Rect>
|
||||
</Static>
|
||||
<Static Name="StaticAvatarT2">
|
||||
@@ -55,7 +55,29 @@
|
||||
<Y>200</Y>
|
||||
<W>100</W>
|
||||
<H>100</H>
|
||||
<Z>-1</Z>
|
||||
<Z>-3</Z>
|
||||
</Rect>
|
||||
</Static>
|
||||
<Static Name="StaticTeam1">
|
||||
<Skin>PlayerSelBG</Skin>
|
||||
<Color Name="Player1" />
|
||||
<Rect>
|
||||
<X>5</X>
|
||||
<Y>195</Y>
|
||||
<W>325</W>
|
||||
<H>110</H>
|
||||
<Z>-2</Z>
|
||||
</Rect>
|
||||
</Static>
|
||||
<Static Name="StaticTeam2">
|
||||
<Skin>PlayerSelBG</Skin>
|
||||
<Color Name="Player2" />
|
||||
<Rect>
|
||||
<X>950</X>
|
||||
<Y>195</Y>
|
||||
<W>325</W>
|
||||
<H>110</H>
|
||||
<Z>-2</Z>
|
||||
</Rect>
|
||||
</Static>
|
||||
</Statics>
|
||||
@@ -146,7 +168,7 @@
|
||||
</Text>
|
||||
<Text Name="TextNextPlayerNameT1">
|
||||
<X>120</X>
|
||||
<Y>230</Y>
|
||||
<Y>200</Y>
|
||||
<Z>0</Z>
|
||||
<H>35</H>
|
||||
<MaxW>0</MaxW>
|
||||
@@ -160,7 +182,7 @@
|
||||
</Text>
|
||||
<Text Name="TextNextPlayerNameT2">
|
||||
<X>1160</X>
|
||||
<Y>230</Y>
|
||||
<Y>200</Y>
|
||||
<Z>0</Z>
|
||||
<H>40</H>
|
||||
<MaxW>0</MaxW>
|
||||
@@ -490,7 +512,48 @@
|
||||
<SelectSlides />
|
||||
<SingNotes />
|
||||
<NameSelections />
|
||||
<Equalizers />
|
||||
<Equalizers>
|
||||
<Equalizer Name="EqualizerTeam1">
|
||||
<Skin/>
|
||||
<Rect>
|
||||
<X>120</X>
|
||||
<Y>250</Y>
|
||||
<W>205</W>
|
||||
<H>37</H>
|
||||
<Z>-3</Z>
|
||||
</Rect>
|
||||
<NumBars>16</NumBars>
|
||||
<Space>2</Space>
|
||||
<Style>Columns</Style>
|
||||
<DrawNegative>TR_CONFIG_OFF</DrawNegative>
|
||||
<Color Name="Player1">
|
||||
<A>0.2</A>
|
||||
</Color>
|
||||
<MaxColor Name="Player1">
|
||||
<A>0.4</A>
|
||||
</MaxColor>
|
||||
</Equalizer>
|
||||
<Equalizer Name="EqualizerTeam2">
|
||||
<Skin/>
|
||||
<Rect>
|
||||
<X>955</X>
|
||||
<Y>250</Y>
|
||||
<W>205</W>
|
||||
<H>37</H>
|
||||
<Z>-3</Z>
|
||||
</Rect>
|
||||
<NumBars>16</NumBars>
|
||||
<Space>2</Space>
|
||||
<Style>Columns</Style>
|
||||
<DrawNegative>TR_CONFIG_OFF</DrawNegative>
|
||||
<Color Name="Player2">
|
||||
<A>0.2</A>
|
||||
</Color>
|
||||
<MaxColor Name="Player2">
|
||||
<A>0.4</A>
|
||||
</MaxColor>
|
||||
</Equalizer>
|
||||
</Equalizers>
|
||||
<Playlists />
|
||||
<ParticleEffects />
|
||||
<ScreenSettings />
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<Informations>
|
||||
<ScreenName>PartyScreenTicTacToeNames</ScreenName>
|
||||
<ScreenVersion>1</ScreenVersion>
|
||||
<ScreenVersion>2</ScreenVersion>
|
||||
</Informations>
|
||||
<Backgrounds>
|
||||
<Background Name="Background1">
|
||||
@@ -41,6 +41,34 @@
|
||||
<Font>Outline</Font>
|
||||
<Text>TR_SCREENNAMES_TITLE</Text>
|
||||
</Text>
|
||||
<Text Name="TextSelPlayersTitle">
|
||||
<X>640</X>
|
||||
<Y>155</Y>
|
||||
<Z>0</Z>
|
||||
<H>20</H>
|
||||
<MaxW>0</MaxW>
|
||||
<Color Name="TextColor" />
|
||||
<SelColor Name="TextSelColor" />
|
||||
<Align>Center</Align>
|
||||
<ResizeAlign>Center</ResizeAlign>
|
||||
<Style>Bold</Style>
|
||||
<Font>Outline</Font>
|
||||
<Text>TR_SCREENNAMES_SELPLAYERSTITLE</Text>
|
||||
</Text>
|
||||
<Text Name="TextHelpBar">
|
||||
<X>640</X>
|
||||
<Y>703</Y>
|
||||
<Z>0</Z>
|
||||
<H>16</H>
|
||||
<MaxW>1200</MaxW>
|
||||
<Color Name="TextColor" />
|
||||
<SelColor Name="TextSelColor" />
|
||||
<Align>Center</Align>
|
||||
<ResizeAlign>Center</ResizeAlign>
|
||||
<Style>Normal</Style>
|
||||
<Font>Outline</Font>
|
||||
<Text>TR_SCREENNAMES_HELPMESSAGE</Text>
|
||||
</Text>
|
||||
</Texts>
|
||||
<Buttons>
|
||||
<Button Name="ButtonBack">
|
||||
@@ -48,7 +76,7 @@
|
||||
<SkinSelected>Button</SkinSelected>
|
||||
<Rect>
|
||||
<X>145</X>
|
||||
<Y>625</Y>
|
||||
<Y>618</Y>
|
||||
<W>150</W>
|
||||
<H>50</H>
|
||||
<Z>0</Z>
|
||||
@@ -83,7 +111,7 @@
|
||||
<SkinSelected>Button</SkinSelected>
|
||||
<Rect>
|
||||
<X>985</X>
|
||||
<Y>625</Y>
|
||||
<Y>618</Y>
|
||||
<W>150</W>
|
||||
<H>50</H>
|
||||
<Z>0</Z>
|
||||
@@ -118,7 +146,7 @@
|
||||
<SkinSelected>Button</SkinSelected>
|
||||
<Rect>
|
||||
<X>565</X>
|
||||
<Y>625</Y>
|
||||
<Y>618</Y>
|
||||
<W>150</W>
|
||||
<H>50</H>
|
||||
<Z>0</Z>
|
||||
@@ -207,7 +235,7 @@
|
||||
<SkinSelected>Plus</SkinSelected>
|
||||
<Rect>
|
||||
<X>1180</X>
|
||||
<Y>210</Y>
|
||||
<Y>230</Y>
|
||||
<W>40</W>
|
||||
<H>40</H>
|
||||
<Z>0</Z>
|
||||
@@ -234,7 +262,7 @@
|
||||
<SkinSelected>Minus</SkinSelected>
|
||||
<Rect>
|
||||
<X>1130</X>
|
||||
<Y>210</Y>
|
||||
<Y>230</Y>
|
||||
<W>40</W>
|
||||
<H>40</H>
|
||||
<Z>0</Z>
|
||||
@@ -311,21 +339,21 @@
|
||||
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
|
||||
<Rect>
|
||||
<X>40</X>
|
||||
<Y>160</Y>
|
||||
<Y>180</Y>
|
||||
<W>1055</W>
|
||||
<H>150</H>
|
||||
<Z>0</Z>
|
||||
</Rect>
|
||||
<RectArrowLeft>
|
||||
<X>45</X>
|
||||
<Y>210</Y>
|
||||
<Y>230</Y>
|
||||
<W>40</W>
|
||||
<H>40</H>
|
||||
<Z>0</Z>
|
||||
</RectArrowLeft>
|
||||
<RectArrowRight>
|
||||
<X>1050</X>
|
||||
<Y>210</Y>
|
||||
<Y>230</Y>
|
||||
<W>40</W>
|
||||
<H>40</H>
|
||||
<Z>0</Z>
|
||||
@@ -379,4 +407,4 @@
|
||||
<Playlists />
|
||||
<ParticleEffects />
|
||||
<ScreenSettings />
|
||||
</Screen>
|
||||
</Screen>
|
||||
Reference in new issue
Block a user