260 commits

Author	SHA1	Message	Date
ericrius1	327e937970	positioned posters and lamp	2016-03-24 17:51:24 -07:00
James B. Pollack	d3e7e4c791	revert revert	2016-03-24 17:01:43 -07:00
James B. Pollack	542ad2ed62	test revert	2016-03-24 16:59:04 -07:00
James B. Pollack	fa9f988719	hifi	2016-03-24 16:53:36 -07:00
James B. Pollack	adc0637001	still trying	2016-03-24 16:52:58 -07:00
ericrius1	aa4817ea26	attaching trigger box to base of lamp in living room	2016-03-24 16:52:37 -07:00
James B. Pollack	6bed4d4e8e	thangz	2016-03-24 16:50:49 -07:00
ericrius1	54e125871f	adding bulldog lamp to desk in living room	2016-03-24 16:08:24 -07:00
James B. Pollack	1ad3e1ae98	list joints	2016-03-24 16:00:04 -07:00
James B. Pollack	74648b6a25	throttle	2016-03-24 15:58:23 -07:00
James B. Pollack	392a4c3313	testing	2016-03-24 15:54:03 -07:00
James B. Pollack	4f1fc296e6	werk	2016-03-24 15:31:32 -07:00
James B. Pollack	aba8794428	freezer	2016-03-24 15:25:59 -07:00
James B. Pollack	8eb0f51f56	testing	2016-03-24 15:23:15 -07:00
ericrius1	e916e6b937	dog lamp light works	2016-03-24 14:35:56 -07:00
James B. Pollack	b4a4f276ea	logs etc	2016-03-24 14:33:58 -07:00
James B. Pollack	5f3c176269	get avatar everytime	2016-03-24 13:23:44 -07:00
James B. Pollack	6e6e052a31	experiments	2016-03-24 13:13:02 -07:00
James B. Pollack	46b3c9641b	pos not rot derp	2016-03-24 12:55:54 -07:00
James B. Pollack	a1e63280e0	fan utils	2016-03-24 12:53:06 -07:00
James B. Pollack	91499b6fd9	logs	2016-03-24 12:49:58 -07:00
James B. Pollack	e9b7982390	try manually resizing doppelganger to natural dimensions	2016-03-24 12:41:46 -07:00
James B. Pollack	cfa39bec7f	rotation	2016-03-24 12:37:41 -07:00
James B. Pollack	fa5d9f8442	syntax fix	2016-03-24 12:09:16 -07:00
James B. Pollack	90ce52a2ae	avatar fbx parsing yay	2016-03-24 11:58:34 -07:00
James B. Pollack	106c140bd4	occupied	2016-03-24 09:15:27 -07:00
James B. Pollack	d8b728f30f	doppel the fun	2016-03-23 19:27:37 -07:00
James B. Pollack	7934eee368	Merge pull request #13 from ericrius1/homereset ... Water effect for water can created on hold and deleted on release now	2016-03-23 16:50:53 -07:00
ericrius1	22629bf6c4	water effect created on hold	2016-03-23 16:46:38 -07:00
ericrius1	7bbb8167d0	fixed rotation plant	2016-03-23 16:41:57 -07:00
James B. Pollack	6f0d3201de	poster	2016-03-23 16:10:33 -07:00
James B. Pollack	536027d96b	posters	2016-03-23 15:53:52 -07:00
James B. Pollack	3acd37dc90	faxing berlin	2016-03-23 15:34:09 -07:00
James B. Pollack	057c31c384	enable reset	2016-03-23 15:32:40 -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
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