514 commits

Author	SHA1	Message	Date
James B. Pollack	6c75a8a5b3	Merge pull request #19 from ericrius1/atpHomeReset ... changed the way desklamp works	2016-04-02 15:15:33 -07:00
ericrius1	72197bf975	changed the way desklamp works	2016-04-01 18:43:54 -07:00
James B. Pollack	c87abd023c	Merge pull request #18 from ericrius1/atpHomeReset ... Name changes and plant tweaks	2016-04-01 16:36:41 -07:00
ericrius1	a74f6223bb	jumk name update	2016-04-01 16:30:17 -07:00
ericrius1	f60210e49b	added collision hull to cuckoo clock	2016-04-01 16:14:03 -07:00
ericrius1	9bdfd53ae7	made water can a box shape	2016-04-01 16:12:05 -07:00
ericrius1	4a0b502f15	changed angular damping to default for water can	2016-04-01 15:53:55 -07:00
James B. Pollack	e7bd9940a6	resets	2016-04-01 15:15:32 -07:00
ericrius1	68642099b7	changed name of whiteboard stuff	2016-04-01 15:12:57 -07:00
ericrius1	56ab1e86ba	Merge remote-tracking branch 'james/homereset' into atpHomeReset	2016-04-01 15:06:17 -07:00
ericrius1	b8cdd5c626	updates	2016-04-01 15:05:22 -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
James B. Pollack	44fe56698e	catcher	2016-04-01 14:53:54 -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	d2105248ff	try enabling blu chair	2016-04-01 10:49:39 -07:00
James B. Pollack	f9026fae66	various asans fixes	2016-04-01 09:35:19 -07:00
James B. Pollack	f891babd67	transformers	2016-03-31 18:21:57 -07:00
ericrius1	39f5ed443a	fixed merge conflicts	2016-03-31 17:16:36 -07:00
James B. Pollack	c87dae69b0	remove plant for now	2016-03-31 16:59:48 -07:00
ericrius1	9ff4540697	growing plant fixes	2016-03-31 16:45:12 -07:00
ericrius1	724d403fc7	behavior as expected	2016-03-31 16:08:06 -07:00
ericrius1	50e1a11f6c	change flower name	2016-03-31 15:16:57 -07:00
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
James B. Pollack	1524c8324f	revert	2016-03-31 09:24:31 -07:00
James B. Pollack	140bb75542	lots	2016-03-31 09:21:08 -07:00
James B. Pollack	e4f1320c50	disc lights	2016-03-31 08:42:05 -07:00
ericrius1	665597214a	made desk lamp dimensions bigger	2016-03-30 20:04:33 -07:00
James B. Pollack	fa3ecc93a6	siwthcessss	2016-03-30 20:03:31 -07:00
James B. Pollack	3ee41404f7	switch emits	2016-03-30 19:55:41 -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
James B. Pollack	265e1f0643	fixes	2016-03-30 17:28:31 -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
James B. Pollack	0d1e7a478a	fishie fish fish	2016-03-30 15:36:21 -07:00
James B. Pollack	59a0e95e5f	maze update	2016-03-30 15:03:20 -07:00
James B. Pollack	5ea5336ba5	tidy button	2016-03-30 14:56:35 -07:00
James B. Pollack	6bd00f3203	fix da typo	2016-03-30 14:16:10 -07:00
ericrius1	286bc5de1d	changed json desk lamp to work with parenting	2016-03-30 14:06:51 -07:00
James B. Pollack	cad8d1ff17	reset block	2016-03-30 14:05:22 -07:00
James B. Pollack	cefe672a93	updatez	2016-03-30 14:01:46 -07:00
James B. Pollack	9e01cbb4ef	inner tank for ze fishes	2016-03-30 13:44:40 -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