Commit Graph

2038 Commits

Author SHA1 Message Date
4dc22c58f3 Moved ShaderEngine static shaders to separate manager 2020-08-09 04:30:49 -07: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
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
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
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
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