Keoiki and Hundrec
a27149aa70
Fix a few issues from conflict merging.
2025-09-27 03:57:37 +08:00
Keoiki and Hundrec
73d3c27c25
Fix 2 issues + add numerators 17 to 32
...
- Fixed Skip Forward and Backwards buttons, they now properly set the position to the start of a measure.
- Fixed having the playhead (the red thing) at any position than the default would cause the song time to be wrong when passing through denominator changes.
2025-09-27 03:57:37 +08:00
Keoiki and Hundrec
1f33aec825
FIX MEASURE TICKS GRAAAAAAAAAAAHH!!!!!!
2025-09-27 03:57:37 +08:00
Keoiki and Hundrec
eb40d3bda5
Fix measure number values and positions
...
(and remove 2 comments I forgot to remove last time)
2025-09-27 03:57:37 +08:00
Keoiki and Hundrec
533c8f7ede
Remove unused variables, I forgor 💀
2025-09-27 03:57:37 +08:00
Keoiki and Hundrec
b29339cd1a
Several things. (Check description)
...
- Fix "beat time" when dealing with time signatures.
- Remove old, now unused stuff from previous commit in the Conductor.
- Overhaul getTimeInSteps() and getStepTimeInMs() to be a cumulative calculation.
2025-09-27 03:57:37 +08:00
Keoiki and Hundrec
814bc4a3bf
just to get this pushed i guess
2025-09-27 03:57:37 +08:00
Keoiki and Hundrec
b05a5c7f54
Changes from the old branch.
2025-09-27 03:57:37 +08:00
VioletSnowLeopard and Mihai Alexandru
51eec4522e
ensure song starts at starting bpm
...
works when start time isn't zero
2025-08-15 16:59:21 +03:00
MoonDroid and Cameron Taylor
42a9c43127
chore: Switch all FlxMath.bound calls to .clamp calls instead
2025-08-11 21:35:41 -04:00
cyn0x8 and Abnormal
9e182f70d2
timer sequence
2025-07-09 01:02:55 -05:00
kade-github
2b5ba8dfa9
Offsets menu wip
2025-06-28 13:47:27 -07:00
kade-github
b3aa6a0b8d
Hit Window process in it's own file
2025-06-28 13:47:07 -07:00
KutikiPlayz and Kade
6ad9ffc7f9
notes move freaking normally
2025-06-12 13:21:39 -07:00
760190d135
Update source/funkin/Conductor.hx
...
thank you https://github.com/cyn0x8 for reminding me FlxMath.bound exists
Co-Authored-By: cyn <cyn0x8+git@gmail.com >
2025-06-11 19:24:46 -05:00
GitRan and Abnormal
9f8e42bd3c
Alter countdown + conductor behavior
...
Conductor's minimum songPosition when music is playing is now combinedOffset.
resyncVocals is also no longer used when the song starts, as it complicates matters and causes weird double-upping whatever due to the song being played, paused, and then played again
2025-06-11 19:24:46 -05:00
Kolo and Cameron Taylor
410cfe972d
fix: fix the user song offsets being applied incorrectly
2024-10-03 21:25:34 -04:00
EliteMasterEric
2c73b241e8
Rework offset+vocal sync handling to fix the "Swing Mode" bug
2024-09-21 06:33:47 -04:00
Kade
4d73e0cc47
fix some interesting issues with this
...
redundant trace removal
2024-09-19 14:26:18 -07:00
Kade
b03c8a9cf8
Limit the song time to 0 and the songs max length
...
use the new bool to tell if we should start the song
add a public static bool to countdown: finished
2024-09-19 14:26:18 -07:00
SanicBTW and GitHub
6b42da0902
Keep the consistency in Conductor
2024-05-18 09:04:27 +02:00
Cameron Taylor
f5cbfbf631
more save fixes
2024-04-30 20:03:24 -04:00
EliteMasterEric
f474bc32a5
Merge remote-tracking branch 'origin/rewrite/master' into input-offsets
2024-04-24 21:54:45 -04:00
EliteMasterEric
35f99b49a4
Merge branch 'rewrite/master' into input-offsets
2024-03-28 20:23:31 -04:00
EliteMasterEric
77cf96716e
Work in progress on Conductor signal rework
2024-03-27 02:55:53 -04:00
EliteMasterEric
bb98c710a3
Merge remote-tracking branch 'origin/rewrite/master' into feature/conductor-signal-rework
2024-03-27 01:52:58 -04:00
Cameron Taylor
ccfb9ca65b
Merge branch 'rewrite/master' into feature/high-erect
2024-03-25 16:02:09 -04:00
EliteMasterEric
dc638a1303
Fix a bunch of merge bugs.
2024-03-23 15:34:37 -04:00
EliteMasterEric
831d6aae71
Merge remote-tracking branch 'origin/rewrite/master' into input-offsets
2024-03-23 14:38:50 -04:00
EliteMasterEric
e64637ffdf
Rework Conductor to use instanced signals
2024-03-22 19:51:47 -04:00
EliteMasterEric
2b477c9bd1
Make Conductor a lazy instance
2024-03-22 02:47:56 -04:00
EliteMasterEric
3a35be916b
A bunch of checkstyle fixes
2024-03-16 22:20:22 -04:00
Cameron Taylor
58077b4505
more working audio offset in progress
2024-02-12 22:44:59 -05:00
Cameron Taylor
e759f90147
audioVisualOffset numbers
2024-02-12 22:14:35 -05:00
Cameron Taylor
25766dbde9
decoupling some stuff from Conductor.instance
2024-02-12 21:41:16 -05:00
Cameron Taylor
0145d7ed2d
input offset edits in progress
2024-02-12 20:06:43 -05:00
Cameron Taylor
c44e33c556
derp
2024-01-27 06:16:46 -05:00
Cameron Taylor
1dcd0debc7
conductor stuff
2024-01-16 05:37:06 -05:00
Cameron Taylor
b11bf09687
save/load for inputOffsets
2024-01-09 19:57:33 -05:00
Cameron Taylor
3544f2a804
input offset get/set functions in conductor
2024-01-09 19:48:01 -05:00
Cameron Taylor
ab316017f7
removed beatTime nullability?
2024-01-05 17:22:01 -05:00
EliteMasterEric
a1002c4756
Merge remote-tracking branch 'origin/rewrite/master' into bugfix/conductor-rewrite
2024-01-02 14:14:26 -05:00
EliteMasterEric
bb0fb02813
Fix to launching directly into Chart Editor
2023-12-19 01:26:43 -05:00
EliteMasterEric
ca489b5609
Rewrite the Conductor to be a singleton instance.
2023-12-14 16:56:20 -05:00
EliteMasterEric
7f0caeb026
Work in progress on offsets in Chart Editor state.
2023-12-08 01:15:22 -05:00
EliteMasterEric
1716ffc57f
Implement instrumental and vocal offsets into the PlayState.
2023-12-05 02:44:57 -05:00
EliteMasterEric
99ed8b94d7
Target the current time change rather than the first one.
2023-11-28 21:44:09 -05:00
EliteMasterEric
73107dbc07
Update HaxeUI cursor handling, and remove Funkin components
2023-10-31 14:43:01 -04:00
EliteMasterEric
86c105aff8
Merge remote-tracking branch 'origin/master' into bugfix-squash/song-data-parser-rework
2023-09-18 21:58:22 -04:00
EliteMasterEric
8431e18d37
Fixed issue where ChartEditorState was not copying SongMetadata properly
2023-09-08 18:00:48 -04:00
