29 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
langolierz	c6e95ac1ce	XX ... X Merge branch 'master' of https://github.com/langolierz/r_e_c_u_r X X :Z q ` :qw :qw	2017-10-12 02:35:32 +00:00
langolierz	aac78508aa	some stuff	2017-10-12 02:35:26 +00:00
Steven Brown	eaded6c501	added dividing to seconds	2017-10-12 15:34:13 +13:00
langolierz	3502e552a3	solving indent issues	2017-10-12 02:29:01 +00:00
Steven Brown	581b420d48	Merge branch 'master' of https://github.com/langolierz/r_e_c_u_r	2017-10-12 15:13:54 +13:00
Steven Brown	04bf2cfef7	testing current position update	2017-10-12 15:13:49 +13:00
Tim Caldwell	541c78871a	gerge branch 'master' of https://github.com/langolierz/r_e_c_u_r ... ometign : the commit.	2017-10-12 14:23:23 +13:00
Tim Caldwell	57caeb46ee	add get_position to video player	2017-10-12 14:22:59 +13:00
langolierz	2ab7a706ac	Create README.md	2017-10-12 14:09:43 +13:00
langolierz	bae5849ca3	update	2017-10-12 01:06:33 +00:00
Tim Caldwell	ee076a732d	adding reload on button press	2017-10-12 13:59:30 +13:00
langolierz	8d85515a20	button press switches video	2017-10-12 00:41:01 +00:00
Tim Caldwell	e5907f2ec1	map keypress to next content value	2017-10-12 13:13:16 +13:00
Steven Brown	7f4aea3fd0	test is gone!	2017-10-12 12:38:01 +13:00
Steven Brown	4d395c2736	fix?	2017-10-12 12:05:24 +13:00
Steven Brown	adee9c54e4	added terminal to tk window. Maybe.	2017-10-12 12:04:30 +13:00
Steven Brown	25f7878e58	fixed indentation	2017-10-12 11:08:55 +13:00
Steven Brown	2bd2f748bf	Formatted json files nicely	2017-10-12 11:04:37 +13:00
Steven Brown	1f47edc333	fixed ignored files	2017-10-12 11:00:19 +13:00
langolierz	62f4a037a0	display cetre plays video	2017-10-11 21:50:08 +00:00
Tim Caldwell	d635e853ac	fixed merge conflic	2017-10-12 10:32:26 +13:00
Tim Caldwell	655fcd54d5	removed asciimatic package to start the ui from console	2017-10-12 10:30:01 +13:00
langolierz	be59619aeb	Merge pull request #2 from langolierz/from-pi ... fix tab/space	2017-10-12 09:53:10 +13:00
Tim Caldwell	eac855ee42	fix tab/space	2017-10-12 09:52:10 +13:00
langolierz	7cfb4a39f5	Merge pull request #1 from langolierz/from-pi ... From pi	2017-10-12 08:34:17 +13:00
Tim Caldwell	4ed1263e9e	trying to make it run on both a computer of local deving and the pi	2017-10-06 21:32:39 +13:00
langolierz	9d56b2fb35	first commit from pi	2017-10-06 07:12:36 +00:00
Tim Caldwell	053bde35f6	tidied up the exsting code, added data objects and special helper classes	2017-09-01 21:50:12 +12:00
Tim Caldwell	9bdb02a3e9	inital commit ... (rough sketch of idea at this point)	2017-08-17 23:41:36 +12:00