Commit graph

213 commits

Author SHA1 Message Date
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
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
b08a9baa5c move cellscience 2016-03-08 13:44:03 -08:00
ericrius1
451856ae67 fixed path 2016-03-08 08:14:57 -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
6d82dcb533 not the targets 2016-03-07 11:38:05 -08:00
James B. Pollack
9a860bd31a update ping pong gun model url 2016-03-06 15:01:35 -08:00
Chris Collins
d68fa4e9ad Merge pull request #7210 from imgntn/tiltmaze
Tilt Maze Should Delete Stray Balls
2016-02-29 15:46:54 -08:00
Brad Hefta-Gaub
70614aba90 Merge pull request #7184 from imgntn/cellscience
Cellscience Updates
2016-02-26 16:53:00 -08:00
James B. Pollack
6c6ea3f0a7 code cleanup 2016-02-26 10:42:45 -08:00
James B. Pollack
83713898cc maze should delete stray balls 2016-02-26 10:34:27 -08:00
James B. Pollack
b0cb4b7199 disable boundaries 2016-02-26 10:26:02 -08:00
James B. Pollack
16bebc437b ...spaces? 2016-02-25 13:09:45 -08:00
James B. Pollack
8d5834475a spaces! 2016-02-25 13:07:09 -08:00
James B. Pollack
751b991522 semicolons 2016-02-25 12:36:35 -08:00
James B. Pollack
9b6889e237 no tabs 2016-02-25 12:32:59 -08:00
James B. Pollack
f62777af96 cleanup 2016-02-25 12:32:06 -08:00
James B. Pollack
643365bc5a new models 2016-02-24 15:42:51 -08:00
James B. Pollack
5e57366ba7 urls 2016-02-24 15:06:57 -08:00
James B. Pollack
baa030b7b0 cleanup and submit 2016-02-24 13:18:01 -08:00
James B. Pollack
46fbf38b5d ac movers 2016-02-24 12:36:18 -08:00
James B. Pollack
4866ab9ead cleanup by default 2016-02-23 17:35:58 -08:00
James B. Pollack
6fd149f22d no avatar 2016-02-23 12:27:05 -08:00
James B. Pollack
cebc6937a3 no cleanup 2016-02-23 11:52:43 -08:00
James B. Pollack
5ed8fc534c tilt maze 2016-02-23 11:48:25 -08:00
James B. Pollack
19ce178791 light at the end 2016-02-22 19:20:01 -08:00
James B. Pollack
46aebabd9b switch branches 2016-02-22 17:54:45 -08:00
James B. Pollack
c102abd11f scale 2016-02-22 14:25:13 -08:00
James B. Pollack
e4bc0ce691 tests 2016-02-22 13:08:58 -08:00
James B. Pollack
f7b3da078b dont move cells in space, just angular velocity 2016-02-22 11:36:53 -08:00
James B. Pollack
f0d8ffce65 cleanup errors 2016-02-22 10:25:56 -08:00
James B. Pollack
ac11648b76 cleanup 2016-02-18 15:06:12 -08:00
James B. Pollack
214723f1bf baton for moving vesicles"
"
2016-02-18 14:27:47 -08:00
James B. Pollack
f5ad297986 Merge branch 'master' into cellscience 2016-02-18 12:43:39 -08:00
James B. Pollack
f2dcbec0e6 werk 2016-02-18 11:09:47 -08:00
James B. Pollack
ab17a95d71 premeeting 2016-02-18 10:29:40 -08:00
James B. Pollack
13157e34a4 maze entity script 2016-02-17 17:16:29 -08:00