46 commits

Author	SHA1	Message	Date
James B. Pollack	8cac61081d	change cuckoo and whiteboard positions	2016-05-11 10:33:06 -07:00
James B. Pollack	ee210c5038	cleanup	2016-04-10 16:42:00 -07:00
James B. Pollack	f5f603f56e	update cuckoo clock lock	2016-04-10 11:13:33 -07:00
James B. Pollack	6781a7cb91	add headers, add virtual baton, try another way of disabling grab while trigger already held when using music box	2016-04-10 11:08:27 -07:00
James B. Pollack	d849154466	try to lock cuckoo	2016-04-08 17:26:38 -07:00
James B. Pollack	40be28a916	Merge branch 'homereset' of github.com:imgntn/hifi into homereset	2016-04-05 10:33:58 -07:00
James B. Pollack	024ce4954c	wrappers	2016-04-05 10:33:54 -07:00
James B. Pollack	e780e46d5f	most of a music box	2016-04-04 19:56:25 -07:00
James B. Pollack	d833c52e4b	various scripts	2016-04-04 15:11:06 -07:00
ericrius1	a74f6223bb	jumk name update	2016-04-01 16:30:17 -07:00
ericrius1	f60210e49b	added collision hull to cuckoo clock	2016-04-01 16:14:03 -07:00
ericrius1	286bc5de1d	changed json desk lamp to work with parenting	2016-03-30 14:06:51 -07:00
James B. Pollack	2c975f38cf	atp	2016-03-29 17:55:50 -07:00
ericrius1	42196ea5c4	homereset	2016-03-23 15:09:14 -07:00
ericrius1	1809c2971e	clock works with arbitrary rotations	2016-03-23 11:28:31 -07:00
ericrius1	cf9ef1078d	rotation working for second hand	2016-03-23 11:17:49 -07:00
ericrius1	6758c5f210	in progress	2016-03-23 10:53:35 -07:00
ericrius1	2b8027042c	clock face	2016-03-23 10:14:25 -07:00
ericrius1	9ce14a28ed	clock rotation in progress	2016-03-22 16:30:20 -07:00
ericrius1	4cac7cf912	updated second hand to a model with wood texture	2016-03-22 12:15:44 -07:00
ericrius1	1da1c1dce1	only disconnect if connected	2016-03-21 10:57:51 -07:00
ericrius1	66e969fec7	volume change	2016-03-21 10:35:10 -07:00
ericrius1	9188c9de0d	iown false	2016-03-21 10:31:27 -07:00
ericrius1	16baeb9955	fix merge conflics	2016-03-21 10:14:19 -07:00
ericrius1	52665e38c7	every 30 seconds, syncing local time	2016-03-18 18:36:12 -07:00
ericrius1	156f186e49	fixed bugs	2016-03-18 18:28:59 -07:00
ericrius1	7bf97bfb92	fixed syntax error	2016-03-18 16:22:45 -07:00
ericrius1	4c8be15ca3	baton logging	2016-03-18 16:08:51 -07:00
ericrius1	2168a1a6ed	changed time	2016-03-17 13:43:17 -07:00
ericrius1	be7a7f329b	fixed virtual baton stuff;	2016-03-17 13:42:16 -07:00
ericrius1	7ccf7b42d8	change parent	2016-03-17 13:18:40 -07:00
ericrius1	6adb46199c	removed logging	2016-03-17 10:51:10 -07:00
ericrius1	16b98b53f3	parented clock components	2016-03-17 10:40:59 -07:00
ericrius1	08559fe914	sound	2016-03-17 10:18:51 -07:00
ericrius1	c953c63aed	added virtual baton to clock	2016-03-17 09:48:57 -07:00
ericrius1	1645ace200	clock working for one person- no baton yet	2016-03-16 17:35:56 -07:00
ericrius1	24ba70263c	time working right	2016-03-16 17:27:38 -07:00
ericrius1	30dcebc43b	homereset	2016-03-16 16:06:11 -07:00
ericrius1	e39df5fdba	number of frames on cuckoo animation is high	2016-03-16 15:54:29 -07:00
ericrius1	bf30102534	refactor for names	2016-03-16 15:33:03 -07:00
ericrius1	333abddeee	homereset	2016-03-16 15:09:57 -07:00
ericrius1	54a5b31930	fixed minute hand	2016-03-16 14:57:29 -07:00
ericrius1	72c0f84d2e	changed second hand to hour hand	2016-03-16 14:42:47 -07:00
ericrius1	4eb37dac25	minutes and seconds	2016-03-15 18:29:18 -07:00
ericrius1	5c9fa3dcd4	hour and minute hand in right place	2016-03-15 18:15:39 -07:00
ericrius1	e9d3246809	second hand moving based on actual time	2016-03-15 17:49:03 -07:00