Merge remote-tracking branch 'upstream/develop' into medley

This commit is contained in:
Florian Kuepper committed 2012-06-16 17:20:14 +02:00
commit 07bad380a3
81 files changed
+9135 -970

No files matched your search

+49 -7
View File
@@ -33,9 +33,9 @@
<A>1,000</A>
</Player4>
<Player5>
<R>0,000</R>
<G>0,500</G>
<B>1,000</B>
<R>1,000</R>
<G>0,800</G>
<B>0,000</B>
<A>1,000</A>
</Player5>
<Player6>
@@ -71,9 +71,9 @@
<A>0,500</A>
</Player4Dim>
<Player5Dim>
<R>0,000</R>
<G>0,500</G>
<B>1,000</B>
<R>1,000</R>
<G>0,800</G>
<B>0,000</B>
<A>0,500</A>
</Player5Dim>
<Player6Dim>
@@ -82,6 +82,42 @@
<B>0,500</B>
<A>0,500</A>
</Player6Dim>
<Player1Dim2>
<R>0,000</R>
<G>0,000</G>
<B>1,000</B>
<A>0,400</A>
</Player1Dim2>
<Player2Dim2>
<R>1,000</R>
<G>0,000</G>
<B>0,000</B>
<A>0,400</A>
</Player2Dim2>
<Player3Dim2>
<R>0,000</R>
<G>1,000</G>
<B>0,000</B>
<A>0,400</A>
</Player3Dim2>
<Player4Dim2>
<R>0,500</R>
<G>0,000</G>
<B>1,000</B>
<A>0,400</A>
</Player4Dim2>
<Player5Dim2>
<R>1,000</R>
<G>0,800</G>
<B>0,000</B>
<A>0,400</A>
</Player5Dim2>
<Player6Dim2>
<R>1,000</R>
<G>0,000</G>
<B>0,500</B>
<A>0,400</A>
</Player6Dim2>
<BackgroundColor>
<R>0,000</R>
<G>0,000</G>
@@ -266,6 +302,12 @@
<MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
<MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
<Invisible>Invisible.png</Invisible>
<PlayerSelector>PlayerSelector.png</PlayerSelector>
<PreviousIcon>PreviousIcon.png</PreviousIcon>
<NextIcon>NextIcon.png</NextIcon>
<PlayIcon>PlayIcon.png</PlayIcon>
<PauseIcon>PauseIcon.png</PauseIcon>
<RepeatIcon>RepeatIcon.png</RepeatIcon>
</Skins>
<Videos>
<BG_Video>[Red]BG_Video.mp4</BG_Video>
@@ -273,4 +315,4 @@
<IntroMid>[Red]IntroMid.mp4</IntroMid>
<IntroOut>[Red]IntroOut.mp4</IntroOut>
</Videos>
</root>
</root>