Commit Graph

2431 Commits

Author SHA1 Message Date
28c9a229a7 Merge pull request #388 from milkdropper/more-toast
More Toasts - hard cut / soft cut clarification.
2020-07-29 22:25:18 +04:00
aa1d44809b Transition makes more sense to new users than hardcut/softcut. Also trying to force appveyor to not break. 2020-07-29 21:46:08 +04:00
f8d1684461 xcode update for glm headers v3.1.7 2020-07-28 22:16:50 +03:00
cfc1f2b169 Documentation was wrong. Hard cut is default (as it should be IMO). 2020-07-28 23:12:30 +04:00
b888c52326 Make SDL sdl2pmKeycode understand uppercase (by supplying keymod) 2020-07-28 23:09:52 +04:00
c5533e3efe Little things (#368)
* Noise not needed - F4 shows if shaders are compiled.

* Don't compile native presets by default in Visual Studio

* Debug / duplicate info

* Missed a debug native preset.

* Make texture errors more clear - we failed looking for multiple extensions.

* Move images from presets folder to textures folder

* Documented missing textures.

* Undo Visual Studio version bump.

* Renable NativePresetFactory (but the example native presets remain disabled)

* Comment

* Fixes / updates to audio device toggling.

* Stop crashing if there is no input microphone. Make fake audio dynamic so it can be enabled if there is no mic.

* Remove debug output.

* Document VC++ redist requirement.

* F4 missing from SDL help menu.

* Windows app instead of Console (no more cmd.exe pop-up when launching).

* Fullscreen for built-in settings.

* New icon (based on github and idle preset and consistent with Steam)

* Change language for loopback / audio changing.

* default fullscreen for built-in settings.

* Revert "Fullscreen for built-in settings."

This reverts commit b1936e76ab.

* Revert "default fullscreen for built-in settings."

This reverts commit ea89584174.

* Revert "9a9151b9"

* 9a9151b9

* fake_audio to fakeAudio
2020-07-28 22:05:35 +03:00
f2ca861b08 More helpful ubuntu build instructions (#383)
* testing bionic on travis

* table cleanup

* Test building on travis without libsdl1

* test

* Try to parse version for travis script

* disable addons/apt

* gl1-mesa-dev

* bleh

* revert

* hopefully more portable hack

* Don't require user to provide libglm

* dist vendor
2020-07-28 22:04:59 +03:00
e49720ecfa Preset subdirs (#385)
Scanning textures/presets dirs for textures and scanning preset dir for presets.
Scanning is now done recursively, so presets and textures can be organized into subdirectories instead of needing to be flattened into a single directory.

On POSIX systems makes use of [ftw](https://linux.die.net/man/3/ftw) which should be relatively efficient. Otherwise falls back to recursing with `dirent` (for windows).

Probably should have made an autoconf check for `ftw` instead of doing `#ifdef WIN32`. 

* Scan subdirectories in presets directory

* remove preset subdir config

* Recursively scan for textures too, add c++-17 compatibility

* Refactor directory scanning code so it's reused by texture loader and preset loader. Make cross-platform (maybe)

* filescanner in makefile

* extension filter for file loader

* make extensions match up'

* need string.h

* Add FileScanner.cpp to win build (maybe)

* scan all dirs

* #ifndef #ifdef is def fun

* bogus comment

* bleh

* bleh

* itunes plugin with c++17

* EyeTunes needs to know about the FileScanner

Co-authored-by: milkdropper.com <milkdropper.com@gmail.com>
Co-authored-by: milkdropper <59471060+milkdropper@users.noreply.github.com>
2020-07-28 22:01:56 +03:00
4c180cb0aa Toast for shuffle enable/disable and beat sensitivity +/- 2020-07-28 22:26:43 +04:00
e51b2c7d63 Don't require user to provide libglm (#387)
* Don't require user to provide libglm

* dist vendor

* Remove GLM requirement, add vendor headers.

Co-authored-by: milkdropper.com <milkdropper.com@gmail.com>
2020-07-27 22:56:40 +03:00
f3e4d8609a ok let's try discord 2020-07-27 10:17:49 +03:00
51cca4ab24 move ancient applications to src/museum/ 2020-07-25 21:38:16 +03:00
c63637624b #378 fix aligned alloc on macOS when building without XCode (#384) 2020-07-25 19:30:31 +03:00
b7818e6823 Vendor SDL2.framework (#386) 2020-07-25 19:27:45 +03:00
9bbfa8114d Merge pull request #382 from milkdropper/hotfix
Quickfix for issue with SDL config.
2020-07-24 18:57:22 +04:00
ef0c33f0d4 Fix bug in Windows. 2020-07-24 17:58:02 +04:00
87b6a1253c Merge branch 'master' into touch 2020-07-15 22:35:55 +04:00
c9b1f5fa71 Disable lines again 2020-07-15 21:04:29 +04:00
c7fcaea3b2 New vision for touching 2020-07-15 20:59:37 +04:00
a7f58984da Right click destroys the waveform you placed on the renderer with left click. 2020-07-14 23:14:10 +04:00
454ee45f5d manage home dir for conf file (#284)
* manage home dir for conf file

* fix for windows

* fix variable name

Co-authored-by: Yann Collette <yann.collette@artelys.com>
2020-07-10 17:56:40 +03:00
ef77e142fb SDL bugfix for settings smaller than your monitors resolution. (#352)
* SDL bugfix for settings width/height smaller than your monitors resolution.

* Write settings back to config.

* Swap width for height.

* Handle config resolution larger than monitor.

* Spacing
2020-06-08 16:25:16 +03:00
616dd8fc1f try to avoid linking sdl2 framework 2020-06-08 15:59:34 +03:00
7751996b15 try to avoid linking sdl2 framework 2020-06-08 15:57:34 +03:00
734d01e031 Touch now supports dragging (wave more fun than just clicking). 2020-05-26 13:38:50 +04:00
499b1c56da Merge remote-tracking branch 'origin/master' into touch 2020-05-26 12:42:42 +04:00
44ab74e738 #332 fix hidpi display for Music plugin 2020-05-24 23:38:14 +03:00
890f0ace02 bumping version, update autoconf qt 2020-05-24 21:33:49 +03:00
f9dc5d27db Recommended change. Not sure why I wrote that! 2020-05-24 19:48:04 +04:00
4ae0823e4f Cap preset random history to 10. 2020-05-24 19:46:19 +04:00
60ba92e552 Merge branch 'master' into touch 2020-05-24 19:13:11 +04:00
342f3577c7 Conflict1 again 2020-05-24 19:04:04 +04:00
3a3ea44200 Conflict1 2020-05-24 19:03:03 +04:00
5b18d21de5 Not needed. 2020-05-24 18:37:57 +04:00
5074405c7b Less random colours (less ugly) + better documentation on touch. 2020-05-24 18:12:42 +04:00
a5f9ecfa0b SDL touch support. 2020-05-24 17:45:58 +04:00
cdd52d3a57 Touch support for renderer. 2020-05-24 17:44:11 +04:00
d22caa6ebe projectM can pass touch to the renderer. 2020-05-24 17:42:38 +04:00
1d994941ef Help menu (#357)
* beatfix

* Flexible help menu

* SDL set help menu.
2020-05-24 11:31:02 +03:00
e5f21477b5 remove debug line 2020-05-23 21:24:55 +04:00
3314143f20 Realstic random tracking. 2020-05-23 21:03:19 +04:00
98e5945a01 Previous on Random == Last Ransom Preset. 2020-05-23 19:55:01 +04:00
43c294791a beatfix (#355) 2020-05-15 21:00:54 +03:00
366a70b678 beatfix 2020-05-15 21:45:09 +04:00
758348f25a Beat sensitivity implemented (#348)
* Beat detect sensitivity fix.

* Default: 1.0

* ReadMe beat sensitivity min/max.

* Beat sensitivity from config or settings isn't initialized.

* Smarter position.

* Make PCMScale (vol_history) also impacted by beat_sensitivity.

* Enhance and clarify Hard Cuts and better separate beat sensitivity.

* Forgot one config.

* Consistency with defaults.

* Even more clear about the default for Beat Sensitivity.
2020-05-15 17:49:28 +03:00
9760ae934f Implement toast messages (#351)
* Bette

* Removing test message.

* New timing functions. Handle drawing text that's too big.

* SDL space and switch libprojectM to use setPresetLock for L.
2020-05-14 22:08:50 +03:00
fd469de90c Merge pull request #354 from Polynomial-C/avoid_bashisms
configure.ac: Avoid bashisms
2020-05-14 17:05:21 +03:00
8a522d9758 configure.ac: Avoid bashisms
or else we end up like this:

  ./configure: 18902: ./configure: Syntax error: redirection unexpected

or

  ./configure: 20152: ./configure: my_CFLAGS+=-DDATADIR_PATH=\""$(pkgdatadir)"\" : not found
  ./configure: 20153: ./configure: my_CFLAGS+=-I$(top_srcdir)/vendor : not found

Gentoo-bug: https://bugs.gentoo.org/714098
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
2020-05-14 12:08:36 +02:00
a24dcca470 Display status (#347)
* Display some useful stats.

* Document F4 key in README
2020-05-07 23:31:44 +03:00
343a9984bc Closes #339,#322 Don't detect QT libraries we don't need 2020-05-03 20:53:37 +03:00