58 commits

Author	SHA1	Message	Date
James B. Pollack	6573b3c71e	remove bricabrac from dressing room shelves for now	2016-06-07 14:37:19 -07:00
James B. Pollack	9f4289ae1b	add down velocity to shelfy things	2016-06-07 13:31:42 -07:00
James B. Pollack	eb3cafb4f9	shelf things	2016-06-06 08:59:41 -07:00
James B. Pollack	47a84fe91d	make shelf stuff wearable	2016-06-04 20:51:46 -07:00
James B. Pollack	27594e6df2	remove afro	2016-06-03 17:07:08 -07:00
James B. Pollack	f2f911ef29	remove blocks	2016-05-20 16:15:15 -07:00
James B. Pollack	d50681243c	bricabrac, bench, no blue chair, umbrella	2016-05-18 14:49:30 -07:00
James B. Pollack	d6d94b7d17	switch branches	2016-05-18 14:12:45 -07:00
James B. Pollack	17b617f1e1	umbrella	2016-05-18 10:23:45 -07:00
ericrius1	72f272b5d3	lampfix	2016-04-27 09:48:16 -07:00
James B. Pollack	d1001cfe4a	cleanup	2016-04-11 14:47:13 -07:00
James B. Pollack	ce670fbd21	fans, avatars, desk lamp, reset script	2016-04-08 17:22:35 -07:00
James B. Pollack	4961b38aef	end of day	2016-04-07 16:18:27 -07:00
ericrius1	1f00ae99e8	Added book names	2016-04-06 11:45:38 -07:00
ericrius1	ed3b9ab209	lamp is now always grabbable	2016-04-05 16:42:04 -07:00
ericrius1	bf46eda6c1	name changes	2016-04-05 15:57:32 -07:00
ericrius1	72197bf975	changed the way desklamp works	2016-04-01 18:43:54 -07:00
ericrius1	a74f6223bb	jumk name update	2016-04-01 16:30:17 -07:00
ericrius1	4a0b502f15	changed angular damping to default for water can	2016-04-01 15:53:55 -07:00
James B. Pollack	2e7d20cb03	Merge pull request #17 from ericrius1/atpHomeReset ... made plant bowl static and tweaked lamp properties	2016-04-01 15:03:11 -07:00
ericrius1	95d39555ee	fruit bowl	2016-04-01 14:53:49 -07:00
ericrius1	eef9bb0b2f	updated apple names	2016-04-01 14:52:51 -07:00
James B. Pollack	e7f5ddf67a	werk	2016-04-01 14:48:12 -07:00
ericrius1	12bbe9b522	made plant static	2016-04-01 13:48:46 -07:00
James B. Pollack	619a724eb8	junk and shelf stuff	2016-04-01 11:49:30 -07:00
James B. Pollack	1302ea80d4	reset	2016-04-01 10:53:55 -07:00
James B. Pollack	f9026fae66	various asans fixes	2016-04-01 09:35:19 -07:00
ericrius1	39f5ed443a	fixed merge conflicts	2016-03-31 17:16:36 -07:00
ericrius1	4cf5f41eed	changed chair path	2016-03-31 14:03:05 -07:00
James B. Pollack	140bb75542	lots	2016-03-31 09:21:08 -07:00
ericrius1	665597214a	made desk lamp dimensions bigger	2016-03-30 20:04:33 -07:00
James B. Pollack	cf8d4aa993	chair	2016-03-30 19:48:54 -07:00
James B. Pollack	6f06c0ca7f	reset stuffs	2016-03-30 19:17:42 -07:00
ericrius1	286bc5de1d	changed json desk lamp to work with parenting	2016-03-30 14:06:51 -07:00
ericrius1	6d4c0e940a	json changes to posters	2016-03-30 10:26:17 -07:00
ericrius1	1597ee57e2	added json	2016-03-30 10:18:00 -07:00
ericrius1	cbb6c5fe98	added portkey to posters	2016-03-30 10:07:04 -07:00
James B. Pollack	d8d891bfd3	yo	2016-03-29 19:52:03 -07:00
James B. Pollack	2c975f38cf	atp	2016-03-29 17:55:50 -07:00
James B. Pollack	aa3538855e	add name to left drawer	2016-03-28 18:28:11 -07:00
James B. Pollack	afa1a6900e	re add drawers to reset for now	2016-03-28 17:46:45 -07:00
ericrius1	89cea2a5ca	chair is now atp	2016-03-25 16:08:49 -07:00
ericrius1	327e937970	positioned posters and lamp	2016-03-24 17:51:24 -07:00
ericrius1	54e125871f	adding bulldog lamp to desk in living room	2016-03-24 16:08:24 -07:00
James B. Pollack	6f0d3201de	poster	2016-03-23 16:10:33 -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	d75db853c2	add posters and such	2016-03-23 13:56:39 -07:00
ericrius1	7c96735592	added name to trashcan	2016-03-22 13:21:42 -07:00
James B. Pollack	bc2270f4a0	kinetic objects	2016-03-18 11:48:03 -07:00