diff --git a/.gitignore b/.gitignore index 5f9bc746a..b09d16821 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,9 @@ /table/* /course/* /favorite/* +/release/* +/ipfs/* +/.settings/* songdata.db songinfo.db config.json @@ -16,4 +19,6 @@ beatoraja_log.xml b.bat /*.dll *.cim -.idea/ \ No newline at end of file +.idea/ +.classpath +.project \ No newline at end of file diff --git a/src/bms/player/beatoraja/PlayerConfig.java b/src/bms/player/beatoraja/PlayerConfig.java index 6ea3512fa..14ab0dabb 100644 --- a/src/bms/player/beatoraja/PlayerConfig.java +++ b/src/bms/player/beatoraja/PlayerConfig.java @@ -67,6 +67,8 @@ public class PlayerConfig { private boolean notesDisplayTimingAutoAdjust = false; + private int soundOffset = 0; + /** * 選曲時のモードフィルター */ @@ -259,6 +261,18 @@ public void setJudgetiming(int judgetiming) { this.judgetiming = judgetiming; } + public int getSoundOffset() { + return soundOffset; + } + + public int getSoundOffsetMicro() { + return soundOffset * 1000; + } + + public void setSoundOffset(int soundOffset) { + this.soundOffset = soundOffset; + } + public boolean isNotesDisplayTimingAutoAdjust() { return notesDisplayTimingAutoAdjust; } @@ -801,6 +815,7 @@ public void validate() { target = MathUtils.clamp(target, 0, TargetProperty.getAllTargetProperties().length); targetid = targetid!= null ? targetid : "MAX"; judgetiming = MathUtils.clamp(judgetiming, JUDGETIMING_MIN, JUDGETIMING_MAX); + soundOffset = MathUtils.clamp(soundOffset, JUDGETIMING_MIN, JUDGETIMING_MAX); misslayerDuration = MathUtils.clamp(misslayerDuration, 0, 5000); lnmode = MathUtils.clamp(lnmode, 0, 2); keyJudgeWindowRatePerfectGreat = MathUtils.clamp(keyJudgeWindowRatePerfectGreat, 25, 400); diff --git a/src/bms/player/beatoraja/launcher/PlayConfigurationView.fxml b/src/bms/player/beatoraja/launcher/PlayConfigurationView.fxml index f1483aafa..155d64f14 100644 --- a/src/bms/player/beatoraja/launcher/PlayConfigurationView.fxml +++ b/src/bms/player/beatoraja/launcher/PlayConfigurationView.fxml @@ -164,6 +164,12 @@ +