mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-03-08 00:15:16 +00:00
Code Issues Projects Releases Wiki Activity
1,681 Commits 21 Branches 41 Tags
06466acfac285fc028858dfa5fbd33df0ff4b9db
Commit Graph

1681 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mischa Spiegelmock
06466acfac merge 2018-08-01 16:26:37 +03:00
Mischa Spiegelmock
74dcbfad40 Merge pull request #91 from axe312ger/glsl-emscripten 
[WIP] GLSL via emscripten
 2018-08-01 13:27:09 +03:00
Benedikt Rötsch
647048fff8 fixup! fixup! fix makefile and add more context to readme 2018-08-01 12:18:18 +02:00
Benedikt Rötsch
71d5d9ebb3 fixup! fix makefile and add more context to readme 2018-08-01 11:56:09 +02:00
Benedikt Rötsch
856b72c8c2 fix makefile and add more context to readme 2018-08-01 11:53:27 +02:00
Mischa Spiegelmock
cc852488e7 bundle SDL for osx WIP 2018-07-31 12:07:28 +03:00
deltaoscarmike
2002f93a09 Merge branch 'master' into glsl 2018-07-28 20:06:25 +02:00
deltaoscarmike
8717520016 Downgrade glsl required version to 3.3 supported by OGL 3.3. 
It's for old hardware compatiblity since OGL 4.x features are not used.
 2018-07-28 19:56:46 +02:00
deltaoscarmike
f8287d9e7c Fix borders issue 2018-07-28 19:50:57 +02:00
revmischa
23cd9c591e GLES and SSE2 fix stuff 2018-07-28 16:30:30 +00:00
Mischa Spiegelmock
3d4fe805ca readme 2018-07-28 13:24:03 +03:00
Mischa Spiegelmock
d8682ff85b some emscripten support returns 2018-07-28 00:20:46 +03:00
Mischa Spiegelmock
dbc923ba24 Merge branch 'glsl' of github.com:projectM-visualizer/projectm into glsl 2018-07-26 00:04:38 +03:00
Mischa Spiegelmock
5ea4dc4d35 read FPS from config file for SDL version 2018-07-26 00:04:34 +03:00
deltaoscarmike
5612dcb851 Re-enabling PerPixelMath_sse (issue #84) 2018-07-25 21:09:58 +02:00
deltaoscarmike
4a4490221a Fix for travis 2018-07-25 20:17:08 +02:00
deltaoscarmike
990c99d105 - Fix for travis 
- Convert glProgramUniform* for OGL 3.x compatibility
 2018-07-25 19:38:17 +02:00
deltaoscarmike
a6484e08d7 Revert commit ae242a5 2018-07-25 19:32:44 +02:00
Mischa Spiegelmock
17eea198d1 Merge pull request #89 from mbellew/perpixelmathtest 
fix _mm_pow(), see https://github.com/projectM-visualizer/projectm/is…
 2018-07-24 09:29:21 +03:00
Matthew Bellew
a94f7109b5 how do you mess up a one character patch? 2018-07-23 16:41:46 -07:00
Matthew Bellew
52483cd4cb fix _mm_pow(), see https://github.com/projectM-visualizer/projectm/issues/84 2018-07-23 15:24:37 -07:00
deltaoscarmike
185aadcca9 GL_LUMINANCE is deprecated, replacement by GL_RGB 2018-07-23 20:31:09 +02:00
deltaoscarmike
ae242a51c8 Fix border issue 2018-07-23 19:31:43 +02:00
Mischa Spiegelmock
92f3fb4e2d some cleanups. fixed dylib loader path for SDL2 so we can bundle it together. fix some minor syntax things. remove cg code. 2018-07-23 14:29:08 +03:00
Mischa Spiegelmock
201a92fa53 Merge branch 'glsl' of github.com:projectM-visualizer/projectm into glsl 2018-07-23 12:57:03 +03:00
Mischa Spiegelmock
15cf62b33f bleh 2018-07-23 12:53:04 +03:00
deltaoscarmike
b0d11fa652 Fix travis building 2018-07-23 08:18:36 +02:00
deltaoscarmike
99dccdf101 Blur shaders ported to GLSL 
All presets unifoms corrected
Shader rendering fixed
 2018-07-23 08:07:14 +02:00
deltaoscarmike
542900a9c3 Texture manager rewrite to add sampler support (used by shaders) 
Renderer target rewrite to remove FBO support (better fps)
Render to texture support restored
 2018-07-22 09:16:06 +02:00
deltaoscarmike
56830d87b1 Add testing switches: 
- fake audio
- unlock FPS (linux only)
 2018-07-18 21:46:01 +02:00
deltaoscarmike
d9d3ba8427 Removing Cg leftovers 2018-07-18 21:41:47 +02:00
deltaoscarmike
3ed82ca079 Disabling PerPixelMath_sse (issue #84) 2018-07-18 20:50:53 +02:00
Mischa Spiegelmock
fb53ca9e17 Merge pull request #83 from luigino/plugins 
Delete backup file otherwise it will get installed along with everything else
 2018-06-24 12:52:39 -07:00
Luigi Baldoni
1e137ec2d1 Delete backup file otherwise it will get installed 2018-06-24 10:27:37 +02:00
Mischa Spiegelmock
2444e595a6 Merge pull request #77 from luigino/icon 
Also install icon file mentioned in the .desktop
 2018-06-23 14:56:21 -07:00
Mischa Spiegelmock
a30840d09b Merge pull request #80 from luigino/rpath 
Add --disable-rpath switch to avoid hardcoded path
 2018-06-23 14:55:58 -07:00
Mischa Spiegelmock
023640f51d Merge pull request #82 from luigino/ppc64 
Fix build on ppc64
 2018-06-23 14:55:34 -07:00
Mischa Spiegelmock
e3536c9f5a Merge pull request #79 from luigino/plugins 
Plugins should be unversioned shared objects
 2018-06-23 09:19:00 -07:00
luigino
426e643f10 Fix build on ppc64 2018-06-23 16:58:03 +02:00
luigino
f29541962e Add --disable-rpath switch to avoid hardcoded path 2018-06-23 15:00:14 +02:00
luigino
be512da176 Plugins should be unversioned shared objects 2018-06-23 11:25:56 +02:00
luigino
1c613dd28a Also install icon file mentioned in the .desktop 2018-06-23 10:05:48 +02:00
Mischa Spiegelmock
02ad1f7ba7 Merge pull request #75 from luigino/minor 
Minor fixes
 2018-06-22 11:58:47 -07:00
deltaoscarmike
cc60a7a8e9 WIP: now some presets shaders are compiled 
- HLSL: Lots of HLSLparser fixes
- HLSL: Add Preprocessor macro support
- HLSL: Add functions: modf, tan
- HLSL: Add while loops support
- Shader static code fixes
- Add define DUMP_SHADERS_ON_ERROR
- ShaderEngine.hpp cleanup
- Restore current preset message
- Remove useless messages
 2018-06-22 19:38:54 +02:00
luigino
194201bb22 Use correct SOVERSION for libprojectM.so 2018-06-21 17:57:04 +02:00
luigino
e9d267b0b4 Also search for rcc-qt5 2018-06-21 17:56:10 +02:00
luigino
c87f208c47 Add return value to non-void function template 2018-06-21 17:55:21 +02:00
Mischa Spiegelmock
c925d092e4 add libprojectM xcode project 2018-06-17 14:02:41 +02:00
Mischa Spiegelmock
78702bed97 merge master 2018-06-17 14:00:27 +02:00
Mischa Spiegelmock
aeb3f4523d this doesn't belong in this branch 2018-06-17 13:57:46 +02:00