Commit Graph

2431 Commits

Author SHA1 Message Date
4eed6eb469 Merge pull request #359 from milkdropper/touch
Implement touching / clicking (interaction with presets).
2020-08-31 21:24:12 +04:00
d50d23ed43 Merge pull request #406 from milkdropper/tweak
tweak beat sensitivity to be more sensitive / granular
2020-08-31 21:23:48 +04:00
662692cb40 Merge pull request #415 from milkdropper/revert
Revert "Fix blank preset bug (#412)"
2020-08-31 21:23:32 +04:00
e3adb438a3 Revert "Fix blank preset bug (#412)"
This reverts commit f8cea68105.
2020-08-31 21:07:45 +04:00
6101dee3c9 Revert "Fix blank preset bug (#412)"
This reverts commit f8cea68105.
2020-08-31 20:58:56 +04:00
c80533c947 Merge branch 'master' into touch 2020-08-31 20:53:06 +04:00
a0dc91231d review requests by @revmisha 2020-08-31 20:51:25 +04:00
cc51e7557b Update minimum requested GL version for SDL context creation. 2020-08-29 19:44:03 -07:00
f8cea68105 Fix blank preset bug (#412)
I haven't tested this because my only linux box is headless, but this compiles and is the same fix I applied to the Android branch in Feb 2020.  It makes sure than an interrupted peset blend doesn't accidentally leave the master alpha set to a non-1.0 value.  The fix is not very elegant, but it is quite effective.

Co-authored-by: BuildTools <unconfigured@null.spigotmc.org>
2020-08-29 11:23:18 +03:00
c1f40eb0d5 tweak beat sensitivity to be more sensitive / granular 2020-08-16 19:59:36 +04:00
460c8c87a1 Merge pull request #404 from milkdropper/scrollwheel
Scroll wheel
2020-08-14 19:46:00 +04:00
b7a04c0425 #396 check for fts.h more portably (#397)
* #396 check for fts.h more portably

* Xcode -DHAVE_FTS_H

* Xcode -DHAVE_FTS_H
2020-08-14 13:35:25 +03:00
038daa9f9a README update 2020-08-13 23:11:55 +04:00
e0b00adee6 scrollHandler approach = better 2020-08-13 23:11:34 +04:00
a3ba363bdc Use mouse scroll to browse presets. 2020-08-13 22:59:07 +04:00
aad6f78ccd Merge pull request #400 from milkdropper/preset_file_manager
Preset browser
2020-08-13 22:30:36 +04:00
2eeb6ad56b Merge branch 'master' into preset_file_manager 2020-08-11 20:34:11 +04:00
0937f3959c Allow home / end to jump to top / bottom of preset list. 2020-08-11 20:33:00 +04:00
9341f07acc Handle mod infix conversion to function call for GLSL1.2 2020-08-09 06:41:55 -07:00
d47d0392ed space 2020-08-09 16:25:23 +04:00
8c1cbbfd0c Documentation update 2020-08-09 16:11:37 +04:00
4dc22c58f3 Moved ShaderEngine static shaders to separate manager 2020-08-09 04:30:49 -07:00
c05c457ad4 Rename & expected random handling. 2020-08-09 14:07:27 +04:00
7c8059f408 Help Menu 2020-08-08 14:27:28 +04:00
5c89399872 Help Menu 2020-08-08 14:22:30 +04:00
6b61641db7 Merge pull request #401 from milkdropper/first_impression
Remove a single preset from triptonaut - it's #1 in the list and give…
2020-08-08 14:04:00 +04:00
cfe0ed6cbb Remove a single preset from triptonaut - it's #1 in the list and give a bad impression (seizure warning) 2020-08-08 14:03:26 +04:00
001d58843e Prioritize toasts; pass color to drawText; determine max lines on reset of renderer; draw preset menu 2020-08-07 15:49:52 +04:00
09a39933f7 Pass a list of presets to the renderer. But only enough to fill the screen. 2020-08-07 15:44:53 +04:00
c2a232f6fd Handle keys: m, page up, and page down. 2020-08-07 15:44:31 +04:00
093164d583 Backport GLSL shaders to version 1.2 to support older hardware. 2020-08-05 01:12:19 -07:00
78304318ea Update README.md
Changed Android link to the ad-free free version.  Linking to the paid version is probably the wrong thing to do.
2020-08-04 22:18:03 -04:00
6760b58d72 Merge pull request #398 from milkdropper/docs
Restructure OS / Download
2020-07-31 23:44:46 +04:00
1af5a19d80 Update README.md
Co-authored-by: Mischa Spiegelmock <me@mish.dev>
2020-07-31 23:12:06 +04:00
7144ba39bf Update README.md
Co-authored-by: Mischa Spiegelmock <me@mish.dev>
2020-07-31 23:11:58 +04:00
b8551a9696 Update README.md
Co-authored-by: Mischa Spiegelmock <me@mish.dev>
2020-07-31 23:11:52 +04:00
133b8dd811 Update README.md
Co-authored-by: Mischa Spiegelmock <me@mish.dev>
2020-07-31 23:11:45 +04:00
b36fd11276 Again 2020-07-31 22:58:03 +04:00
48c4a71558 markdown newb 2020-07-31 22:54:13 +04:00
c96ea24879 Minor change 2020-07-31 22:51:33 +04:00
72301e1af1 Merge xbox/windows phone. 2020-07-31 22:50:51 +04:00
e1ab5a96cb Restructure OS / Download 2020-07-31 22:48:06 +04:00
9a75697da4 Update BUILDING.md 2020-07-31 10:34:40 +03:00
2d2b58d7f7 Merge pull request #395 from projectM-visualizer/stretch_toggle
Toggle stretching (if you already stretched, you can return to a single monitor by using CTRL+S again)
2020-07-30 00:13:28 +04:00
4d9963534e Typo + comments. 2020-07-29 23:34:52 +04:00
63851b53f3 Toggle stretching 2020-07-29 23:27:17 +04:00
77d2d58e54 Extend projectM-jack.1 (#394) 2020-07-29 22:12:13 +03:00
e073937168 Add keywords to the desktop files (#393) 2020-07-29 22:11:41 +03:00
bed864b1e7 Fix spelling errors (#392) 2020-07-29 22:10:43 +03:00
77617e4109 Merge pull request #358 from milkdropper/return_random
Previous keyboard shortcut in SDL now acts as expected when in shuffle (random) mode.
2020-07-29 22:27:12 +04:00