90 Commits

Author	SHA1	Message	Date
Tristan Rowley	16e1fae13d	backport from dev the ability to seek to a percentage of currently playing video	2020-07-23 17:59:14 +00:00
langolierz	da30da9176	fix midi bug	2019-12-09 21:55:41 +00:00
langolierz	75a9cccf1e	Update shaders.py	2019-12-09 21:54:22 +01:00
langolierz	0d32e5aa1a	some fine tune shaders	2019-12-03 20:42:03 +00:00
langolierz	2e133df8c3	adding strobe feature	2019-12-03 19:40:42 +00:00
langolierz	4313c4b060	working on new shader bank feature	2019-12-03 17:31:28 +00:00
langolierz	b7e0919277	wip new shader banks feature	2019-11-29 10:50:30 +00:00
langolierz	c90ddeb703	v2 bug fixes	2019-11-29 07:24:01 +00:00
langolierz	2ccbc8bf07	add delay, shader speed and some new shaders	2019-08-30 15:18:03 +00:00
langolierz	74f54f99cf	fixed omxplayer load bug and hide parellel mode because not working	2019-08-19 09:58:08 +00:00
langolierz	92df0bf6b4	fix boot and improve capture	2019-08-08 19:35:16 +00:00
langolierz	50fc94cccb	fixed tabbed banner, shader setting	2019-08-03 15:50:31 +00:00
langolierz	638bde828f	fixing keymappings	2019-07-14 12:06:23 +00:00
langolierz	85421c59fb	updating settings	2019-07-09 18:53:27 +02:00
langolierz	80d4eaa20a	tidying detour + usb rcording + a few other small bits	2019-07-02 20:41:51 +00:00
langolierz	03d9411edf	usb camera recording and detour demo	2019-06-29 21:30:10 +00:00
langolierz	c088e054fd	add usb capture input	2019-06-13 20:45:57 +00:00
langolierz	d52ddcf932	added some mix shaders	2019-06-10 11:22:34 +00:00
Tim Caldwell	7d4ecc3c93	refactor shader types	2019-06-09 11:44:46 +02:00
Tim Caldwell	17293824d3	refactoring settings menu	2019-06-09 10:41:12 +02:00
langolierz	95a6a548b4	a few fixes	2019-06-08 17:54:13 +00:00
langolierz	63cbca7107	added a new LOOP_TYPE parallel	2019-06-08 13:07:50 +00:00
sebiik	cccd570327	fix shader parameter edit ... decreasing shader parameters from the LCD menu was broken, would increase instead	2019-05-04 20:53:31 +08:00
langolierz	8f4010696c	adding midi map, shader param setting, fixing midi bug	2019-02-23 12:49:09 +00:00
langolierz	41767802c2	improving openframes capture interaction	2018-12-21 14:39:30 +00:00
langolierz	78e4ae3546	improved the dev mode switching and some other things	2018-12-19 22:55:04 +00:00
langolierz	5e691e222b	small bug fix plus updating the changes doc	2018-10-16 16:43:56 +00:00
langolierz	37ce6331ba	adding git intergration (finally!)	2018-10-15 21:07:30 +00:00
langolierz	a17dde7da1	improved capture switching and serial midi	2018-10-15 15:54:46 +00:00
langolierz	20e3c00fc5	fixing capture bugs and shader display problems	2018-10-13 16:25:28 +00:00
langolierz	cbd5ee9d61	some work around using and handling capture errors	2018-10-10 00:52:48 +00:00
langolierz	a133bb551e	a bunch of small bugs and tasks and fixes	2018-10-08 23:02:26 +00:00
langolierz	78c4b00c66	troubleshooting capture issue	2018-10-06 14:59:51 +00:00
langolierz	89b7c1bb7b	improving the shader interface	2018-10-04 21:15:26 +00:00
langolierz	44840c687a	switching between of camera and python camera input	2018-10-03 15:48:03 +00:00
langolierz	e3d0757a2c	created seperate class for of_capture so they do not compete for access to camera etc	2018-10-02 18:05:11 +00:00
langolierz	6735716482	adding speed control	2018-10-01 18:48:11 +00:00
langolierz	ea58f44755	working on camera into of	2018-10-01 04:23:37 +00:00
langolierz	8ca21cc2b4	got shaders playing crudely and openframeworks being run from python	2018-09-27 18:51:18 +00:00
langolierz	14d6e4b8bd	working towards shader intergration	2018-09-27 16:13:52 +00:00
langolierz	92a4ced2b8	WIP adding shader menu to front - not working yet !	2018-09-27 00:28:27 +00:00
langolierz	f1d34e8fc8	improving the video playing including sublooping	2018-09-25 21:17:02 +00:00
langolierz	5cfbf80986	Merge branch 'signalculture' into c_o_n_j_u_r	2018-09-25 12:54:11 +00:00
langolierz	f1e92a01db	adding intergration with mcp3008 for analog inputs	2018-09-24 19:12:58 +00:00
langolierz	8b60d0d3d4	adding input selection for picapture and tidied up the camera code a lil	2018-09-23 18:07:01 +00:00
langolierz	8ba947869f	updated capture settings to support picapture	2018-09-22 20:18:53 +00:00
langolierz	0e2eb03b84	some stuff from when i last worked on conjur	2018-09-22 19:40:19 +00:00
langolierz	f77a831256	removed some used checks around video player, trying to sort out gitignore	2018-05-05 21:21:25 +00:00
langolierz	4db37fd0b1	put persisted data in gitignore and created defaults if dont exist	2018-05-03 23:08:06 +00:00
langolierz	c15ec1247c	improved error handling and logging	2018-05-03 01:47:50 +00:00