131 commits

Author	SHA1	Message	Date
ericrius1	156f186e49	fixed bugs	2016-03-18 18:28:59 -07:00
ericrius1	257424ae61	fan sounds	2016-03-18 17:10:42 -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
ericrius1	4eb31c9459	Merge remote-tracking branch 'james/homereset' into dressingRoomFix	2016-03-18 11:58:29 -07:00
James B. Pollack	bc2270f4a0	kinetic objects	2016-03-18 11:48:03 -07:00
James B. Pollack	9e6cea2f41	gravity and cleaning	2016-03-18 10:55:10 -07:00
James B. Pollack	5dff9de3a0	reset by searching	2016-03-18 10:49:14 -07:00
James B. Pollack	0f17d1f12e	add reset userdata to everything	2016-03-17 22:19:20 -07:00
James B. Pollack	c072cd323e	start fish fix	2016-03-17 19:11:12 -07:00
James B. Pollack	855f505ae1	minor adjustments	2016-03-17 17:01:48 -07:00
ericrius1	c1725dda58	living room lights	2016-03-17 15:09:07 -07:00
James B. Pollack	8f00e9ea27	werk	2016-03-17 15:08:35 -07:00
ericrius1	009326b085	logs	2016-03-17 14:34:41 -07:00
ericrius1	ef0872ec52	fan switch working;	2016-03-17 14:31:48 -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
James B. Pollack	0789f869da	tankfix	2016-03-17 11:18:56 -07:00
James B. Pollack	5dbec15ae0	logging	2016-03-17 11:10:28 -07:00
James B. Pollack	78775baf8c	yo;	2016-03-17 11:06:46 -07:00
James B. Pollack	bb18366cbd	clean and log	2016-03-17 10:58:24 -07:00
ericrius1	6adb46199c	removed logging	2016-03-17 10:51:10 -07:00
James B. Pollack	d9526b6506	utils	2016-03-17 10:45:52 -07:00
ericrius1	16b98b53f3	parented clock components	2016-03-17 10:40:59 -07:00
James B. Pollack	9933690ed6	whitebrd	2016-03-17 10:36:35 -07:00
James B. Pollack	bdcc621996	rotate whiteboard	2016-03-17 10:32:24 -07:00
ericrius1	08559fe914	sound	2016-03-17 10:18:51 -07:00
James B. Pollack	5a6e0e4d80	clean	2016-03-17 10:15:53 -07:00
James B. Pollack	3432e7821f	resets	2016-03-17 10:08:44 -07:00
James B. Pollack	fc3bac7fa5	changes	2016-03-17 09:57:57 -07:00
ericrius1	c953c63aed	added virtual baton to clock	2016-03-17 09:48:57 -07:00
James B. Pollack	b080dd8c64	cleanup	2016-03-17 09:42:17 -07:00
James B. Pollack	16f2ef48fe	adjust	2016-03-17 09:36:10 -07:00
James B. Pollack	c35e4bc78a	working reset and ping pong	2016-03-17 09:18:12 -07:00
James B. Pollack	ed1913e58d	add ping pong gun and enable some items	2016-03-17 01:03:21 -07:00
ericrius1	03c1bd2970	lights turning on and off	2016-03-16 19:03:36 -07:00
James B. Pollack	4dd3f2a097	moar	2016-03-16 18:37:21 -07:00
James B. Pollack	0193889690	line endings	2016-03-16 17:49:20 -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