412 commits

Author	SHA1	Message	Date
James B. Pollack	5acd5916af	rotator block and dais	2016-03-29 13:16:31 -07:00
James B. Pollack	a03fd12159	dais	2016-03-29 13:09:05 -07:00
James B. Pollack	60ad268838	various changes	2016-03-29 10:48:34 -07:00
James B. Pollack	f745a3f06d	overlay fish	2016-03-29 10:12:37 -07:00
James B. Pollack	b10592b98d	new tank	2016-03-29 10:03:00 -07:00
James B. Pollack	aa3538855e	add name to left drawer	2016-03-28 18:28:11 -07:00
James B. Pollack	f24c42586f	end of day	2016-03-28 18:22:18 -07:00
James B. Pollack	afa1a6900e	re add drawers to reset for now	2016-03-28 17:46:45 -07:00
James B. Pollack	6534f5b6c1	doll dimensions scale	2016-03-28 17:24:39 -07:00
James B. Pollack	faf56f92ec	new	2016-03-28 17:04:52 -07:00
James B. Pollack	a1004919a5	Merge branch 'musicbox' into homereset	2016-03-28 15:45:03 -07:00
James B. Pollack	42792fdd92	transformer and tiltmaze ball	2016-03-28 15:24:11 -07:00
James B. Pollack	cb1f5e3e4f	dressing room and tilt maze thangs	2016-03-28 15:07:14 -07:00
James B. Pollack	3f6b7c2f1c	derp day	2016-03-28 14:32:30 -07:00
James B. Pollack	774cf8f42f	single spawner tank	2016-03-28 11:44:11 -07:00
James B. Pollack	19a8fa82e3	wrapper clean	2016-03-28 10:49:54 -07:00
James B. Pollack	50b27b1fe2	Merge branch 'homereset' of github.com:imgntn/hifi into homereset	2016-03-28 10:49:37 -07:00
James B. Pollack	054b910e20	try hard coding doll sizesw	2016-03-28 10:42:17 -07:00
James B. Pollack	cffe37b984	merge master into home content branch	2016-03-27 21:41:50 -07:00
James B. Pollack	ca4931e6ce	re enable things	2016-03-27 18:23:35 -07:00
James B. Pollack	d74114ff55	cleannnn	2016-03-27 18:22:50 -07:00
James B. Pollack	a57ba39fdd	return early for now	2016-03-27 16:44:53 -07:00
James B. Pollack	f099f927e1	doll rotation	2016-03-27 14:56:12 -07:00
James B. Pollack	5fef23ae34	userdata	2016-03-27 14:48:09 -07:00
James B. Pollack	fa0a740370	ud parse order	2016-03-27 14:41:56 -07:00
James B. Pollack	8898c5ba04	go little peeps	2016-03-27 14:40:06 -07:00
James B. Pollack	a8ec78ed2f	object typo	2016-03-27 14:32:08 -07:00
James B. Pollack	816873204a	log	2016-03-27 14:28:52 -07:00
James B. Pollack	271996d93d	test pathing	2016-03-27 14:26:44 -07:00
James B. Pollack	9d4ddc24d4	script scope	2016-03-27 13:42:29 -07:00
James B. Pollack	e40fe09364	dont check userdata if we dont need to	2016-03-27 13:34:07 -07:00
James B. Pollack	624cefa806	add shapetype to dolls	2016-03-27 13:32:05 -07:00
James B. Pollack	0dcb86db92	logging	2016-03-27 13:29:36 -07:00
James B. Pollack	d3980f18eb	transformer	2016-03-27 13:26:16 -07:00
James B. Pollack	ed2691eada	typo	2016-03-27 13:24:17 -07:00
James B. Pollack	81e14d1d1c	logging	2016-03-27 13:23:18 -07:00
James B. Pollack	b3b58b561b	remove drawers from reset script	2016-03-27 13:15:48 -07:00
James B. Pollack	39a3c9280a	try to cleanup tank	2016-03-27 13:13:15 -07:00
James B. Pollack	12c3792c06	init with userdata	2016-03-27 13:05:31 -07:00
James B. Pollack	19e7b19533	push	2016-03-27 12:59:57 -07:00
James B. Pollack	75016be64e	fix typo	2016-03-27 11:44:15 -07:00
James B. Pollack	c7a709414b	add urls	2016-03-27 09:51:13 -07:00
James B. Pollack	8083eedcb0	transformer	2016-03-26 19:24:15 -07:00
James B. Pollack	f34e17fdea	start transformer, remove doppelganger, various cleanup	2016-03-26 13:30:35 -07:00
ericrius1	89cea2a5ca	chair is now atp	2016-03-25 16:08:49 -07:00
ericrius1	c60a3c1f00	scripts atp	2016-03-25 14:41:08 -07:00
ericrius1	3ad7096364	atp raindrop	2016-03-25 14:36:54 -07:00
ericrius1	388c562d4d	more atp reworking	2016-03-25 14:29:36 -07:00
ericrius1	556f4b936d	Merge remote-tracking branch 'james/homereset' into homereset	2016-03-25 13:01:56 -07:00
ericrius1	0577bdd2b9	tidy guy doesnt go away on cleanup	2016-03-25 10:11:29 -07:00
ericrius1	9e00f7ea14	new water can sounds	2016-03-25 10:03:56 -07:00
James B. Pollack	623cf1fb7a	back to reality	2016-03-24 18:10:55 -07:00
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
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
ericrius1	e39df5fdba	number of frames on cuckoo animation is high	2016-03-16 15:54:29 -07:00
James B. Pollack	8477b721a4	add kinetic objects	2016-03-16 15:48:17 -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
Eric Levin	377d89e9d6	added lifetime to water particle effect	2016-03-15 14:08:50 -07:00
James B. Pollack	b6955ec77f	refs	2016-03-14 18:59:15 -07:00
James B. Pollack	432810704e	tidy	2016-03-14 18:53:29 -07:00
James B. Pollack	8877a6c570	tidyyy guy!	2016-03-14 17:58:12 -07:00
Andrew Meadows	cb62af770f	namechange urchin --> anemone	2016-03-14 17:10:33 -07:00
Andrew Meadows	d18f988cba	namechange URCHIN --> ANEMONE	2016-03-14 17:07:35 -07:00
James B. Pollack	2c8f13b538	entity script reset	2016-03-14 16:47:18 -07:00
James B. Pollack	8050bdd742	range	2016-03-11 20:00:49 -08:00
James B. Pollack	cb83bec341	switches	2016-03-11 19:49:23 -08:00
James B. Pollack	68cc87298f	cleanup	2016-03-11 16:39:58 -08:00
James B. Pollack	801f2b3f9f	add animated urchin	2016-03-11 16:38:39 -08:00
James B. Pollack	0733cd4bda	plays sounds and stuff	2016-03-10 17:09:16 -08:00
Eric Levin	8828b93062	Merge pull request #7261 from imgntn/newfishes ... Home Fishtank	2016-03-10 13:23:36 -08:00
James B. Pollack	c05e996913	remove lifetime	2016-03-10 10:38:49 -08:00
James B. Pollack	a8ac556103	merge	2016-03-09 17:41:14 -08:00
James B. Pollack	f35ab59044	adjust bubbles and add a treasure chest	2016-03-09 17:36:45 -08:00
James B. Pollack	09cccd563d	constraints for music box	2016-03-09 16:57:40 -08:00
James B. Pollack	f8b4cf942e	initial	2016-03-09 11:58:32 -08:00