diff --git a/Themes/_fallback/Languages/de.ini b/Themes/_fallback/Languages/de.ini index 2ab081597b..502903faa9 100644 --- a/Themes/_fallback/Languages/de.ini +++ b/Themes/_fallback/Languages/de.ini @@ -783,6 +783,7 @@ Insanity=Wahnsinn Insert Entry=Insert Entry Instant=Sofort Invert=Invertieren +ITG=ITG Justice=Gerechtigkeit Left=Links LifeTime=Überleben @@ -811,6 +812,7 @@ NoLifts=No Lifts NoFakes=No Fakes None=Nichts Normal=Normal +Null=Null Num Songs=Anzahl Songs Off=Aus Old=Alt diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index 31ed90b626..8301880461 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -531,7 +531,7 @@ Transfer Edits to USB=Transfer Edits to USB Transfer Edits from USB=Transfer Edits from USB UseUnlockSystem=Enable or disable the unlock system. VisualDelaySeconds=Calibrate display lag. -DefaultGroupOffsetSeconds=Change the Default Sync Bias +MachineSyncBias=Set the default Sync Bias for content on this machine. \nITG = +9ms.\n Null= 0ms. Vsync=Cap your frame rate your display's refresh rate. This option only has an effect when the Display Mode is set to &oq;Full Screen&cq;. WideScreen16_9=Enable widescreen display. WideScreen16_10=Enable widescreen display. @@ -808,6 +808,7 @@ Insanity=Insanity Insert Entry=Insert Entry Instant=Instant Invert=Invert +ITG=ITG Justice=Justice Left=Left LifeTime=Survival @@ -838,6 +839,7 @@ NoLifts=No Lifts NoFakes=No Fakes None=None Normal=Normal +Null=Null Num Songs=Num Songs Off=Off Old=Old @@ -1309,7 +1311,7 @@ Undo=Undo UseUnlockSystem=Unlock System View steps data=View Steps Data VisualDelaySeconds=Visual Delay -DefaultGroupOffsetSeconds=Default Group Offset +MachineSyncBias=Default Group Offset Voltage=Voltage Vsync=Wait For Vsync Warps=Warps diff --git a/Themes/_fallback/Languages/es.ini b/Themes/_fallback/Languages/es.ini index abbd3cfcaf..ce046527ec 100644 --- a/Themes/_fallback/Languages/es.ini +++ b/Themes/_fallback/Languages/es.ini @@ -709,6 +709,7 @@ Insanity=Locura Insert Entry=Insertar entrada Instant=Instantáneo Invert=Invertir +ITG=ITG Justice=Justicia Left=Izquierda LifeTime=Supervivencia @@ -736,6 +737,7 @@ NoLifts=Sin sueltos NoFakes=Sin falsos None=Ninguno Normal=Normal +Null=Null Num Songs=Núm. canciones Off=Desactivado Old=Antiguo diff --git a/Themes/_fallback/Languages/fr.ini b/Themes/_fallback/Languages/fr.ini index 9b8bdaf51a..7538a6dd73 100644 --- a/Themes/_fallback/Languages/fr.ini +++ b/Themes/_fallback/Languages/fr.ini @@ -771,6 +771,7 @@ Insanity=Fou Insert Entry=Insérez une Entrée Instant=Instant Invert=Inversé +ITG=ITG Justice=Justice Left=Sens Anti-Horaire LifeTime=Survie @@ -799,6 +800,7 @@ NoLifts=Lever NoFakes=Fausses None=Aucun Normal=Normal +Null=Null Num Songs=# Chansons Off=Off Old=Vieux diff --git a/Themes/_fallback/Languages/ja.ini b/Themes/_fallback/Languages/ja.ini index 3713eb3921..229ae817c0 100644 --- a/Themes/_fallback/Languages/ja.ini +++ b/Themes/_fallback/Languages/ja.ini @@ -851,6 +851,7 @@ Insanity=Insanity Insert Entry=Insert Entry Instant=Instant Invert=Invert +ITG=ITG Justice=Justice Left=Left LifeTime=Survival @@ -879,6 +880,7 @@ NoLifts=No Lifts NoFakes=No Fakes None=None Normal=Normal +Null=Null Num Songs=Num Songs Off=Off Old=Old diff --git a/Themes/_fallback/Languages/nl.ini b/Themes/_fallback/Languages/nl.ini index 4f24ca908e..fc78841ee1 100644 --- a/Themes/_fallback/Languages/nl.ini +++ b/Themes/_fallback/Languages/nl.ini @@ -768,6 +768,7 @@ Insanity=Krankzinnig Insert Entry=Gegevens Invoegen Instant=Instant Invert=Omgekeerd +ITG=ITG Justice=Gerechtigheid Left=Links LifeTime=Survival @@ -796,6 +797,7 @@ NoRolls=Geen Rollen NoStretch=Geen Rekking None=Geen Normal=Normaal +Null=Null Num Songs=Num Nummers Off=Uit Old=Oud diff --git a/Themes/_fallback/Languages/pl.ini b/Themes/_fallback/Languages/pl.ini index 2abcc00bf7..0bae43a001 100644 --- a/Themes/_fallback/Languages/pl.ini +++ b/Themes/_fallback/Languages/pl.ini @@ -769,6 +769,7 @@ Insanity=Obłęd Insert Entry=Wstaw Wpis Instant=Natychmiast Invert=Odwrócone +ITG=ITG Justice=Sprawiedliwie Left=Lewo LifeTime=Przetrwanie @@ -797,6 +798,7 @@ NoLifts=Bez Liftów NoFakes=Bez Podrób None=Żaden Normal=Normalny +Null=Null Num Songs=Dzwięki Klawisza Off=Wyłącz Old=Stare diff --git a/Themes/_fallback/Languages/sk.ini b/Themes/_fallback/Languages/sk.ini index 74c017f316..4ac0b2f90e 100644 --- a/Themes/_fallback/Languages/sk.ini +++ b/Themes/_fallback/Languages/sk.ini @@ -785,6 +785,7 @@ Insanity=Šialenstvo Insert Entry=Vložiť položku Instant=Okamžité Invert=Obrátiť +ITG=ITG Justice=Spravodlivosť Left=Doľava LifeTime=Prežitie @@ -813,6 +814,7 @@ NoLifts=Bez liftov NoFakes=Bez klamov None=Žiadne Normal=Normálny +Null=Null Num Songs=Počet skladieb Off=Vyp Old=Staré diff --git a/Themes/_fallback/Languages/zh-Hant.ini b/Themes/_fallback/Languages/zh-Hant.ini index c23dadac47..e1afc28534 100644 --- a/Themes/_fallback/Languages/zh-Hant.ini +++ b/Themes/_fallback/Languages/zh-Hant.ini @@ -784,6 +784,7 @@ Insanity=極難 Insert Entry=添加空白組曲 Instant=立即退出 Invert=倒置 +ITG=ITG Justice=神的準度 Left=左轉 LifeTime=生存時間 @@ -812,6 +813,7 @@ NoLifts=無放開(離鍵) NoFakes=無假箭頭 None=None Normal=普通 +Null=Null Num Songs=歌曲數 Off=關 Old=舊 diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 368b6539e3..75f244f53c 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -3092,7 +3092,7 @@ Line17="conf,SoundVolume" Line18="conf,EnableAttackSounds" Line19="conf,EnableMineHitSound" Line20="conf,VisualDelaySeconds" -Line21="conf,DefaultGroupOffsetSeconds" +Line21="conf,MachineSyncBias" Line22="conf,RateModPreservesPitch", [ScreenOptionsAdvanced] diff --git a/src/Group.cpp b/src/Group.cpp index 034ac2dad7..4d539b1179 100644 --- a/src/Group.cpp +++ b/src/Group.cpp @@ -43,7 +43,7 @@ Group::Group(const RString& sDir, const RString& sGroupDirName) { RString Series = ""; RString bannerPath = ""; RString authorsNotes = ""; - float fOffset = PREFSMAN->m_fDefaultGroupOffsetSeconds; + float fOffset = PREFSMAN->m_fMachineSyncBias; if (FILEMAN->DoesFileExist(sPackIniPath)) { IniFile ini; @@ -83,7 +83,9 @@ Group::Group(const RString& sDir, const RString& sGroupDirName) { ini.GetValue("Group", "AuthorsNotes", authorsNotes); } else { m_bHasPackIni = false; + fOffset = PREFSMAN->m_fMachineSyncBias; } + // Look for a group banner in this group folder std::vector arrayGroupBanners; diff --git a/src/PrefsManager.cpp b/src/PrefsManager.cpp index b14801a0aa..bd638e1ad8 100644 --- a/src/PrefsManager.cpp +++ b/src/PrefsManager.cpp @@ -237,7 +237,7 @@ PrefsManager::PrefsManager() : m_ShowDancingCharacters ( "ShowDancingCharacters", SDC_Random ), m_bUseUnlockSystem ( "UseUnlockSystem", false ), m_fGlobalOffsetSeconds ( "GlobalOffsetSeconds", -0.008f ), - m_fDefaultGroupOffsetSeconds ( "DefaultGroupOffsetSeconds", 0.0f ), + m_fMachineSyncBias ( "MachineSyncBias", -0.009f ), m_iProgressiveLifebar ( "ProgressiveLifebar", 0 ), m_iProgressiveStageLifebar ( "ProgressiveStageLifebar", 0 ), m_iProgressiveNonstopLifebar ( "ProgressiveNonstopLifebar", 0 ), diff --git a/src/PrefsManager.h b/src/PrefsManager.h index d538bb8c02..354703c4ad 100644 --- a/src/PrefsManager.h +++ b/src/PrefsManager.h @@ -240,7 +240,7 @@ public: Preference m_ShowDancingCharacters; Preference m_bUseUnlockSystem; Preference m_fGlobalOffsetSeconds; - Preference m_fDefaultGroupOffsetSeconds; + Preference m_fMachineSyncBias; Preference m_iProgressiveLifebar; Preference m_iProgressiveStageLifebar; Preference m_iProgressiveNonstopLifebar; diff --git a/src/ScreenOptionsMasterPrefs.cpp b/src/ScreenOptionsMasterPrefs.cpp index 1b7e6f4964..19df3c3cfd 100644 --- a/src/ScreenOptionsMasterPrefs.cpp +++ b/src/ScreenOptionsMasterPrefs.cpp @@ -710,7 +710,7 @@ static void GlobalOffsetSeconds( int &sel, bool ToSel, const ConfOption *pConfOp MoveMap( sel, pConfOption, ToSel, mapping, ARRAYLEN(mapping) ); } -static void DefaultGroupOffsetSeconds( int &sel, bool ToSel, const ConfOption *pConfOption ) +static void MachineSyncBias( int &sel, bool ToSel, const ConfOption *pConfOption ) { const float mapping[] = { 0.0f, 0.009f }; MoveMap( sel, pConfOption, ToSel, mapping, ARRAYLEN(mapping) ); @@ -947,7 +947,7 @@ static void InitializeConfOptions() c.AddOption( ssprintf("%+i ms", i) ); ADD( c ); } - ADD( ConfOption( "DefaultGroupOffsetSeconds", DefaultGroupOffsetSeconds, "Null","|ITG" ) ); + ADD( ConfOption( "MachineSyncBias", MachineSyncBias, "Null","|ITG" ) ); ADD( ConfOption( "EnableAttackSounds", MovePref, "No","Yes" ) ); ADD( ConfOption( "EnableMineHitSound", MovePref, "No","Yes" ) ); ADD( ConfOption( "RateModPreservesPitch", MovePref, "No","Yes") );