212 commits

Author	SHA1	Message	Date
ericrius1	7bbb8167d0	fixed rotation plant	2016-03-23 16:41:57 -07:00
ericrius1	dd5e972a5c	adeed blocks	2016-03-23 15:18:21 -07:00
ericrius1	42196ea5c4	homereset	2016-03-23 15:09:14 -07:00
James B. Pollack	5a508d6f23	tanksss	2016-03-23 15:05:36 -07:00
James B. Pollack	d75db853c2	add posters and such	2016-03-23 13:56:39 -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
James B. Pollack	f7b1129152	dont set at begin for tank	2016-03-23 10:38:23 -07:00
ericrius1	2b8027042c	clock face	2016-03-23 10:14:25 -07:00
James B. Pollack	a52926c4af	Merge branch 'homereset' of github.com:imgntn/hifi into homereset	2016-03-23 10:11:49 -07:00
ericrius1	9ce14a28ed	clock rotation in progress	2016-03-22 16:30:20 -07:00
ericrius1	7c96735592	added name to trashcan	2016-03-22 13:21:42 -07:00
ericrius1	4cac7cf912	updated second hand to a model with wood texture	2016-03-22 12:15:44 -07:00
ericrius1	ddc35e7040	updated query string	2016-03-22 09:49:46 -07:00
ericrius1	e1d585c848	updated water can model	2016-03-21 17:33:21 -07:00
ericrius1	a36cc7862f	rotation can	2016-03-21 17:06:08 -07:00
James B. Pollack	a6cd1e8335	add tank assets to reset	2016-03-21 12:10:39 -07:00
James B. Pollack	dece01179e	make everything	2016-03-21 11:01:50 -07:00
James B. Pollack	feda022975	Merge pull request #10 from ericrius1/homereset ... batn fix Homereset	2016-03-21 11:01:50 -07:00
ericrius1	1da1c1dce1	only disconnect if connected	2016-03-21 10:57:51 -07:00
James B. Pollack	35efe1e9dd	no rot cuckoo	2016-03-21 10:40:41 -07:00
James B. Pollack	bcc4dcb362	Merge pull request #9 from ericrius1/homereset ... fixed baton bug	2016-03-21 10:36:38 -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
James B. Pollack	93a920f80d	tank	2016-03-21 10:28:41 -07:00
James B. Pollack	c71d8914d5	clean	2016-03-21 10:24:50 -07:00
ericrius1	795747f408	merged	2016-03-21 10:23:51 -07:00
ericrius1	a0d9c24365	merged	2016-03-21 10:22:18 -07:00
ericrius1	16baeb9955	fix merge conflics	2016-03-21 10:14:19 -07:00
James B. Pollack	258d6d391f	no tank	2016-03-21 10:08: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
James B. Pollack	87bdffa273	visualize them	2016-03-18 17:28:48 -07:00
ericrius1	257424ae61	fan sounds	2016-03-18 17:10:42 -07:00
James B. Pollack	90dba7d472	tank rotation	2016-03-18 17:06:33 -07:00
James B. Pollack	9433ea8f06	syntax	2016-03-18 16:46:23 -07:00
James B. Pollack	8ae2468165	check	2016-03-18 16:44:33 -07:00
James B. Pollack	b112bb2080	start pos	2016-03-18 16:40:48 -07:00
James B. Pollack	d37ff80541	tank	2016-03-18 16:36:06 -07:00
ericrius1	f51e7f463c	fixed merge conflics	2016-03-18 16:30:17 -07:00
ericrius1	7bf97bfb92	fixed syntax error	2016-03-18 16:22:45 -07:00
ericrius1	af234d56f1	uncomment stuff;	2016-03-18 16:12:28 -07:00
ericrius1	b61fec657c	merge	2016-03-18 16:11:45 -07:00
ericrius1	4c8be15ca3	baton logging	2016-03-18 16:08:51 -07:00
ericrius1	3dace325b3	dressing room lights toggling on and off	2016-03-18 15:57:13 -07:00
ericrius1	a7d2ff7c29	fixed whiteboard markers not hsowing up	2016-03-18 15:23:53 -07:00
James B. Pollack	acba6817f2	hmm	2016-03-18 14:52:34 -07:00
ericrius1	bdfaadc892	living room lights emit texture toggling correctly	2016-03-18 14:31:51 -07:00
James B. Pollack	0aab01d774	remove switches to prep for next merge	2016-03-18 12:37:28 -07:00