merge with current trunk (just update)

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1634 b956fd51-792f-4845-bead-9b4dfca2ff2c

6 files changed, 12 insertions, 0 deletions

diff --git a/unicode/game/themes/Deluxe/Blue.ini b/unicode/game/themes/Deluxe/Blue.ini
index 6f3c1e55..30c68e3e 100644
--- a/unicode/game/themes/Deluxe/Blue.ini
+++ b/unicode/game/themes/Deluxe/Blue.ini
@@ -36,12 +36,14 @@ SongBG         = [bg-main]blue.jpg
 ScoreScreenBG  = [bg-main]blue.jpg
 Top5BG         = [bg-main]blue.jpg
 OptionsBG      = [bg-main]blue.jpg
+EditBG         = [bg-main]blue.jpg
 PartyBG        = [bg-main]blue.jpg
 
 #Icons on screen
 SongCD         = [icon]cd.png
 MainIcon       = [icon]main.png
 IconOption     = [icon]options.png
+IconEdit     = [icon]options.png
 
 ScoreIcon      = [icon]score.png
 PartyIcon      = [icon]party.png
diff --git a/unicode/game/themes/Deluxe/Fall.ini b/unicode/game/themes/Deluxe/Fall.ini
index 57bf6539..72d9021b 100644
--- a/unicode/game/themes/Deluxe/Fall.ini
+++ b/unicode/game/themes/Deluxe/Fall.ini
@@ -22,6 +22,7 @@ SongBG         = [bg-main]fall.jpg
 ScoreScreenBG  = [bg-main]fall.jpg
 Top5BG         = [bg-main]fall.jpg
 OptionsBG      = [bg-main]fall.jpg
+EditBG         = [bg-main]fall.jpg
 PartyBG        = [bg-main]fall.jpg
 
 #Icons on screen
@@ -29,6 +30,7 @@ SongCD         = [icon]cd.png
 MainIcon       = [icon]main.png
 MainSearch     = [icon]search.png
 IconOption     = [icon]options.png
+IconEdit       = [icon]options.png
 IconSongMenu   = [icon]songmenu.png
 ScoreIcon      = [icon]score.png
 PartyIcon      = [icon]party.png
diff --git a/unicode/game/themes/Deluxe/Ribbon.ini b/unicode/game/themes/Deluxe/Ribbon.ini
index 0165a596..1631183e 100644
--- a/unicode/game/themes/Deluxe/Ribbon.ini
+++ b/unicode/game/themes/Deluxe/Ribbon.ini
@@ -23,6 +23,7 @@ SongBG         = [bg-video]ribbon.mov
 ScoreScreenBG  = [bg-video]ribbon.mov

 Top5BG         = [bg-video]ribbon.mov

 OptionsBG      = [bg-video]ribbon.mov

+EditBG         = [bg-video]ribbon.mov

 PartyBG        = [bg-video]ribbon.mov

 

 #Icons on screen

@@ -30,6 +31,7 @@ SongCD         = [icon]cd.png
 MainIcon       = [icon]main.png

 MainSearch     = [icon]search.png

 IconOption     = [icon]options.png

+IconEdit       = [icon]options.png

 IconSongMenu   = [icon]songmenu.png

 ScoreIcon      = [icon]score.png

 PartyIcon      = [icon]party.png

diff --git a/unicode/game/themes/Deluxe/Summer.ini b/unicode/game/themes/Deluxe/Summer.ini
index 85dc8e3f..3d40c2f8 100644
--- a/unicode/game/themes/Deluxe/Summer.ini
+++ b/unicode/game/themes/Deluxe/Summer.ini
@@ -22,6 +22,7 @@ SongBG         = [bg-main]summer.jpg
 ScoreScreenBG  = [bg-main]summer.jpg
 Top5BG         = [bg-main]summer.jpg
 OptionsBG      = [bg-main]summer.jpg
+EditBG         = [bg-main]summer.jpg
 PartyBG        = [bg-main]summer.jpg
 
 #Icons on screen
@@ -29,6 +30,7 @@ SongCD         = [icon]cd.png
 MainIcon       = [icon]main.png
 MainSearch     = [icon]search.png
 IconOption     = [icon]options.png
+IconEdit       = [icon]options.png
 IconSongMenu   = [icon]songmenu.png
 ScoreIcon      = [icon]score.png
 PartyIcon      = [icon]party.png
diff --git a/unicode/game/themes/Deluxe/Winter.ini b/unicode/game/themes/Deluxe/Winter.ini
index 0ececd74..32c37a02 100644
--- a/unicode/game/themes/Deluxe/Winter.ini
+++ b/unicode/game/themes/Deluxe/Winter.ini
@@ -22,6 +22,7 @@ SongBG         = [bg-main]winter.jpg
 ScoreScreenBG  = [bg-main]winter.jpg
 Top5BG         = [bg-main]winter.jpg
 OptionsBG      = [bg-main]winter.jpg
+EditBG         = [bg-main]winter.jpg
 PartyBG        = [bg-main]winter.jpg
 
 #Icons on screen
@@ -29,6 +30,7 @@ SongCD         = [icon]cd.png
 MainIcon       = [icon]main.png
 MainSearch     = [icon]search.png
 IconOption     = [icon]options.png
+IconEdit       = [icon]options.png
 IconSongMenu   = [icon]songmenu.png
 ScoreIcon      = [icon]score.png
 PartyIcon      = [icon]party.png
diff --git a/unicode/game/themes/Deluxe/ocean.ini b/unicode/game/themes/Deluxe/ocean.ini
index 82701c41..d18c7a60 100644
--- a/unicode/game/themes/Deluxe/ocean.ini
+++ b/unicode/game/themes/Deluxe/ocean.ini
@@ -22,6 +22,7 @@ SongBG         = [bg-video]_ocean.avi
 ScoreScreenBG  = [bg-video]_ocean.avi
 Top5BG         = [bg-video]_ocean.avi
 OptionsBG      = [bg-video]_ocean.avi
+EditBG         = [bg-video]_ocean.avi
 PartyBG        = [bg-video]_ocean.avi
 
 #Icons on screen
@@ -29,6 +30,7 @@ SongCD         = [icon]cd.png
 MainIcon       = [icon]main.png
 MainSearch     = [icon]search.png
 IconOption     = [icon]options.png
+IconEdit       = [icon]options.png
 IconSongMenu   = [icon]songmenu.png
 ScoreIcon      = [icon]score.png
 PartyIcon      = [icon]party.png