reimplement "SyncBias" as something that tells us the sync of the pack so we may adjust accordingly rather than the blanket sync to apply to the pack.
This commit is contained in:
@@ -783,6 +783,7 @@ Insanity=Wahnsinn
|
|||||||
Insert Entry=Insert Entry
|
Insert Entry=Insert Entry
|
||||||
Instant=Sofort
|
Instant=Sofort
|
||||||
Invert=Invertieren
|
Invert=Invertieren
|
||||||
|
ITG=ITG
|
||||||
Justice=Gerechtigkeit
|
Justice=Gerechtigkeit
|
||||||
Left=Links
|
Left=Links
|
||||||
LifeTime=Überleben
|
LifeTime=Überleben
|
||||||
@@ -811,6 +812,7 @@ NoLifts=No Lifts
|
|||||||
NoFakes=No Fakes
|
NoFakes=No Fakes
|
||||||
None=Nichts
|
None=Nichts
|
||||||
Normal=Normal
|
Normal=Normal
|
||||||
|
Null=Null
|
||||||
Num Songs=Anzahl Songs
|
Num Songs=Anzahl Songs
|
||||||
Off=Aus
|
Off=Aus
|
||||||
Old=Alt
|
Old=Alt
|
||||||
|
|||||||
@@ -531,7 +531,7 @@ Transfer Edits to USB=Transfer Edits to USB
|
|||||||
Transfer Edits from USB=Transfer Edits from USB
|
Transfer Edits from USB=Transfer Edits from USB
|
||||||
UseUnlockSystem=Enable or disable the unlock system.
|
UseUnlockSystem=Enable or disable the unlock system.
|
||||||
VisualDelaySeconds=Calibrate display lag.
|
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;.
|
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_9=Enable widescreen display.
|
||||||
WideScreen16_10=Enable widescreen display.
|
WideScreen16_10=Enable widescreen display.
|
||||||
@@ -808,6 +808,7 @@ Insanity=Insanity
|
|||||||
Insert Entry=Insert Entry
|
Insert Entry=Insert Entry
|
||||||
Instant=Instant
|
Instant=Instant
|
||||||
Invert=Invert
|
Invert=Invert
|
||||||
|
ITG=ITG
|
||||||
Justice=Justice
|
Justice=Justice
|
||||||
Left=Left
|
Left=Left
|
||||||
LifeTime=Survival
|
LifeTime=Survival
|
||||||
@@ -838,6 +839,7 @@ NoLifts=No Lifts
|
|||||||
NoFakes=No Fakes
|
NoFakes=No Fakes
|
||||||
None=None
|
None=None
|
||||||
Normal=Normal
|
Normal=Normal
|
||||||
|
Null=Null
|
||||||
Num Songs=Num Songs
|
Num Songs=Num Songs
|
||||||
Off=Off
|
Off=Off
|
||||||
Old=Old
|
Old=Old
|
||||||
@@ -1309,7 +1311,7 @@ Undo=Undo
|
|||||||
UseUnlockSystem=Unlock System
|
UseUnlockSystem=Unlock System
|
||||||
View steps data=View Steps Data
|
View steps data=View Steps Data
|
||||||
VisualDelaySeconds=Visual Delay
|
VisualDelaySeconds=Visual Delay
|
||||||
DefaultGroupOffsetSeconds=Default Group Offset
|
MachineSyncBias=Default Group Offset
|
||||||
Voltage=Voltage
|
Voltage=Voltage
|
||||||
Vsync=Wait For Vsync
|
Vsync=Wait For Vsync
|
||||||
Warps=Warps
|
Warps=Warps
|
||||||
|
|||||||
@@ -709,6 +709,7 @@ Insanity=Locura
|
|||||||
Insert Entry=Insertar entrada
|
Insert Entry=Insertar entrada
|
||||||
Instant=Instantáneo
|
Instant=Instantáneo
|
||||||
Invert=Invertir
|
Invert=Invertir
|
||||||
|
ITG=ITG
|
||||||
Justice=Justicia
|
Justice=Justicia
|
||||||
Left=Izquierda
|
Left=Izquierda
|
||||||
LifeTime=Supervivencia
|
LifeTime=Supervivencia
|
||||||
@@ -736,6 +737,7 @@ NoLifts=Sin sueltos
|
|||||||
NoFakes=Sin falsos
|
NoFakes=Sin falsos
|
||||||
None=Ninguno
|
None=Ninguno
|
||||||
Normal=Normal
|
Normal=Normal
|
||||||
|
Null=Null
|
||||||
Num Songs=Núm. canciones
|
Num Songs=Núm. canciones
|
||||||
Off=Desactivado
|
Off=Desactivado
|
||||||
Old=Antiguo
|
Old=Antiguo
|
||||||
|
|||||||
@@ -771,6 +771,7 @@ Insanity=Fou
|
|||||||
Insert Entry=Insérez une Entrée
|
Insert Entry=Insérez une Entrée
|
||||||
Instant=Instant
|
Instant=Instant
|
||||||
Invert=Inversé
|
Invert=Inversé
|
||||||
|
ITG=ITG
|
||||||
Justice=Justice
|
Justice=Justice
|
||||||
Left=Sens Anti-Horaire
|
Left=Sens Anti-Horaire
|
||||||
LifeTime=Survie
|
LifeTime=Survie
|
||||||
@@ -799,6 +800,7 @@ NoLifts=Lever
|
|||||||
NoFakes=Fausses
|
NoFakes=Fausses
|
||||||
None=Aucun
|
None=Aucun
|
||||||
Normal=Normal
|
Normal=Normal
|
||||||
|
Null=Null
|
||||||
Num Songs=# Chansons
|
Num Songs=# Chansons
|
||||||
Off=Off
|
Off=Off
|
||||||
Old=Vieux
|
Old=Vieux
|
||||||
|
|||||||
@@ -851,6 +851,7 @@ Insanity=Insanity
|
|||||||
Insert Entry=Insert Entry
|
Insert Entry=Insert Entry
|
||||||
Instant=Instant
|
Instant=Instant
|
||||||
Invert=Invert
|
Invert=Invert
|
||||||
|
ITG=ITG
|
||||||
Justice=Justice
|
Justice=Justice
|
||||||
Left=Left
|
Left=Left
|
||||||
LifeTime=Survival
|
LifeTime=Survival
|
||||||
@@ -879,6 +880,7 @@ NoLifts=No Lifts
|
|||||||
NoFakes=No Fakes
|
NoFakes=No Fakes
|
||||||
None=None
|
None=None
|
||||||
Normal=Normal
|
Normal=Normal
|
||||||
|
Null=Null
|
||||||
Num Songs=Num Songs
|
Num Songs=Num Songs
|
||||||
Off=Off
|
Off=Off
|
||||||
Old=Old
|
Old=Old
|
||||||
|
|||||||
@@ -768,6 +768,7 @@ Insanity=Krankzinnig
|
|||||||
Insert Entry=Gegevens Invoegen
|
Insert Entry=Gegevens Invoegen
|
||||||
Instant=Instant
|
Instant=Instant
|
||||||
Invert=Omgekeerd
|
Invert=Omgekeerd
|
||||||
|
ITG=ITG
|
||||||
Justice=Gerechtigheid
|
Justice=Gerechtigheid
|
||||||
Left=Links
|
Left=Links
|
||||||
LifeTime=Survival
|
LifeTime=Survival
|
||||||
@@ -796,6 +797,7 @@ NoRolls=Geen Rollen
|
|||||||
NoStretch=Geen Rekking
|
NoStretch=Geen Rekking
|
||||||
None=Geen
|
None=Geen
|
||||||
Normal=Normaal
|
Normal=Normaal
|
||||||
|
Null=Null
|
||||||
Num Songs=Num Nummers
|
Num Songs=Num Nummers
|
||||||
Off=Uit
|
Off=Uit
|
||||||
Old=Oud
|
Old=Oud
|
||||||
|
|||||||
@@ -769,6 +769,7 @@ Insanity=Obłęd
|
|||||||
Insert Entry=Wstaw Wpis
|
Insert Entry=Wstaw Wpis
|
||||||
Instant=Natychmiast
|
Instant=Natychmiast
|
||||||
Invert=Odwrócone
|
Invert=Odwrócone
|
||||||
|
ITG=ITG
|
||||||
Justice=Sprawiedliwie
|
Justice=Sprawiedliwie
|
||||||
Left=Lewo
|
Left=Lewo
|
||||||
LifeTime=Przetrwanie
|
LifeTime=Przetrwanie
|
||||||
@@ -797,6 +798,7 @@ NoLifts=Bez Liftów
|
|||||||
NoFakes=Bez Podrób
|
NoFakes=Bez Podrób
|
||||||
None=Żaden
|
None=Żaden
|
||||||
Normal=Normalny
|
Normal=Normalny
|
||||||
|
Null=Null
|
||||||
Num Songs=Dzwięki Klawisza
|
Num Songs=Dzwięki Klawisza
|
||||||
Off=Wyłącz
|
Off=Wyłącz
|
||||||
Old=Stare
|
Old=Stare
|
||||||
|
|||||||
@@ -785,6 +785,7 @@ Insanity=Šialenstvo
|
|||||||
Insert Entry=Vložiť položku
|
Insert Entry=Vložiť položku
|
||||||
Instant=Okamžité
|
Instant=Okamžité
|
||||||
Invert=Obrátiť
|
Invert=Obrátiť
|
||||||
|
ITG=ITG
|
||||||
Justice=Spravodlivosť
|
Justice=Spravodlivosť
|
||||||
Left=Doľava
|
Left=Doľava
|
||||||
LifeTime=Prežitie
|
LifeTime=Prežitie
|
||||||
@@ -813,6 +814,7 @@ NoLifts=Bez liftov
|
|||||||
NoFakes=Bez klamov
|
NoFakes=Bez klamov
|
||||||
None=Žiadne
|
None=Žiadne
|
||||||
Normal=Normálny
|
Normal=Normálny
|
||||||
|
Null=Null
|
||||||
Num Songs=Počet skladieb
|
Num Songs=Počet skladieb
|
||||||
Off=Vyp
|
Off=Vyp
|
||||||
Old=Staré
|
Old=Staré
|
||||||
|
|||||||
@@ -784,6 +784,7 @@ Insanity=極難
|
|||||||
Insert Entry=添加空白組曲
|
Insert Entry=添加空白組曲
|
||||||
Instant=立即退出
|
Instant=立即退出
|
||||||
Invert=倒置
|
Invert=倒置
|
||||||
|
ITG=ITG
|
||||||
Justice=神的準度
|
Justice=神的準度
|
||||||
Left=左轉
|
Left=左轉
|
||||||
LifeTime=生存時間
|
LifeTime=生存時間
|
||||||
@@ -812,6 +813,7 @@ NoLifts=無放開(離鍵)
|
|||||||
NoFakes=無假箭頭
|
NoFakes=無假箭頭
|
||||||
None=None
|
None=None
|
||||||
Normal=普通
|
Normal=普通
|
||||||
|
Null=Null
|
||||||
Num Songs=歌曲數
|
Num Songs=歌曲數
|
||||||
Off=關
|
Off=關
|
||||||
Old=舊
|
Old=舊
|
||||||
|
|||||||
@@ -3092,7 +3092,7 @@ Line17="conf,SoundVolume"
|
|||||||
Line18="conf,EnableAttackSounds"
|
Line18="conf,EnableAttackSounds"
|
||||||
Line19="conf,EnableMineHitSound"
|
Line19="conf,EnableMineHitSound"
|
||||||
Line20="conf,VisualDelaySeconds"
|
Line20="conf,VisualDelaySeconds"
|
||||||
Line21="conf,DefaultGroupOffsetSeconds"
|
Line21="conf,MachineSyncBias"
|
||||||
Line22="conf,RateModPreservesPitch",
|
Line22="conf,RateModPreservesPitch",
|
||||||
|
|
||||||
[ScreenOptionsAdvanced]
|
[ScreenOptionsAdvanced]
|
||||||
|
|||||||
+3
-1
@@ -43,7 +43,7 @@ Group::Group(const RString& sDir, const RString& sGroupDirName) {
|
|||||||
RString Series = "";
|
RString Series = "";
|
||||||
RString bannerPath = "";
|
RString bannerPath = "";
|
||||||
RString authorsNotes = "";
|
RString authorsNotes = "";
|
||||||
float fOffset = PREFSMAN->m_fDefaultGroupOffsetSeconds;
|
float fOffset = PREFSMAN->m_fMachineSyncBias;
|
||||||
|
|
||||||
if (FILEMAN->DoesFileExist(sPackIniPath)) {
|
if (FILEMAN->DoesFileExist(sPackIniPath)) {
|
||||||
IniFile ini;
|
IniFile ini;
|
||||||
@@ -83,8 +83,10 @@ Group::Group(const RString& sDir, const RString& sGroupDirName) {
|
|||||||
ini.GetValue("Group", "AuthorsNotes", authorsNotes);
|
ini.GetValue("Group", "AuthorsNotes", authorsNotes);
|
||||||
} else {
|
} else {
|
||||||
m_bHasPackIni = false;
|
m_bHasPackIni = false;
|
||||||
|
fOffset = PREFSMAN->m_fMachineSyncBias;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Look for a group banner in this group folder
|
// Look for a group banner in this group folder
|
||||||
std::vector<RString> arrayGroupBanners;
|
std::vector<RString> arrayGroupBanners;
|
||||||
|
|
||||||
|
|||||||
@@ -237,7 +237,7 @@ PrefsManager::PrefsManager() :
|
|||||||
m_ShowDancingCharacters ( "ShowDancingCharacters", SDC_Random ),
|
m_ShowDancingCharacters ( "ShowDancingCharacters", SDC_Random ),
|
||||||
m_bUseUnlockSystem ( "UseUnlockSystem", false ),
|
m_bUseUnlockSystem ( "UseUnlockSystem", false ),
|
||||||
m_fGlobalOffsetSeconds ( "GlobalOffsetSeconds", -0.008f ),
|
m_fGlobalOffsetSeconds ( "GlobalOffsetSeconds", -0.008f ),
|
||||||
m_fDefaultGroupOffsetSeconds ( "DefaultGroupOffsetSeconds", 0.0f ),
|
m_fMachineSyncBias ( "MachineSyncBias", -0.009f ),
|
||||||
m_iProgressiveLifebar ( "ProgressiveLifebar", 0 ),
|
m_iProgressiveLifebar ( "ProgressiveLifebar", 0 ),
|
||||||
m_iProgressiveStageLifebar ( "ProgressiveStageLifebar", 0 ),
|
m_iProgressiveStageLifebar ( "ProgressiveStageLifebar", 0 ),
|
||||||
m_iProgressiveNonstopLifebar ( "ProgressiveNonstopLifebar", 0 ),
|
m_iProgressiveNonstopLifebar ( "ProgressiveNonstopLifebar", 0 ),
|
||||||
|
|||||||
+1
-1
@@ -240,7 +240,7 @@ public:
|
|||||||
Preference<ShowDancingCharacters> m_ShowDancingCharacters;
|
Preference<ShowDancingCharacters> m_ShowDancingCharacters;
|
||||||
Preference<bool> m_bUseUnlockSystem;
|
Preference<bool> m_bUseUnlockSystem;
|
||||||
Preference<float> m_fGlobalOffsetSeconds;
|
Preference<float> m_fGlobalOffsetSeconds;
|
||||||
Preference<float> m_fDefaultGroupOffsetSeconds;
|
Preference<float> m_fMachineSyncBias;
|
||||||
Preference<int> m_iProgressiveLifebar;
|
Preference<int> m_iProgressiveLifebar;
|
||||||
Preference<int> m_iProgressiveStageLifebar;
|
Preference<int> m_iProgressiveStageLifebar;
|
||||||
Preference<int> m_iProgressiveNonstopLifebar;
|
Preference<int> m_iProgressiveNonstopLifebar;
|
||||||
|
|||||||
@@ -710,7 +710,7 @@ static void GlobalOffsetSeconds( int &sel, bool ToSel, const ConfOption *pConfOp
|
|||||||
MoveMap( sel, pConfOption, ToSel, mapping, ARRAYLEN(mapping) );
|
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 };
|
const float mapping[] = { 0.0f, 0.009f };
|
||||||
MoveMap( sel, pConfOption, ToSel, mapping, ARRAYLEN(mapping) );
|
MoveMap( sel, pConfOption, ToSel, mapping, ARRAYLEN(mapping) );
|
||||||
@@ -947,7 +947,7 @@ static void InitializeConfOptions()
|
|||||||
c.AddOption( ssprintf("%+i ms", i) );
|
c.AddOption( ssprintf("%+i ms", i) );
|
||||||
ADD( c );
|
ADD( c );
|
||||||
}
|
}
|
||||||
ADD( ConfOption( "DefaultGroupOffsetSeconds", DefaultGroupOffsetSeconds, "Null","|ITG" ) );
|
ADD( ConfOption( "MachineSyncBias", MachineSyncBias, "Null","|ITG" ) );
|
||||||
ADD( ConfOption( "EnableAttackSounds", MovePref<bool>, "No","Yes" ) );
|
ADD( ConfOption( "EnableAttackSounds", MovePref<bool>, "No","Yes" ) );
|
||||||
ADD( ConfOption( "EnableMineHitSound", MovePref<bool>, "No","Yes" ) );
|
ADD( ConfOption( "EnableMineHitSound", MovePref<bool>, "No","Yes" ) );
|
||||||
ADD( ConfOption( "RateModPreservesPitch", MovePref<bool>, "No","Yes") );
|
ADD( ConfOption( "RateModPreservesPitch", MovePref<bool>, "No","Yes") );
|
||||||
|
|||||||
Reference in New Issue
Block a user