Merge branch 'develop' into rap
This commit is contained in:
37 files changed
+300
-161
No files matched your search
@@ -17,7 +17,9 @@
|
||||
<string name="TR_SCREENCONFIG_NUMPLAYERST1">Number of players in team 1</string>
|
||||
<string name="TR_SCREENCONFIG_NUMPLAYERST2">Number of players in team 2</string>
|
||||
<string name="TR_SCREENCONFIG_NUMFIELDS">Number of fields</string>
|
||||
<string name="TR_SCREENCONFIG_REFILLJOKERS">Refill jokers every round</string>
|
||||
<string name="TR_SCREENCONFIG_REFILLJOKERS">Refill jokers every round</string>
|
||||
<string name="TR_SCREENCONFIG_NUMJOKERS">Number of jokers</string>
|
||||
<string name="TR_SCREENCONFIG_SWITCH_PLAYER">Switch player</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>
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
<string name="TR_SCREENCONFIG_NUMPLAYERST2">Nombre de joueurs dans l'Equipe 2</string>
|
||||
<string name="TR_SCREENCONFIG_NUMFIELDS">Nombre de champs</string>
|
||||
<string name="TR_SCREENCONFIG_REFILLJOKERS">Recharger les jokers a chaque tour</string>
|
||||
<string name="TR_SCREENCONFIG_NUMJOKERS">Nombre de jokers</string>
|
||||
<string name="TR_SCREENCONFIG_SWITCH_PLAYER">Changement de joueur</string>
|
||||
<string name="TR_SCREENNAMES_TITLE">Tic-Tac-Toe: Choix des joueurs</string>
|
||||
<string name="TR_SCREENNAMES_TEAM1">Equipe 1</string>
|
||||
<string name="TR_SCREENNAMES_TEAM2">Equipe 2</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>PartyScreenTicTacToeConfig</ScreenName>
|
||||
<ScreenVersion>2</ScreenVersion>
|
||||
<ScreenVersion>3</ScreenVersion>
|
||||
</Informations>
|
||||
<Backgrounds>
|
||||
<Background Name="Background1">
|
||||
@@ -55,7 +55,7 @@
|
||||
<Font>Outline</Font>
|
||||
<Text>TR_SCREENCONFIG_NUMFIELDS</Text>
|
||||
</Text>
|
||||
<Text Name="TextRefillJokers">
|
||||
<Text Name="TextNumJokers">
|
||||
<X>75</X>
|
||||
<Y>165</Y>
|
||||
<Z>0</Z>
|
||||
@@ -67,8 +67,36 @@
|
||||
<ResizeAlign>Center</ResizeAlign>
|
||||
<Style>Bold</Style>
|
||||
<Font>Outline</Font>
|
||||
<Text>TR_SCREENCONFIG_NUMJOKERS</Text>
|
||||
</Text>
|
||||
<Text Name="TextRefillJokers">
|
||||
<X>75</X>
|
||||
<Y>225</Y>
|
||||
<Z>0</Z>
|
||||
<H>27</H>
|
||||
<MaxW>0</MaxW>
|
||||
<Color Name="TextColor" />
|
||||
<SelColor Name="TextSelColor" />
|
||||
<Align>Left</Align>
|
||||
<ResizeAlign>Center</ResizeAlign>
|
||||
<Style>Bold</Style>
|
||||
<Font>Outline</Font>
|
||||
<Text>TR_SCREENCONFIG_REFILLJOKERS</Text>
|
||||
</Text>
|
||||
<Text Name="TextSwitchPlayer">
|
||||
<X>75</X>
|
||||
<Y>285</Y>
|
||||
<Z>0</Z>
|
||||
<H>27</H>
|
||||
<MaxW>0</MaxW>
|
||||
<Color Name="TextColor" />
|
||||
<SelColor Name="TextSelColor" />
|
||||
<Align>Left</Align>
|
||||
<ResizeAlign>Center</ResizeAlign>
|
||||
<Style>Bold</Style>
|
||||
<Font>Outline</Font>
|
||||
<Text>TR_SCREENCONFIG_SWITCH_PLAYER</Text>
|
||||
</Text>
|
||||
</Texts>
|
||||
<Buttons>
|
||||
<Button Name="ButtonNext">
|
||||
@@ -187,7 +215,7 @@
|
||||
<TextStyle>Bold</TextStyle>
|
||||
<NumVisible>3</NumVisible>
|
||||
</SelectSlide>
|
||||
<SelectSlide Name="SelectSlideRefillJokers">
|
||||
<SelectSlide Name="SelectSlideNumJockers">
|
||||
<Skin/>
|
||||
<SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
|
||||
<SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
|
||||
@@ -227,6 +255,90 @@
|
||||
<TextMaxW>205.33</TextMaxW>
|
||||
<TextFont>Outline</TextFont>
|
||||
<TextStyle>Bold</TextStyle>
|
||||
<NumVisible>3</NumVisible>
|
||||
</SelectSlide>
|
||||
<SelectSlide Name="SelectSlideRefillJokers">
|
||||
<Skin/>
|
||||
<SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
|
||||
<SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
|
||||
<SkinSelected>SelectSlide</SkinSelected>
|
||||
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
|
||||
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
|
||||
<Rect>
|
||||
<X>500</X>
|
||||
<Y>220</Y>
|
||||
<W>700</W>
|
||||
<H>50</H>
|
||||
<Z>0</Z>
|
||||
</Rect>
|
||||
<RectArrowLeft>
|
||||
<X>505</X>
|
||||
<Y>225</Y>
|
||||
<W>40</W>
|
||||
<H>40</H>
|
||||
<Z>0</Z>
|
||||
</RectArrowLeft>
|
||||
<RectArrowRight>
|
||||
<X>1155</X>
|
||||
<Y>225</Y>
|
||||
<W>40</W>
|
||||
<H>40</H>
|
||||
<Z>0</Z>
|
||||
</RectArrowRight>
|
||||
<Color Name="SelectSlideColor" />
|
||||
<SelColor Name="SelectSlideSelColor" />
|
||||
<ArrowColor Name="ArrowColor" />
|
||||
<ArrowSelColor Name="ArrowSelColor" />
|
||||
<TextColor Name="TextColorAlpha" />
|
||||
<TextSelColor Name="TextSelColor" />
|
||||
<TextH>27</TextH>
|
||||
<TextRelativeX>50</TextRelativeX>
|
||||
<TextRelativeY>0</TextRelativeY>
|
||||
<TextMaxW>205.33</TextMaxW>
|
||||
<TextFont>Outline</TextFont>
|
||||
<TextStyle>Bold</TextStyle>
|
||||
<NumVisible>2</NumVisible>
|
||||
</SelectSlide>
|
||||
<SelectSlide Name="SelectSlideSwitchPlayer">
|
||||
<Skin/>
|
||||
<SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
|
||||
<SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
|
||||
<SkinSelected>SelectSlide</SkinSelected>
|
||||
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
|
||||
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
|
||||
<Rect>
|
||||
<X>500</X>
|
||||
<Y>270</Y>
|
||||
<W>700</W>
|
||||
<H>50</H>
|
||||
<Z>0</Z>
|
||||
</Rect>
|
||||
<RectArrowLeft>
|
||||
<X>505</X>
|
||||
<Y>275</Y>
|
||||
<W>40</W>
|
||||
<H>40</H>
|
||||
<Z>0</Z>
|
||||
</RectArrowLeft>
|
||||
<RectArrowRight>
|
||||
<X>1155</X>
|
||||
<Y>275</Y>
|
||||
<W>40</W>
|
||||
<H>40</H>
|
||||
<Z>0</Z>
|
||||
</RectArrowRight>
|
||||
<Color Name="SelectSlideColor" />
|
||||
<SelColor Name="SelectSlideSelColor" />
|
||||
<ArrowColor Name="ArrowColor" />
|
||||
<ArrowSelColor Name="ArrowSelColor" />
|
||||
<TextColor Name="TextColorAlpha" />
|
||||
<TextSelColor Name="TextSelColor" />
|
||||
<TextH>27</TextH>
|
||||
<TextRelativeX>50</TextRelativeX>
|
||||
<TextRelativeY>0</TextRelativeY>
|
||||
<TextMaxW>205.33</TextMaxW>
|
||||
<TextFont>Outline</TextFont>
|
||||
<TextStyle>Bold</TextStyle>
|
||||
<NumVisible>2</NumVisible>
|
||||
</SelectSlide>
|
||||
</SelectSlides>
|
||||
|
||||
@@ -506,6 +506,64 @@
|
||||
<Text />
|
||||
</Text>
|
||||
</Button>
|
||||
<Button Name="ButtonSwitchPlayerT1">
|
||||
<Skin>RepeatIcon</Skin>
|
||||
<SkinSelected>RepeatIcon</SkinSelected>
|
||||
<Rect>
|
||||
<X>260</X>
|
||||
<Y>240</Y>
|
||||
<W>60</W>
|
||||
<H>60</H>
|
||||
<Z>-4</Z>
|
||||
</Rect>
|
||||
<Color Name="Player1" >
|
||||
<A>0.5</A>
|
||||
</Color>
|
||||
<SelColor Name="Player1" />
|
||||
<Text Name="Text">
|
||||
<X>48</X>
|
||||
<Y>25</Y>
|
||||
<Z>0</Z>
|
||||
<H>50</H>
|
||||
<MaxW>50</MaxW>
|
||||
<Color Name="ButtonTextColor" />
|
||||
<SelColor Name="ButtonTextSelColor" />
|
||||
<Align>Center</Align>
|
||||
<ResizeAlign>Center</ResizeAlign>
|
||||
<Style>Bold</Style>
|
||||
<Font>Outline</Font>
|
||||
<Text />
|
||||
</Text>
|
||||
</Button>
|
||||
<Button Name="ButtonSwitchPlayerT2">
|
||||
<Skin>RepeatIcon</Skin>
|
||||
<SkinSelected>RepeatIcon</SkinSelected>
|
||||
<Rect>
|
||||
<X>960</X>
|
||||
<Y>240</Y>
|
||||
<W>60</W>
|
||||
<H>60</H>
|
||||
<Z>-4</Z>
|
||||
</Rect>
|
||||
<Color Name="Player2" >
|
||||
<A>0.5</A>
|
||||
</Color>
|
||||
<SelColor Name="Player2" />
|
||||
<Text Name="Text">
|
||||
<X>48</X>
|
||||
<Y>25</Y>
|
||||
<Z>0</Z>
|
||||
<H>50</H>
|
||||
<MaxW>50</MaxW>
|
||||
<Color Name="ButtonTextColor" />
|
||||
<SelColor Name="ButtonTextSelColor" />
|
||||
<Align>Center</Align>
|
||||
<ResizeAlign>Center</ResizeAlign>
|
||||
<Style>Bold</Style>
|
||||
<Font>Outline</Font>
|
||||
<Text />
|
||||
</Text>
|
||||
</Button>
|
||||
</Buttons>
|
||||
<SongMenus />
|
||||
<Lyrics />
|
||||
|
||||
Reference in new issue
Block a user