265 commits

Author	SHA1	Message	Date
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
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
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
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
James B. Pollack	8477b721a4	add kinetic objects	2016-03-16 15:48:17 -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
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
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	7cdd3d5b3e	Merge pull request #7296 from imgntn/cellscience ... Various Cellscience Fixes	2016-03-09 15:11:58 -08:00
James B. Pollack	5a54bc548b	remove ungrabbable signal	2016-03-09 12:19:02 -08:00
James B. Pollack	dee532e84f	try to make loading of nav buttons more realiable, etc	2016-03-09 12:14:53 -08:00
James B. Pollack	5daacdf952	set offset to zeros	2016-03-09 12:01:22 -08:00
Seth Alves	143d8a0929	Merge pull request #7267 from ericrius1/growingPlant ... Plant that blooms flowers when it is watered by a water can	2016-03-09 11:28:38 -08:00
James B. Pollack	3a5f7f1cbe	cleanup and headers	2016-03-09 09:19:01 -08:00
James B. Pollack	de45fef3fc	Merge branch 'newfishes' of https://github.com/imgntn/hifi into newfishes	2016-03-09 09:14:56 -08:00
James B. Pollack	55bc4be167	Merge branch 'master' into newfishes	2016-03-09 09:04:38 -08:00
ericrius1	9d1217e02d	aded lifetime to flowers so they die after a while	2016-03-08 17:37:56 -08:00
ericrius1	a236fceead	color pallete	2016-03-08 16:58:42 -08:00
ericrius1	f7028cef6e	Flowers blending more into rocks	2016-03-08 16:51:24 -08:00
ericrius1	17454fdb01	two colors	2016-03-08 16:36:59 -08:00
ericrius1	c928b9e411	starting color	2016-03-08 16:09:19 -08:00
ericrius1	41782dbd8d	basic shader	2016-03-08 15:56:06 -08:00
ericrius1	bcd8d8fb30	no water sound	2016-03-08 15:46:55 -08:00
James B. Pollack	d4fd9d4157	Update tank.js	2016-03-08 13:55:28 -08:00
James B. Pollack	645f0da280	code cleanupo	2016-03-08 13:50:04 -08:00
James B. Pollack	b08a9baa5c	move cellscience	2016-03-08 13:44:03 -08:00
ericrius1	451856ae67	fixed path	2016-03-08 08:14:57 -08:00
James B. Pollack	249d88b619	add base to fishtank	2016-03-07 19:59:27 -08:00
ericrius1	7b69aa375e	moved plant to home folder	2016-03-07 18:18:38 -08:00
James B. Pollack	fbe640e351	the model was different so adjust things	2016-03-07 16:38:15 -08:00
Andrew Meadows	dfe0575237	Merge pull request #7260 from imgntn/newponggun ... New Ping Pong Gun Model	2016-03-07 15:51:59 -08:00
James B. Pollack	15feb7a414	add falloffRadius to sconce lights in toybox	2016-03-07 12:07:22 -08:00
James B. Pollack	fdaa1f9ded	cleanup by default	2016-03-07 11:45:38 -08:00
James B. Pollack	70fd3559ea	cleanup;	2016-03-07 11:43:59 -08:00
James B. Pollack	6d82dcb533	not the targets	2016-03-07 11:38:05 -08:00
James B. Pollack	5f9b64444c	second bubble system, quieter noise	2016-03-07 10:19:21 -08:00