472 commits

Author	SHA1	Message	Date
ericrius1	aead16da89	growing flowers faster	2016-03-31 15:10:43 -07:00
ericrius1	4cf5f41eed	changed chair path	2016-03-31 14:03:05 -07:00
ericrius1	665597214a	made desk lamp dimensions bigger	2016-03-30 20:04:33 -07:00
ericrius1	c74b71aa37	updated growing plant	2016-03-30 16:10:31 -07:00
ericrius1	182e05e125	adding collision hulls to can and bowl	2016-03-30 15:38:21 -07:00
ericrius1	286bc5de1d	changed json desk lamp to work with parenting	2016-03-30 14:06:51 -07:00
ericrius1	5c680e9982	Merge remote-tracking branch 'james/homereset' into atpHomeReset	2016-03-30 13:19:11 -07:00
James B. Pollack	cfa22a694e	update textures	2016-03-30 13:16:10 -07:00
James B. Pollack	12f8d83a6f	plant stuffs	2016-03-30 13:02:46 -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	b15e182e80	doll transformer	2016-03-30 10:06:06 -07:00
James B. Pollack	4a3650b309	reset atp	2016-03-30 10:05:16 -07:00
James B. Pollack	096bb4e340	rotate tank things and add some mouse callbacks to tilt maze	2016-03-30 09:51:59 -07:00
James B. Pollack	8e1fec2943	Merge branch 'homereset' of https://github.com/imgntn/hifi into homereset	2016-03-30 09:44:07 -07:00
James B. Pollack	b2f6357928	rotate tank things	2016-03-30 09:44: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	7e87bfbd5f	atp	2016-03-29 16:28:21 -07:00
James B. Pollack	d9e66db6f6	atp	2016-03-29 15:43:00 -07:00
James B. Pollack	195543558e	atp	2016-03-29 15:17:07 -07:00
James B. Pollack	2f460f165b	atp	2016-03-29 15:14:17 -07:00
James B. Pollack	1f3d1ac1b9	watering can atp	2016-03-29 15:05:39 -07:00
James B. Pollack	864fa4b760	new hull for hollds	2016-03-29 13:49:57 -07:00
James B. Pollack	d43b63eabc	move dolls down a little	2016-03-29 13:44:04 -07:00
James B. Pollack	1a6b6b94a1	move rotator block up a smidge	2016-03-29 13:33:26 -07:00
James B. Pollack	1b6b5756e2	close obj	2016-03-29 13:29:33 -07:00
James B. Pollack	6692736c07	doll separation	2016-03-29 13:23:51 -07:00
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