- switched SDL.dll back to v1.2.12, the 1.2.14 has too much bugs

- added duet support. duet song format based on hawkears duet mod for the 1.1 alpha

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2440 b956fd51-792f-4845-bead-9b4dfca2ff2c

13 files changed, 11 insertions, 172 deletions

diff --git a/Game/Output/Skins/Blue Sensation/[icon]song_duet.jpg b/Game/Output/Skins/Blue Sensation/[icon]song_duet.jpg
new file mode 100644
index 00000000..55158f74
--- /dev/null
+++ b/Game/Output/Skins/Blue Sensation/[icon]song_duet.jpg
diff --git a/Game/Output/Skins/Blue Sensation/blue sensation b/Game/Output/Skins/Blue Sensation/blue sensation
deleted file mode 100644
index ba2add65..00000000
--- a/Game/Output/Skins/Blue Sensation/blue sensation
+++ /dev/null
@@ -1,170 +0,0 @@
-;0.5.1

-;experimental version

-;if you are using this as a sample for your theme

-;don't be suprised it doesn't work good with newer releases

-

-[Skin]

-Theme=Blue Sensation

-Name=blue sensation

-Color=Blue

-Author=Charis

-

-[Textures]

-

-

-# # # M A I N # # #

-Button         =[main]button.jpg

-Buttonmenu1     =[main]buttonmenu1.jpg

-Buttonmenu2     =[main]buttonmenu2.jpg

-Buttonmenu3     =[main]buttonmenu3.jpg

-Buttonmenu4    =[main]buttonmenu4.jpg

-Buttonmenu5     =[main]buttonmenu5.jpg

-ButtonF        = [main]buttonf.jpg

-MainBar        = [main]mainBar.jpg

-SelectBG       = [main]selectbg.jpg

-

-#Backgrounds

-LoadingBG      =[bg-load]sensation.jpg

-MenuBG         = [bg-menu]sensation.jpg

-MainBG         = [bg-main]sensation.jpg

-SingBG		  = [bg-main]sensation.jpg

-SongBG         =[bg-song]sensation.jpg

-ScoreScreenBG  = [bg-party]sensation.jpg

-Top5BG         = [bg-top5]sensation.jpg

-OptionsBG      = [bg-main]sensation.jpg

-PartyBG        =[bg-party]sensation.jpg

-PartyBGWin	=[bg-party]sensation.jpg

-OptionsBG2	=[bg-option]sensation.jpg

-StatisticsBG	=[bg-main]sensation.jpg

-PartyBGNext	=[bg-party]sensation.jpg

-PartyScoreBG	=[bg-party]sensation.jpg

-

-#Icons on screen

-SongCD         = [icon]cd.jpg

-MainIcon       = [icon]main.jpg

-MainSearch     = [icon]search.jpg

-IconOption     = [icon]options.jpg

-IconSongMenu   = [icon]songmenu.jpg

-ScoreIcon      = [icon]score.jpg

-PartyIcon      = [icon]party.jpg

-StatIcon       = [icon]stats.jpg

-VideoIcon      =[icon]video.jpg

-

-IconError      = [icon]error.jpg

-IconQuestion   = [icon]question.jpg

-

-# # # S O N G S E L E C E T # # #

-SongSelection = [main]songSelection.jpg

-SongSelection1 =[main]songSelection1.jpg

-SongSelection2 =[main]songSelection2.jpg

-SongCover      = [main]songCover.jpg

-

-

-# # # S I N G # # #

-#the bar where the lyrics reside

-LyricBar       = [sing]textBar.jpg

-

-#this one slides in, to tell you that singing starts immediately

-LyricHelpBar   = [sing]lyricsHelpBar.bmp

-

-#the time progress bar  (not skinned in this theme :P )

-TimeBar1      = [sing]timeBarBG.jpg

-

-#the bar behind the timestuff

-TimeBar2      =[sing]timeBar1.jpg

-

-#linebonus, the thing that pop ups at the score

-LineBonusBack  = [sing]lineBonusPopUp.jpg

-

-#Singbar (the thing beneath the scores)

-SingBarBack    = [sing]singBarBack.jpg

-SingBarBar     = [sing]singBarBar.jpg

-SingBarFront   = [sing]singBarFront.jpg

-

-#Background for scores

-ScoreBG        = [sing]scoreBg.jpg

-

-#Background for the P1, P2 and so on

-P              = [sing]p.jpg

-

-#Pointer for lyrics

-Ball           = [sing]LyricsBall.bmp

-

-

-# # # S C O R E / T O P 5 # # #

-ScoreBox        = [score]box.jpg

-ScoreLevel      = [score]level.jpg

-ScoreLevelRound = [score]levelRound.jpg

-ScoreEndCap     = [score]endcap.jpg

-ScoreLine       = [score]line.jpg

-PlayerNumberBox = [main]playerNumberBox.jpg

-

-

-# # # P A R T Y # # #

-Joker             =[party]Joker.jpg

-PartyPlayerButton =[party]playerButton.jpg

-PartyTeamButton1  =[party]roundTeamButton.jpg

-PartyTeamButton2  =[party]playerTeamButton.jpg

-PartyTeamButton3  =[party]winTeamButton1.jpg

-PartyTeamButton4  =[party]winTeamButton2.jpg

-PartyTeamButton5  =[party]winTeamButton3.jpg

-PartyRoundBG1     =[party]roundBG1.jpg

-PartyRoundBG2     =[party]roundBG2.jpg

-PartyRoundBG3     =[party]roundBG3.jpg

-PartyRoundBG4     =[party]roundBG4.jpg

-HDL_Pointer       =[party]pointer.bmp

-PartyTeamPoints   =[party]teamPoints.jpg

-PartyScoreDeco    =x_[party]scoreDecoration.jpg

-PartyScoreBG1     =[party]scoreBG1.jpg

-PartyScoreBG2     =[party]scoreBG2.jpg

-PartyWinDeco1     =[party]winDecoration1.jpg

-PartyWinDeco2     =[party]winDecoration1.jpg

-PartyWinDeco3     =[party]winDecoration1.jpg

-

-# # # S T A T S # # #

-StatMainBG1 = [stat]mainBG1.jpg

-StatMainBG2 = [stat]mainBG2.jpg

-StatMainBG3 = [stat]mainBG3.jpg

-StatDetailBG1 = [stat]detailBG1.jpg

-

-

-# # # N A V I # # #

-ButtonP     = [button]p.jpg

-ButtonM     = [button]m.jpg

-ButtonJ     = [button]j.jpg

-ButtonAlt   = [button]alt.jpg

-ButtonAZ    = [button]az.jpg

-ButtonEnter =[button]enter.jpg

-ButtonNavi  =[button]navi.jpg

-ButtonEsc   = [button]esc.jpg

-Button13    = [button]13.jpg

-

-Leiste1     =[special]bar1.jpg

-Leiste2     =[special]bar2.jpg

-

-JumpToBG    = [menu]jumpToBg.jpg

-SongMenuBG  = [menu]songMenuBg.jpg

-SongMenuSelectBG  = [menu]songMenuSelectBg.jpg

-PopUpBG     = [menu]popUpBG.jpg

-PopUpFG     = [menu]popUpFG.jpg

-

-

-# # # N O T E S # # #

-GrayLeft    = [sing]notesLeft.bmp

-GrayMid     = [sing]notesMid.bmp

-GrayRight   = [sing]notesRight.bmp

-NoteBGLeft  = [sing]notesBgLeft.bmp

-NoteBGMid   = [sing]notesBgMid.bmp

-NoteBGRight = [sing]notesBgRight.bmp

-

-

-# # # E F F E C T S # # #

-NoteStar        = [effect]goldenNoteStar.jpg

-NotePerfectStar = [effect]perfectNoteStar.jpg

-

-

-# # # dirty helpers # # #

-Rectangle  = [helper]rectangle.jpg

-ButtonFade = [helper]buttonFade.jpg

-ButtonFadeMenu =[helper]buttonFade2.jpg

-ButtonOptions=[option]button.jpg

diff --git a/Game/Output/Skins/Blue Sensation/blue sensation.ini b/Game/Output/Skins/Blue Sensation/blue sensation.ini
index 48d2498a..b2ce4699 100644
--- a/Game/Output/Skins/Blue Sensation/blue sensation.ini
+++ b/Game/Output/Skins/Blue Sensation/blue sensation.ini
@@ -177,3 +177,4 @@ CallengeIcon=[icon]challenge.jpg
 ClassicIcon=[icon]classic.jpg

 MedleyIcon=[icon]medley.jpg

 CalcMedleyIcon=[icon]calcmedley.jpg

+DuetIcon=[icon]song_duet.jpg
\ No newline at end of file
diff --git a/Game/Output/Skins/Blue Sensation/blue simple.ini b/Game/Output/Skins/Blue Sensation/blue simple.ini
index 2e7e8efc..bbf2705f 100644
--- a/Game/Output/Skins/Blue Sensation/blue simple.ini
+++ b/Game/Output/Skins/Blue Sensation/blue simple.ini
@@ -177,3 +177,4 @@ CallengeIcon=[icon]challenge.jpg
 ClassicIcon=[icon]classic.jpg

 MedleyIcon=[icon]medley.jpg

 CalcMedleyIcon=[icon]calcmedley.jpg

+DuetIcon=[icon]song_duet.jpg

diff --git a/Game/Output/Skins/Blue Sensation/city.ini b/Game/Output/Skins/Blue Sensation/city.ini
index 843013c7..44f87ea6 100644
--- a/Game/Output/Skins/Blue Sensation/city.ini
+++ b/Game/Output/Skins/Blue Sensation/city.ini
@@ -176,4 +176,5 @@ Buttonmenu7=[main]buttonmenu7.jpg
 CallengeIcon=[icon]challenge.jpg

 ClassicIcon=[icon]classic.jpg

 MedleyIcon=[icon]medley.jpg

-CalcMedleyIcon=[icon]calcmedley.jpg
\ No newline at end of file
+CalcMedleyIcon=[icon]calcmedley.jpg

+DuetIcon=[icon]song_duet.jpg
\ No newline at end of file
diff --git a/Game/Output/Skins/Blue Sensation/flower.ini b/Game/Output/Skins/Blue Sensation/flower.ini
index c9f1d1fd..2f8cba17 100644
--- a/Game/Output/Skins/Blue Sensation/flower.ini
+++ b/Game/Output/Skins/Blue Sensation/flower.ini
@@ -176,4 +176,5 @@ Buttonmenu7=[main]buttonmenu7.jpg
 CallengeIcon=[icon]challenge.jpg

 ClassicIcon=[icon]classic.jpg

 MedleyIcon=[icon]medley.jpg

-CalcMedleyIcon=[icon]calcmedley.jpg
\ No newline at end of file
+CalcMedleyIcon=[icon]calcmedley.jpg

+DuetIcon=[icon]song_duet.jpg
\ No newline at end of file
diff --git a/Game/Output/Skins/Deluxe/Blue.ini b/Game/Output/Skins/Deluxe/Blue.ini
index a1ee31bc..1a306e8e 100644
--- a/Game/Output/Skins/Deluxe/Blue.ini
+++ b/Game/Output/Skins/Deluxe/Blue.ini
@@ -38,6 +38,7 @@ StatIcon       = [icon]stats.jpg
 VideoIcon      = [icon]video.jpg

 CalcMedleyIcon = [icon]calcmedley.jpg

 MedleyIcon     = [icon]medley.jpg

+DuetIcon       = [icon]song_duet.jpg

 

 IconError      = [icon]error.jpg

 IconQuestion   = [icon]question.jpg

diff --git a/Game/Output/Skins/Deluxe/Fall.ini b/Game/Output/Skins/Deluxe/Fall.ini
index c63aacb6..caafe762 100644
--- a/Game/Output/Skins/Deluxe/Fall.ini
+++ b/Game/Output/Skins/Deluxe/Fall.ini
@@ -38,6 +38,7 @@ StatIcon       = [icon]stats.jpg
 VideoIcon      = [icon]video.jpg

 CalcMedleyIcon = [icon]calcmedley.jpg

 MedleyIcon     = [icon]medley.jpg

+DuetIcon       = [icon]song_duet.jpg

 

 IconError      = [icon]error.jpg

 IconQuestion   = [icon]question.jpg

diff --git a/Game/Output/Skins/Deluxe/Summer.ini b/Game/Output/Skins/Deluxe/Summer.ini
index b9bd3dc8..3f3cc8a5 100644
--- a/Game/Output/Skins/Deluxe/Summer.ini
+++ b/Game/Output/Skins/Deluxe/Summer.ini
@@ -38,6 +38,7 @@ StatIcon       = [icon]stats.jpg
 VideoIcon      = [icon]video.jpg

 CalcMedleyIcon = [icon]calcmedley.jpg

 MedleyIcon     = [icon]medley.jpg

+DuetIcon       = [icon]song_duet.jpg

 

 IconError      = [icon]error.jpg

 IconQuestion   = [icon]question.jpg

diff --git a/Game/Output/Skins/Deluxe/Winter.ini b/Game/Output/Skins/Deluxe/Winter.ini
index 79b31ffb..eee3425b 100644
--- a/Game/Output/Skins/Deluxe/Winter.ini
+++ b/Game/Output/Skins/Deluxe/Winter.ini
@@ -38,6 +38,7 @@ StatIcon       = [icon]stats.jpg
 VideoIcon      = [icon]video.jpg

 CalcMedleyIcon = [icon]calcmedley.jpg

 MedleyIcon     = [icon]medley.jpg

+DuetIcon       = [icon]song_duet.jpg

 

 IconError      = [icon]error.jpg

 IconQuestion   = [icon]question.jpg

diff --git a/Game/Output/Skins/Deluxe/[icon]song_duet.jpg b/Game/Output/Skins/Deluxe/[icon]song_duet.jpg
new file mode 100644
index 00000000..55158f74
--- /dev/null
+++ b/Game/Output/Skins/Deluxe/[icon]song_duet.jpg
diff --git a/Game/Output/Skins/iStar/Apple.ini b/Game/Output/Skins/iStar/Apple.ini
index 71e69094..a997579f 100644
--- a/Game/Output/Skins/iStar/Apple.ini
+++ b/Game/Output/Skins/iStar/Apple.ini
@@ -163,6 +163,7 @@ ButtonFade =[helper]buttonFade2.jpg
 ButtonFadeMenu =[helper]buttonFade.jpg

 MedleyIcon=[icon]medley.jpg

 CalcMedleyIcon=[icon]calcmedley.jpg

+DuetIcon=[icon]song_duet.jpg

 ButtonFadeMenu4=[helper]buttonFade2.jpg

 Buttonmenu7=[main]buttonmenu7.jpg

 ButtonMenu9a=[main]buttonmenu9a.jpg

diff --git a/Game/Output/Skins/iStar/[icon]song_duet.jpg b/Game/Output/Skins/iStar/[icon]song_duet.jpg
new file mode 100644
index 00000000..55158f74
--- /dev/null
+++ b/Game/Output/Skins/iStar/[icon]song_duet.jpg