Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 19:36:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
40571 commits 71 branches 56 tags 1.2 GiB
Commit graph

247 commits

Author SHA1 Message Date
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
James B. Pollack
9a860bd31a update ping pong gun model url 2016-03-06 15:01:35 -08:00
James B. Pollack
2740391c3b end of day 2016-03-04 18:17:09 -08:00
James B. Pollack
3929af7187 fishtweaks 2016-03-04 18:01:32 -08:00
James B. Pollack
691c0c7d24 gofish! 2016-03-04 17:29:22 -08:00
James B. Pollack
e3d44c4e27 add urchin and rocks 2016-03-04 14:22:57 -08:00
James B. Pollack
3f146a734b user inner tank for bounds 2016-03-01 19:46:39 -08:00
James B. Pollack
cd233165e7 whitelist and blacklist inner contianer and corner entities 2016-03-01 19:41:05 -08:00
James B. Pollack
87e13543c2 use inner container for tank 2016-03-01 19:14:41 -08:00
James B. Pollack
5cb792183e start inner tank 2016-03-01 17:51:05 -08:00
James B. Pollack
1bcd85d106 only look attractor if close 2016-03-01 17:44:21 -08:00
James B. Pollack
24da3b1019 cleanup and parenting 2016-03-01 12:02:07 -08:00
James B. Pollack
ba2e977968 fish swim to where youre looking 2016-03-01 10:53:50 -08:00
James B. Pollack
42ec6de512 starts 2016-02-29 18:23:20 -08:00
James B. Pollack
c05849714b bubbles etc 2016-02-29 16:21:43 -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
James B. Pollack
96f5ff5fbd switching computers 2016-02-28 21:05:36 -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