diff --git a/Themes/_fallback/Scripts/02 Actor.lua b/Themes/_fallback/Scripts/02 Actor.lua index 4372b177f6..a86bf5e864 100644 --- a/Themes/_fallback/Scripts/02 Actor.lua +++ b/Themes/_fallback/Scripts/02 Actor.lua @@ -374,6 +374,18 @@ end -- command aliases: function Actor:SetSize(w,h) self:setsize(w,h) end +-- Simple draworder mappings +DrawOrder = { + Background = -100, + Underlay = 0, + Decorations = 100, + Content = 105, + Screen = 120, + Overlay = 200 +}; + +-- function Actor:SetDrawOrder + -- deprecated aliases: function Actor:hidden(bHide) Warn("hidden is deprecated, use visible instead. (used on ".. self:GetName() ..")") diff --git a/Themes/_fallback/Sounds/ScreenGameplay music.redir b/Themes/_fallback/Sounds/ScreenGameplay music.redir new file mode 100644 index 0000000000..1f8565ca21 --- /dev/null +++ b/Themes/_fallback/Sounds/ScreenGameplay music.redir @@ -0,0 +1 @@ +_silent \ No newline at end of file diff --git a/Themes/_fallback/Sounds/ScreenGameplayNormal music.redir b/Themes/_fallback/Sounds/ScreenGameplayNormal music.redir new file mode 100644 index 0000000000..1f8565ca21 --- /dev/null +++ b/Themes/_fallback/Sounds/ScreenGameplayNormal music.redir @@ -0,0 +1 @@ +_silent \ No newline at end of file diff --git a/Themes/_fallback/Sounds/ScreenOptionsServiceChild music.redir b/Themes/_fallback/Sounds/ScreenOptionsServiceChild music.redir new file mode 100644 index 0000000000..1f8565ca21 --- /dev/null +++ b/Themes/_fallback/Sounds/ScreenOptionsServiceChild music.redir @@ -0,0 +1 @@ +_silent \ No newline at end of file diff --git a/Themes/default/Scripts/02 ThemePrefs.lua b/Themes/default/Scripts/02 ThemePrefs.lua index a2fbfe7aa0..f495f03727 100644 --- a/Themes/default/Scripts/02 ThemePrefs.lua +++ b/Themes/default/Scripts/02 ThemePrefs.lua @@ -92,6 +92,7 @@ ThemePrefs.InitAll(Prefs) function InitUserPrefs() local Prefs = { UserPrefScoringMode = 'DDR Extreme', + UserPrefSoundPack = 'default', UserPrefProtimingP1 = false, UserPrefProtimingP2 = false, } diff --git a/Themes/default/Sounds/Common Start.redir b/Themes/default/Sounds/Common Start.redir new file mode 100644 index 0000000000..95194bc11e --- /dev/null +++ b/Themes/default/Sounds/Common Start.redir @@ -0,0 +1 @@ +default/Common Start \ No newline at end of file diff --git a/Themes/default/Sounds/Common invalid.redir b/Themes/default/Sounds/Common invalid.redir new file mode 100644 index 0000000000..9a52ca1117 --- /dev/null +++ b/Themes/default/Sounds/Common invalid.redir @@ -0,0 +1 @@ +default/Common invalid \ No newline at end of file diff --git a/Themes/default/Sounds/Common value.redir b/Themes/default/Sounds/Common value.redir new file mode 100644 index 0000000000..d7b22ba590 --- /dev/null +++ b/Themes/default/Sounds/Common value.redir @@ -0,0 +1 @@ +default/Common value \ No newline at end of file diff --git a/Themes/default/Sounds/MenuTimer tick.redir b/Themes/default/Sounds/MenuTimer tick.redir new file mode 100644 index 0000000000..1f434b3128 --- /dev/null +++ b/Themes/default/Sounds/MenuTimer tick.redir @@ -0,0 +1 @@ +default/MenuTimer tick \ No newline at end of file diff --git a/Themes/default/Sounds/MusicWheel change.redir b/Themes/default/Sounds/MusicWheel change.redir new file mode 100644 index 0000000000..6177f54d06 --- /dev/null +++ b/Themes/default/Sounds/MusicWheel change.redir @@ -0,0 +1 @@ +default/MusicWheel change \ No newline at end of file diff --git a/Themes/default/Sounds/ScreenGameplay failed.redir b/Themes/default/Sounds/ScreenGameplay failed.redir new file mode 100644 index 0000000000..dd33b181c2 --- /dev/null +++ b/Themes/default/Sounds/ScreenGameplay failed.redir @@ -0,0 +1 @@ +default/ScreenGameplay failed \ No newline at end of file diff --git a/Themes/default/Sounds/ScreenOptionsService music.redir b/Themes/default/Sounds/ScreenOptionsService music.redir new file mode 100644 index 0000000000..1f8565ca21 --- /dev/null +++ b/Themes/default/Sounds/ScreenOptionsService music.redir @@ -0,0 +1 @@ +_silent \ No newline at end of file diff --git a/Themes/default/Sounds/_Music credits.redir b/Themes/default/Sounds/_Music credits.redir new file mode 100644 index 0000000000..153ddc018f --- /dev/null +++ b/Themes/default/Sounds/_Music credits.redir @@ -0,0 +1 @@ +default/_Music credits (loop) \ No newline at end of file diff --git a/Themes/default/Sounds/_Music title (loop).redir b/Themes/default/Sounds/_Music title (loop).redir new file mode 100644 index 0000000000..4e0938f444 --- /dev/null +++ b/Themes/default/Sounds/_Music title (loop).redir @@ -0,0 +1 @@ +default/_Music title (loop) \ No newline at end of file diff --git a/Themes/default/Sounds/_Screen cancel.redir b/Themes/default/Sounds/_Screen cancel.redir new file mode 100644 index 0000000000..b8c4407235 --- /dev/null +++ b/Themes/default/Sounds/_Screen cancel.redir @@ -0,0 +1 @@ +default/_Screen cancel \ No newline at end of file diff --git a/Themes/default/Sounds/_common row.redir b/Themes/default/Sounds/_common row.redir new file mode 100644 index 0000000000..e262f3b3d6 --- /dev/null +++ b/Themes/default/Sounds/_common row.redir @@ -0,0 +1 @@ +default/_common row \ No newline at end of file diff --git a/Themes/default/Sounds/_switch down.redir b/Themes/default/Sounds/_switch down.redir new file mode 100644 index 0000000000..a5e8d133aa --- /dev/null +++ b/Themes/default/Sounds/_switch down.redir @@ -0,0 +1 @@ +default/_switch down \ No newline at end of file diff --git a/Themes/default/Sounds/_switch up.redir b/Themes/default/Sounds/_switch up.redir new file mode 100644 index 0000000000..45af200eae --- /dev/null +++ b/Themes/default/Sounds/_switch up.redir @@ -0,0 +1 @@ +default/_switch up \ No newline at end of file diff --git a/Themes/default/Sounds/Common Start.ogg b/Themes/default/Sounds/default/Common Start.ogg similarity index 100% rename from Themes/default/Sounds/Common Start.ogg rename to Themes/default/Sounds/default/Common Start.ogg diff --git a/Themes/default/Sounds/Common invalid.ogg b/Themes/default/Sounds/default/Common invalid.ogg similarity index 100% rename from Themes/default/Sounds/Common invalid.ogg rename to Themes/default/Sounds/default/Common invalid.ogg diff --git a/Themes/default/Sounds/Common value.ogg b/Themes/default/Sounds/default/Common value.ogg similarity index 100% rename from Themes/default/Sounds/Common value.ogg rename to Themes/default/Sounds/default/Common value.ogg diff --git a/Themes/default/Sounds/MenuTimer tick.ogg b/Themes/default/Sounds/default/MenuTimer tick.ogg similarity index 100% rename from Themes/default/Sounds/MenuTimer tick.ogg rename to Themes/default/Sounds/default/MenuTimer tick.ogg diff --git a/Themes/default/Sounds/MusicWheel change.ogg b/Themes/default/Sounds/default/MusicWheel change.ogg similarity index 100% rename from Themes/default/Sounds/MusicWheel change.ogg rename to Themes/default/Sounds/default/MusicWheel change.ogg diff --git a/Themes/default/Sounds/ScreenGameplay failed.ogg b/Themes/default/Sounds/default/ScreenGameplay failed.ogg similarity index 100% rename from Themes/default/Sounds/ScreenGameplay failed.ogg rename to Themes/default/Sounds/default/ScreenGameplay failed.ogg diff --git a/Themes/default/Sounds/_Music credits (loop).ogg b/Themes/default/Sounds/default/_Music credits (loop).ogg similarity index 100% rename from Themes/default/Sounds/_Music credits (loop).ogg rename to Themes/default/Sounds/default/_Music credits (loop).ogg diff --git a/Themes/default/Sounds/_Music title (loop).ogg b/Themes/default/Sounds/default/_Music title (loop).ogg similarity index 100% rename from Themes/default/Sounds/_Music title (loop).ogg rename to Themes/default/Sounds/default/_Music title (loop).ogg diff --git a/Themes/default/Sounds/_Screen cancel.ogg b/Themes/default/Sounds/default/_Screen cancel.ogg similarity index 100% rename from Themes/default/Sounds/_Screen cancel.ogg rename to Themes/default/Sounds/default/_Screen cancel.ogg diff --git a/Themes/default/Sounds/_common row.ogg b/Themes/default/Sounds/default/_common row.ogg similarity index 100% rename from Themes/default/Sounds/_common row.ogg rename to Themes/default/Sounds/default/_common row.ogg diff --git a/Themes/default/Sounds/_switch down.ogg b/Themes/default/Sounds/default/_switch down.ogg similarity index 100% rename from Themes/default/Sounds/_switch down.ogg rename to Themes/default/Sounds/default/_switch down.ogg diff --git a/Themes/default/Sounds/_switch up.ogg b/Themes/default/Sounds/default/_switch up.ogg similarity index 100% rename from Themes/default/Sounds/_switch up.ogg rename to Themes/default/Sounds/default/_switch up.ogg diff --git a/Themes/default/Sounds/kommisar/Common Start.ogg b/Themes/default/Sounds/kommisar/Common Start.ogg new file mode 100644 index 0000000000..c8c21bf8f2 Binary files /dev/null and b/Themes/default/Sounds/kommisar/Common Start.ogg differ diff --git a/Themes/default/Sounds/kommisar/Common invalid.ogg b/Themes/default/Sounds/kommisar/Common invalid.ogg new file mode 100644 index 0000000000..9635d6dba6 Binary files /dev/null and b/Themes/default/Sounds/kommisar/Common invalid.ogg differ diff --git a/Themes/default/Sounds/kommisar/Common value.ogg b/Themes/default/Sounds/kommisar/Common value.ogg new file mode 100644 index 0000000000..9635d6dba6 Binary files /dev/null and b/Themes/default/Sounds/kommisar/Common value.ogg differ diff --git a/Themes/default/Sounds/kommisar/MenuTimer tick.ogg b/Themes/default/Sounds/kommisar/MenuTimer tick.ogg new file mode 100644 index 0000000000..19e0f51f9e Binary files /dev/null and b/Themes/default/Sounds/kommisar/MenuTimer tick.ogg differ diff --git a/Themes/default/Sounds/kommisar/MusicWheel change.ogg b/Themes/default/Sounds/kommisar/MusicWheel change.ogg new file mode 100644 index 0000000000..868f73100f Binary files /dev/null and b/Themes/default/Sounds/kommisar/MusicWheel change.ogg differ diff --git a/Themes/default/Sounds/kommisar/ScreenGameplay failed.ogg b/Themes/default/Sounds/kommisar/ScreenGameplay failed.ogg new file mode 100644 index 0000000000..d781d08710 Binary files /dev/null and b/Themes/default/Sounds/kommisar/ScreenGameplay failed.ogg differ diff --git a/Themes/default/Sounds/kommisar/_Music credits (loop).ogg b/Themes/default/Sounds/kommisar/_Music credits (loop).ogg new file mode 100644 index 0000000000..2d5db646dd Binary files /dev/null and b/Themes/default/Sounds/kommisar/_Music credits (loop).ogg differ diff --git a/Themes/default/Sounds/kommisar/_Music title (loop).ogg b/Themes/default/Sounds/kommisar/_Music title (loop).ogg new file mode 100644 index 0000000000..9e5e435cf8 Binary files /dev/null and b/Themes/default/Sounds/kommisar/_Music title (loop).ogg differ diff --git a/Themes/default/Sounds/kommisar/_Screen cancel.ogg b/Themes/default/Sounds/kommisar/_Screen cancel.ogg new file mode 100644 index 0000000000..0180c71d73 Binary files /dev/null and b/Themes/default/Sounds/kommisar/_Screen cancel.ogg differ diff --git a/Themes/default/Sounds/kommisar/_common row.ogg b/Themes/default/Sounds/kommisar/_common row.ogg new file mode 100644 index 0000000000..9635d6dba6 Binary files /dev/null and b/Themes/default/Sounds/kommisar/_common row.ogg differ diff --git a/Themes/default/Sounds/kommisar/_switch down.ogg b/Themes/default/Sounds/kommisar/_switch down.ogg new file mode 100644 index 0000000000..b2f3e41adb Binary files /dev/null and b/Themes/default/Sounds/kommisar/_switch down.ogg differ diff --git a/Themes/default/Sounds/kommisar/_switch up.ogg b/Themes/default/Sounds/kommisar/_switch up.ogg new file mode 100644 index 0000000000..b2f3e41adb Binary files /dev/null and b/Themes/default/Sounds/kommisar/_switch up.ogg differ