Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge upstream #53

Open
wants to merge 60 commits into
base: master
Choose a base branch
from
Open

Merge upstream #53

wants to merge 60 commits into from

Conversation

MBeijer
Copy link
Member

@MBeijer MBeijer commented Jan 8, 2024

No description provided.

coderofsalvation and others added 30 commits May 23, 2022 15:29
@coderofsalvation
fixed mergeconflict
c82f0e8
rearrange misc config section a bit
6931633
Merge branch 'master' into feat/raina_toggle_advanced_drag_n_drop
47cb1c1
introduced toggle for advanced drag and drop
24f303c
make sure setting is present
67ba0e7
re-introduce old drag behavior
8f9a623
style adjustments
1c15bcc
@coderofsalvation
adjusted formatting + updated author
bc25397
@coderofsalvation
Merge pull request milkytracker#274 from coderofsalvation/feat/helpdi…
caa8169 
…alog-ctrl-h

feature: ctrl h triggers helpscreen
@coderofsalvation
responsive filedialog
04841c2
@coderofsalvation
improved paste
96310c7
@coderofsalvation
chore/copy-paste-sample-respect-relative-notenumber
07e3d5f
@coderofsalvation
shortcuts to navigate instrument/samples/orderlist
a41e2c2
meowgli's tweak milkytracker#304
9944dd5
@nyanpasu64 @Deltafire
Fix uninitialized fields in PatternEditorControl
48ab547
@nyanpasu64 @Deltafire
Fix uninitialized fields in PPListBox
40602a7
@nyanpasu64 @Deltafire
Fix About screen reading uninitialized memory
64edaab
@nyanpasu64 @Deltafire
Fix uninitialized read in piano control
ce123f0
@coderofsalvation
switch to C11 when RTMIDI
f578adf
@coderofsalvation
replaced tanh with TAP-inspired compression-algo #nodistortion #relat…
a644cb5 
…ivecompression
@coderofsalvation
sample-editor easy fade-in/out + loop fold
a67efef
@coderofsalvation
list ports to stdout + check for default port using MIDI_IN env-var
a8e76b0
@coderofsalvation
fix: minimal non-opengl platforms can run MT again
7531312
@Claytone @coderofsalvation
Added some shortcuts to make my performances easier
fb84c38
@Claytone @coderofsalvation
Removed commented line
ada5f10
@Claytone @coderofsalvation
Replaced VK_OEM keys with regular letters because cmake didn't like t…
3dd036c 
…hem on Linux
@Claytone @coderofsalvation
Switched to single-modifier shortcuts and more sensible layout
639a3af
@Claytone @coderofsalvation
Updated docs
06ae8b4
@coderofsalvation
improvements + show selected channel by highlighting scope
c40e8ec
@mothcompute @coderofsalvation
fix wrong cwd when loading file from command line
c0c783b
coderofsalvation and others added 28 commits June 30, 2023 21:34
@coderofsalvation
typofix
51ae20a
@coderofsalvation
regression bugfix: shift+left/right should do selection
b6be2b2
@coderofsalvation
add rpi builder script
70824e4
@coderofsalvation
Merge remote-tracking branch 'milkytrackerx/chore/copy-paste-sample-r…
3bfcc62 
…espect-relative-notenumber' into rc/1.04
@coderofsalvation
Merge remote-tracking branch 'milkytrackerx/feat/responsive-filedialo…
5e45010 
…g' into rc/1.04
@coderofsalvation
Merge remote-tracking branch 'milkypailes/feat/raina_toggle_advanced_…
c2b0ce5 
…drag_n_drop' into rc/1.04
@coderofsalvation
resolved milkyshortcut-conflicts to get to the following coherent
592d076 
experience:

ALT +/-/left/right --- orderlist navigation/manipulation
CTRL +/-           --- increase/decreate stepsize for both (non)keypad
CTRL up/down       --- instrument navigation
CTRLSHIFT up/down  --- sample navigation
CTRL-SPACE         --- cycle instrument/sample/pattern editor
@coderofsalvation
added call to action for new users
3eed11c
@coderofsalvation
resolved merge-conflict
4fd5462
@coderofsalvation
updated help
a974a20
@coderofsalvation
removed broken links
5f9e135
@coderofsalvation
add advanced drag drop to docs
90c767a
@coderofsalvation
Merge remote-tracking branch 'milkytrackerx/bugfix/machinegun' into r…
4cc7f42 
…c/1.04 milkytracker#313
@coderofsalvation
version bump + update docs
1fa39ca
@coderofsalvation
Merge pull request milkytracker#314 from milkytracker/rc/1.04
4da3169 
new release 1.04
@coderofsalvation
update documentation
ef2627b
@coderofsalvation
typofix
c8fc468
@coderofsalvation
typofix
ee38e3e
@coderofsalvation
Merge remote-tracking branch 'milkytrackerx/feat/sampleeditor-improve…
6266e0d 
…d-pasting'
@coderofsalvation
cleanup menu by moving to FX submenu
8461197
@coderofsalvation
Merge pull request milkytracker#317 from milkytracker/feat/menu-cleanup
cd09c58 
cleanup menu by moving to FX submenu
@coderofsalvation
tidy cleanup subMenuFX
d63efeb
@coderofsalvation
possible bugfix: return nPorts
7e91714
@olymp14n
Update MilkyTracker.html
3a3e9e1 
Fixed example for `E2` command.
@lmnoop
Merge pull request milkytracker#327 from olymp14n/patch-1
aaa522e 
Update MilkyTracker.html
@lmnoop
Update MilkyTracker.html
a4735fc 
Remove Mx command's duplicated Tips section from under Px
@Deltafire
Make RTMidi optional again
50273e4
@MBeijer
Merge remote-tracking branch 'upstream/master'
b2d771d
@MBeijer MBeijer requested a review from titanlab January 8, 2024 11:00
@MBeijer MBeijer self-assigned this Jan 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@titanlab titanlab Awaiting requested review from titanlab

Assignees

@MBeijer MBeijer

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@MBeijer @coderofsalvation @nyanpasu64 @Claytone @mothcompute @olymp14n @lmnoop @Deltafire