Merge 2.4 to main
#12685
Merge 2.4 to main
#12685
Conversation
This prevents a sudden pitch change in the leader deck.
…e postPorcess() This fixes the issue of changing pitch in two clones playing in sync
This is required for a reliable sync feature with changing tempo tracks. All other scalers have already double precision.
…fter track is loaded
…g the bpm after track load.
Co-authored-by: Owen Williams <owen-github@ywwg.com>
Co-authored-by: Uwe Klotz <uwe.klotz@gmail.com>
…into the '---' preset
…gl-no-precision fix(waveforms): add missing precision specifier to repetions uniform of patternshader
…7 already existing)
…ware/mixxxdj/mixxx2-4/. Compile QM files out of TS files that are used by the localized app
res/Mixxx-Keyboard-Shortcuts.png
Outdated
There was a problem hiding this comment.
Ups, this slipped in by accident.
I'll remove it and merge to main after this has been merged.
Co-authored-by: JoergAtGithub <64457745+JoergAtGithub@users.noreply.github.com>
Changelog cleanup
ConfigObject: Find resource path on iOS
Join Franch translations to "fr" and remove all untranslated English strings.
|
The effects, skins and other recent changes I was involved look good. |
|
Did another merge (and reran |
|
I suggest to keep this as is, not extend it further so it remains somewhat reviewable and gets merged soonish. I already used this to rebase my personal branch, but that doesn't mean much I guess since I only build on Linux. |
|
There are not really a lot of CMake changes (#12661, #12662, #12673 OTOH, but all of them have already been reviewed). Sadly, GitHub doesn't offer a good way to visualize just the conflict resolutions (i.e. what has changed apart from the "automatic" merge, which, in this case, is mostly just merging together a few adjacent methods in the star rating widgets, if I remember right) |
|
The more "drastic" CMake changes for iOS support are coming in #12672 and will target |
|
Well then, CI passes and if you're confident nothing broke, we can merge. Nevertheless I'd appreciate a second pair of eyes here. |
|
Did another quick local smoke-test, there are at least no obvious regressions. I agree that the large merge diffs are hard to review, though I can't really speak on most of the changes apart from what I've been involved in. |
|
I have adjusted the CMakeLists.txt at one point and updated with the latest 2.4 branch here: Thank you for the work. |
This merges 2.4 to
main. Leaves all of the translation files untouched (I hope that's how this is done?)