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

Merge branch 'develop' of git://github.com/Vocaluxe/Vocaluxe into develop

Browse Source
This commit is contained in:
Flamefire committed 2013-05-27 19:02:45 +02:00
2 parents 26bfadde64 8d79dd234c
commit 2b3a5d3416
29 files changed
+284 -189
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ClientServerLib/AndroidRemote/AndroidRemote.csproj
+8 -6
View File
@@ -70,15 +70,15 @@
<Compile Include="..\ClientServerLib\DeffieHellman\StrongNumberProvider.cs">
<Link>ClientServerLib\DeffieHellman\StrongNumberProvider.cs</Link>
</Compile>
<Compile Include="..\ClientServerLib\Vocaluxe\CCommands.cs">
<Link>ClientServerLib\Vocaluxe\CCommands.cs</Link>
</Compile>
<Compile Include="..\ClientServerLib\Vocaluxe\VocaluxeStructs.cs">
<Link>ClientServerLib\Vocaluxe\VocaluxeStructs.cs</Link>
</Compile>
<Compile Include="..\ClientServerLib\CDiscover.cs">
<Link>ClientServerLib\CDiscover.cs</Link>
</Compile>
<Compile Include="..\..\Vocaluxe\Base\Server\CCommands.cs">
<Link>ClientServerLib\Server\CCommands.cs</Link>
</Compile>
<Compile Include="..\..\Vocaluxe\Base\Server\VocaluxeStructs.cs">
<Link>ClientServerLib\Server\VocaluxeStructs.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="Resources\AboutResources.txt" />
@@ -93,5 +93,7 @@
<ItemGroup>
<Folder Include="ClientServerLib\" />
<Folder Include="Assets\" />
<Folder Include="ClientServerLib\Vocaluxe\" />
<Folder Include="ClientServerLib\Server\" />
</ItemGroup>
</Project>
ClientServerLib/AndroidRemote/MainActivity.cs
+12 -6
View File
@@ -24,10 +24,13 @@ namespace AndroidRemote
Button bLogin;
Button bSendAvatar;
Button bSendProfile;
TextView tIP;
TextView tPassword;
bool loggedIn;
byte[] fileBytes;
ImageView imageView;
Java.IO.File file;
Java.IO.File dir;
System.IO.FileStream fs;
@@ -55,6 +58,9 @@ namespace AndroidRemote
bSendProfile = FindViewById<Button> (Resource.Id.btSendProfile);
bSendProfile.Click += SendProfile;
tIP = FindViewById<TextView> (Resource.Id.tbIP);
tPassword = FindViewById<TextView> (Resource.Id.tbPassword);
sendProfile = false;
}
@@ -134,7 +140,7 @@ namespace AndroidRemote
private void Connect()
{
if (!client.Connected)
client.Connect("192.168.178.57", 3000, OnConnectionChanged);
client.Connect(tIP.Text, 3000, OnConnectionChanged);
else
client.Disconnect();
}
@@ -142,7 +148,7 @@ namespace AndroidRemote
private void Login()
{
if (!loggedIn)
client.SendMessage (CCommands.CreateCommandLogin("vocaluxe"), OnResponse);
client.SendMessage (CCommands.CreateCommandLogin(tPassword.Text), OnResponse);
else
client.Disconnect();
}
@@ -215,13 +221,13 @@ namespace AndroidRemote
if (LoggedIn)
{
bLogin.Text = Resources.GetString(Resource.String.button_logout);
Toast.MakeText(this, "Logged In", ToastLength.Short).Show();
Toast.MakeText(this, Resources.GetString(Resource.String.message_logged_in), ToastLength.Short).Show();
bSendAvatar.Enabled = true;
bSendProfile.Enabled = true;
}
else
{
Toast.MakeText(this, "Not Logged In", ToastLength.Short).Show();
Toast.MakeText(this, Resources.GetString(Resource.String.message_logged_out), ToastLength.Short).Show();
bSendAvatar.Enabled = false;
bSendProfile.Enabled = false;
}
ClientServerLib/ClientServerLib/CClient.cs
+20 -15
View File
@@ -118,8 +118,8 @@ namespace ClientServerLib
}
catch
{
connected = false;
RaiseOnConnectionChanged();
DoDisconnect();
for (int i = 0; i < 500; i++)
{
if (doConnect)
@@ -133,17 +133,7 @@ namespace ClientServerLib
if (connected && !doConnect)
{
try
{
connection.TcpClient.Close();
connection = new CConnection(new TcpClient(), -1);
}
catch
{
}
connected = false;
RaiseOnConnectionChanged();
DoDisconnect();
}
if (doConnect && connected)
@@ -154,16 +144,31 @@ namespace ClientServerLib
}
catch
{
connected = false;
RaiseOnConnectionChanged();
DoDisconnect();
}
}
}
}
private void DoDisconnect()
{
try
{
connection.TcpClient.Close();
}
catch { }
connection = new CConnection(new TcpClient(), -1);
connected = false;
RaiseOnConnectionChanged();
}
private void Communicate()
{
if (connection.TcpClient == null || !connection.TcpClient.Connected)
DoDisconnect();
NetworkStream clientStream = connection.TcpClient.GetStream();
byte[] data = new byte[bufferLength];
ClientServerLib/ClientServerLib/CConnection.cs
+71 -1
View File
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Net.Sockets;
using System.IO;
using System.IO.Compression;
using System.Security.Cryptography;
using System.Text;
@@ -91,6 +92,16 @@ namespace ClientServerLib
}
public byte[] Encrypt(byte[] Data)
{
return _Encrypt(_Compress(Data));
}
public byte[] Decrypt(byte[] Data)
{
return _Decompress(_Decrypt(Data));
}
private byte[] _Encrypt(byte[] Data)
{
if (Data == null || (!keySet && encryption))
return Data;
@@ -142,7 +153,7 @@ namespace ClientServerLib
}
}
public byte[] Decrypt(byte[] Data)
private byte[] _Decrypt(byte[] Data)
{
if (Data == null || (!keySet && encryption))
return Data;
@@ -202,5 +213,64 @@ namespace ClientServerLib
}
}
}
private byte[] _Compress(byte[] Data)
{
if (Data == null)
return Data;
using (var compressed = new MemoryStream())
{
using (var gz = new GZipStream(compressed, CompressionMode.Compress, true))
{
gz.Write(Data, 0, Data.Length);
}
byte[] result = null;
if (compressed.Length < Data.Length)
{
result = new byte[compressed.Length + 1];
result[0] = 1; //data stream is compressed
compressed.Position = 0;
compressed.Read(result, 1, (int)compressed.Length);
}
else
{
result = new byte[Data.Length + 1];
result[0] = 0; //data stream is not compressed
Array.Copy(Data, 0, result, 1, Data.Length);
}
return result;
}
}
private byte[] _Decompress(byte[] Data)
{
if (Data == null)
return Data;
if (Data[0] == 0) //not compressed
{
byte[] result = new byte[Data.Length - 1];
Array.Copy(Data, 1, result, 0, result.Length);
return result;
}
using (var inStream = new MemoryStream())
{
inStream.Write(Data, 1, Data.Length - 1);
inStream.Position = 0;
using (var outStream = new MemoryStream())
{
using (var gz = new GZipStream(inStream, CompressionMode.Decompress, true))
gz.CopyTo(outStream);
return outStream.ToArray();
}
}
}
}
}
ClientServerLib/ClientServerLib/ClientServerLib.csproj
-6
View File
@@ -31,10 +31,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>bin\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Windows.Forms" />
@@ -53,8 +49,6 @@
<Compile Include="DeffieHellman\StrongNumberProvider.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Structs.cs" />
<Compile Include="Vocaluxe\CCommands.cs" />
<Compile Include="Vocaluxe\VocaluxeStructs.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
ClientServerLib/ClientTest/ClientTest.csproj
+10
View File
@@ -34,6 +34,10 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\ClientServerLib\bin\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@@ -46,6 +50,12 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\Vocaluxe\Base\Server\CCommands.cs">
<Link>CCommands.cs</Link>
</Compile>
<Compile Include="..\..\Vocaluxe\Base\Server\VocaluxeStructs.cs">
<Link>VocaluxeStructs.cs</Link>
</Compile>
<Compile Include="ClientTest.cs">
<SubType>Form</SubType>
</Compile>
Output/ClientServerLib.dll
BIN
View File
Binary file not shown.
Output/Languages/English.xml
+1
View File
@@ -130,6 +130,7 @@
<string name="TR_SCREENSONG_ALLSONGS">All Songs</string>
<string name="TR_SCREENSONG_NUMSONGS">(%v Songs)</string>
<string name="TR_SCREENSONG_NUMSONG">(%v Song)</string>
<string name="TR_SCREENSONG_ARTIST_TITLE">%a - %t</string>
<string name="TR_SCREENSING_PAUSE">Pause</string>
<string name="TR_SCREENSING_BUTTON_CANCEL">Stop singing</string>
<string name="TR_SCREENSING_BUTTON_CONTINUE">Continue</string>
Output/PartyModes/Challenge/Screens/PartyScreenChallengeConfig.xml
+9 -9
View File
@@ -36,7 +36,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -65,7 +65,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -94,7 +94,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -123,7 +123,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -167,7 +167,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -224,7 +224,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -314,7 +314,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -379,7 +379,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -444,7 +444,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
Output/PartyModes/Challenge/Screens/PartyScreenChallengeMain.xml
+24 -24
View File
@@ -68,7 +68,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -97,7 +97,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -126,7 +126,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>50</H>
<H>44</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -155,7 +155,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>35</H>
<H>31</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>770</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -185,7 +185,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -214,7 +214,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>130</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -244,7 +244,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -273,7 +273,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -302,7 +302,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -331,7 +331,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -360,7 +360,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>100</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -390,7 +390,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -419,7 +419,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -448,7 +448,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -477,7 +477,7 @@
<!--<Z>: Text position-->
<Z>-1,01</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>380</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -522,7 +522,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -579,7 +579,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -636,7 +636,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -693,7 +693,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -750,7 +750,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -807,7 +807,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -856,7 +856,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -905,7 +905,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -954,7 +954,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
Output/PartyModes/Challenge/Screens/PartyScreenChallengeNames.xml
+3 -3
View File
@@ -36,7 +36,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -80,7 +80,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -137,7 +137,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyConfig.xml
+9 -9
View File
@@ -36,7 +36,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -65,7 +65,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -94,7 +94,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -123,7 +123,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -167,7 +167,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -224,7 +224,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -314,7 +314,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -379,7 +379,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -444,7 +444,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyMain.xml
+24 -24
View File
@@ -68,7 +68,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -97,7 +97,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -126,7 +126,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>50</H>
<H>44</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -155,7 +155,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>35</H>
<H>31</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>770</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -185,7 +185,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -214,7 +214,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>130</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -244,7 +244,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -273,7 +273,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -302,7 +302,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -331,7 +331,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -360,7 +360,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>100</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -390,7 +390,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -419,7 +419,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -448,7 +448,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -477,7 +477,7 @@
<!--<Z>: Text position-->
<Z>-1,01</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>380</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -522,7 +522,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -579,7 +579,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -636,7 +636,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -693,7 +693,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -750,7 +750,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -807,7 +807,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -856,7 +856,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -905,7 +905,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -954,7 +954,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyNames.xml
+3 -3
View File
@@ -36,7 +36,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -80,7 +80,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -137,7 +137,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeConfig.xml
+15 -15
View File
@@ -36,7 +36,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -65,7 +65,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -94,7 +94,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -123,7 +123,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -152,7 +152,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -181,7 +181,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -225,7 +225,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -282,7 +282,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -372,7 +372,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -437,7 +437,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -502,7 +502,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -567,7 +567,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -632,7 +632,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -697,7 +697,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -762,7 +762,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeMain.xml
+13 -13
View File
@@ -84,7 +84,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -113,7 +113,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>40</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -142,7 +142,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>40</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -171,7 +171,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>40</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -229,7 +229,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>40</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -258,7 +258,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>40</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -287,7 +287,7 @@
<!--<Z>: Text position-->
<Z>-2,01</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>380</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -528,7 +528,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -585,7 +585,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -642,7 +642,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -699,7 +699,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -756,7 +756,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -813,7 +813,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeNames.xml
+7 -7
View File
@@ -36,7 +36,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -65,7 +65,7 @@
<!--<Z>: Text position-->
<Z>-1,00</Z>
<!--<H>: Text height-->
<H>22</H>
<H>20</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -94,7 +94,7 @@
<!--<Z>: Text position-->
<Z>-1,00</Z>
<!--<H>: Text height-->
<H>22</H>
<H>20</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -138,7 +138,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -187,7 +187,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -236,7 +236,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -293,7 +293,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
Output/Themes/Ambient/Screens/ScreenProfiles.xml
+2 -2
View File
@@ -120,7 +120,7 @@
<H>160</H>
<!--<Color>: Static color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<Color>Visible</Color>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
@@ -1124,4 +1124,4 @@
<NumVisible>2</NumVisible>
</SelectSlideActive>
</ScreenProfiles>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenSong.xml
+1 -1
View File
@@ -1844,7 +1844,7 @@
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Nothing or translation tag-->
<Text />
<Text>TR_SCREENSONG_ARTIST_TITLE</Text>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs
+6 -11
View File
@@ -543,8 +543,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
List<int> ids1 = new List<int>();
List<int> ids2 = new List<int>();
//Add IDs to team-list
while (_GameData.PlayerTeam1.Count < _GameData.NumFields + _GameData.NumJokerRetry[0] && ids1.Count == 0 &&
_GameData.PlayerTeam2.Count < _GameData.NumFields + _GameData.NumJokerRetry[1] && ids2.Count == 0)
while (_GameData.PlayerTeam1.Count < _GameData.NumFields + _GameData.NumJokerRetry[0] &&
_GameData.PlayerTeam2.Count < _GameData.NumFields + _GameData.NumJokerRetry[1] )
{
if (ids1.Count == 0)
{
@@ -557,11 +557,9 @@ namespace VocaluxeLib.PartyModes.TicTacToe
ids2.Add(i);
}
int num;
int random;
if (_GameData.PlayerTeam1.Count < _GameData.NumFields + _GameData.NumJokerRetry[0])
{
random = CBase.Game.GetRandom((ids1.Count - 1) * 10);
num = (int)Math.Round((double)random / 10);
num = CBase.Game.GetRandom(ids1.Count);
if (num >= ids1.Count)
num = ids1.Count - 1;
_GameData.PlayerTeam1.Add(ids1[num]);
@@ -569,8 +567,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
}
if (_GameData.PlayerTeam2.Count < _GameData.NumFields + _GameData.NumJokerRetry[1])
{
random = CBase.Game.GetRandom((ids2.Count - 1) * 20);
num = (int)Math.Round((double)random / 20);
num = CBase.Game.GetRandom(ids2.Count);
if (num >= ids2.Count)
num = ids2.Count - 1;
_GameData.PlayerTeam2.Add(ids2[num]);
@@ -593,8 +590,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
}
if (_GameData.PlayerTeam1.Count < _GameData.NumFields + _GameData.NumJokerRetry[0])
{
int random = CBase.Game.GetRandom((ids.Count - 1) * 10);
int num = (int)Math.Round((double)random / 10);
int num = CBase.Game.GetRandom(ids.Count);
if (num >= ids.Count)
num = ids.Count - 1;
_GameData.PlayerTeam1.Add(ids[num]);
@@ -617,8 +613,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
}
if (_GameData.PlayerTeam2.Count < _GameData.NumFields + _GameData.NumJokerRetry[1])
{
int random = CBase.Game.GetRandom((ids.Count - 1) * 20);
int num = (int)Math.Round((double)random / 20);
int num = CBase.Game.GetRandom(ids.Count);
if (num >= ids.Count)
num = ids.Count - 1;
_GameData.PlayerTeam2.Add(ids[num]);
PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeMain.cs
+35 -30
View File
@@ -473,27 +473,46 @@ namespace VocaluxeLib.PartyModes.TicTacToe
}
}
private void _FieldSelected()
private void _FieldSelected(bool jokerUsed = false)
{
if (!jokerUsed)
{
int singerTeam1 = 0;
int singerTeam2 = 0;
if (_GameData.PlayerTeam1.Count > 0)
{
singerTeam1 = _GameData.PlayerTeam1[0];
_GameData.PlayerTeam1.RemoveAt(0);
}
if (_GameData.PlayerTeam2.Count > 0)
{
singerTeam2 = _GameData.PlayerTeam2[0];
_GameData.PlayerTeam2.RemoveAt(0);
}
_GameData.Rounds[_SelectedField].SingerTeam1 = singerTeam1;
_GameData.Rounds[_SelectedField].SingerTeam2 = singerTeam2;
_Texts[_TextNextPlayerT1].Visible = true;
_Texts[_TextNextPlayerT2].Visible = true;
_Texts[_TextNextPlayerNameT1].Visible = true;
_Texts[_TextNextPlayerNameT2].Visible = true;
CProfile[] profiles = CBase.Profiles.GetProfiles();
_Texts[_TextNextPlayerNameT1].Text = profiles[_GameData.ProfileIDsTeam1[_GameData.Rounds[_SelectedField].SingerTeam1]].PlayerName;
_Texts[_TextNextPlayerNameT2].Text = profiles[_GameData.ProfileIDsTeam2[_GameData.Rounds[_SelectedField].SingerTeam2]].PlayerName;
_Statics[_StaticAvatarT1].Visible = true;
_Statics[_StaticAvatarT2].Visible = true;
_Statics[_StaticAvatarT1].Texture = profiles[_GameData.ProfileIDsTeam1[_GameData.Rounds[_SelectedField].SingerTeam1]].Avatar.Texture;
_Statics[_StaticAvatarT2].Texture = profiles[_GameData.ProfileIDsTeam2[_GameData.Rounds[_SelectedField].SingerTeam2]].Avatar.Texture;
}
int songID = 0;
int singerTeam1 = 0;
int singerTeam2 = 0;
if (_GameData.Songs.Count > 0)
{
songID = _GameData.Songs[0];
_GameData.Songs.RemoveAt(0);
}
if (_GameData.PlayerTeam1.Count > 0)
{
singerTeam1 = _GameData.PlayerTeam1[0];
_GameData.PlayerTeam1.RemoveAt(0);
}
if (_GameData.PlayerTeam2.Count > 0)
{
singerTeam2 = _GameData.PlayerTeam2[0];
_GameData.PlayerTeam2.RemoveAt(0);
}
CSong song = CBase.Songs.GetSongByID(songID);
CBase.BackgroundMusic.SetStatus(true);
@@ -506,22 +525,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
_Status = EStatus.FieldSelected;
_Fields[_SelectedField].Content.SongID = songID;
_GameData.Rounds[_SelectedField].SongID = songID;
_GameData.Rounds[_SelectedField].SingerTeam1 = singerTeam1;
_GameData.Rounds[_SelectedField].SingerTeam2 = singerTeam2;
_UpdateFieldContents();
_Texts[_TextNextPlayerT1].Visible = true;
_Texts[_TextNextPlayerT2].Visible = true;
_Texts[_TextNextPlayerNameT1].Visible = true;
_Texts[_TextNextPlayerNameT2].Visible = true;
CProfile[] profiles = CBase.Profiles.GetProfiles();
_Texts[_TextNextPlayerNameT1].Text = profiles[_GameData.ProfileIDsTeam1[_GameData.Rounds[_SelectedField].SingerTeam1]].PlayerName;
_Texts[_TextNextPlayerNameT2].Text = profiles[_GameData.ProfileIDsTeam2[_GameData.Rounds[_SelectedField].SingerTeam2]].PlayerName;
_Statics[_StaticAvatarT1].Visible = true;
_Statics[_StaticAvatarT2].Visible = true;
_Statics[_StaticAvatarT1].Texture = profiles[_GameData.ProfileIDsTeam1[_GameData.Rounds[_SelectedField].SingerTeam1]].Avatar.Texture;
_Statics[_StaticAvatarT2].Texture = profiles[_GameData.ProfileIDsTeam2[_GameData.Rounds[_SelectedField].SingerTeam2]].Avatar.Texture;
_UpdateJokerButtons();
_Buttons[_ButtonNextRound].Visible = true;
@@ -581,7 +585,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
_GameData.NumJokerRandom[teamNr]--;
if (!CBase.Sound.IsFinished(_PreviewStream))
CBase.Sound.FadeAndStop(_PreviewStream, 0, 1);
_FieldSelected();
_FieldSelected(true);
}
break;
@@ -597,6 +601,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
_OldSelectedField = _SelectedField;
_SelectedField = -1;
_UpdateFieldContents();
_Buttons[_ButtonNextRound].Visible = false;
}
break;
}
Vocaluxe/Base/CConfig.cs
-3
View File
@@ -426,9 +426,6 @@ namespace Vocaluxe.Base
writer.WriteComment("Preview Volume from 0 to 100");
writer.WriteElementString("PreviewMusicVolume", PreviewMusicVolume.ToString());
writer.WriteComment("Preview Volume from 0 to 100");
writer.WriteElementString("PreviewMusicVolume", PreviewMusicVolume.ToString());
writer.WriteComment("Game Volume from 0 to 100");
writer.WriteElementString("GameMusicVolume", GameMusicVolume.ToString());
ClientServerLib/ClientServerLib/Vocaluxe/CCommands.cs → Vocaluxe/Base/Server/CCommands.cs
View File
File renamed without changes.
ClientServerLib/ClientServerLib/Vocaluxe/VocaluxeStructs.cs → Vocaluxe/Base/Server/VocaluxeStructs.cs
View File
File renamed without changes.
Vocaluxe/Screens/CScreenSing.cs
+1
View File
@@ -208,6 +208,7 @@ namespace Vocaluxe.Screens
if (mode > Enum.GetNames(typeof(ETimerMode)).Length - 1)
mode = 0;
CConfig.TimerMode = (ETimerMode)mode;
CConfig.SaveConfig();
break;
case Keys.I:
Vocaluxe/Vocaluxe.csproj
+6
View File
@@ -159,6 +159,10 @@
<Reference Include="Community.CsharpSqlite">
<HintPath>..\Output\Community.CsharpSqlite.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\ClientServerLib\ClientServerLib\bin\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="OpenTK">
<HintPath>..\Output\OpenTK.dll</HintPath>
</Reference>
@@ -203,7 +207,9 @@
<Compile Include="Base\Fonts\CFonts.cs" />
<Compile Include="Base\Fonts\CGlyph.cs" />
<Compile Include="Base\Server\CClientHandler.cs" />
<Compile Include="Base\Server\CCommands.cs" />
<Compile Include="Base\Server\CVocaluxeServer.cs" />
<Compile Include="Base\Server\VocaluxeStructs.cs" />
<Compile Include="CSplashScreen.cs">
<SubType>Form</SubType>
</Compile>
VocaluxeLib/Menu/CPlaylist.cs
+1 -1
View File
@@ -1219,7 +1219,7 @@ namespace VocaluxeLib.Menu
CPlaylistElementContent pec = _PlaylistElementContents[Offset + i];
CSong song = CBase.Songs.GetSongByID(pec.SongID);
_PlaylistElements[i].Cover.Texture = song.CoverTextureSmall;
string t1 = _Theme.Text1.Text.Replace("%a", song.Artist).Replace("%t", song.Title);
string t1 = CBase.Language.Translate(_Theme.Text1.Text).Replace("%a", song.Artist).Replace("%t", song.Title);
_PlaylistElements[i].Text1.Text = /*(Offset + i + 1) + ") " + */ t1; //TODO: Add text field for the number
_PlaylistElements[i].SelectSlide.Clear();
for (int g = 0; g < pec.Modes.Length; g++)
VocaluxeLib/Menu/CStatic.cs
+2
View File
@@ -206,6 +206,8 @@ namespace VocaluxeLib.Menu
public void Draw(float scale, float z, EAspect aspect, bool forceDraw = false)
{
CTexture texture = Texture;
if (texture == null)
texture = new CTexture((int)Rect.W, (int)Rect.H);
SRectF bounds = new SRectF(
Rect.X - Rect.W * (scale - 1f),
VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
+1
View File
@@ -468,6 +468,7 @@ namespace VocaluxeLib.Menu.SongMenu
{
_Actsongstream = -1;
_Vidtex = null;
ApplyVolume(CBase.Config.GetPreviewMusicVolume());
}
public virtual void OnHide()