Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-16 15:48:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
87485 commits 69 branches 56 tags 1.2 GiB
Commit graph

508 commits

Author SHA1 Message Date
ericrius1
be7a7f329b fixed virtual baton stuff; 2016-03-17 13:42:16 -07:00
ericrius1
7ccf7b42d8 change parent 2016-03-17 13:18:40 -07:00
James B. Pollack
0789f869da tankfix 2016-03-17 11:18:56 -07:00
James B. Pollack
5dbec15ae0 logging 2016-03-17 11:10:28 -07:00
James B. Pollack
78775baf8c yo; 2016-03-17 11:06:46 -07:00
James B. Pollack
bb18366cbd clean and log 2016-03-17 10:58:24 -07:00
ericrius1
6adb46199c removed logging 2016-03-17 10:51:10 -07:00
James B. Pollack
d9526b6506 utils 2016-03-17 10:45:52 -07:00
ericrius1
16b98b53f3 parented clock components 2016-03-17 10:40:59 -07:00
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
ericrius1
08559fe914 sound 2016-03-17 10:18:51 -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
ericrius1
c953c63aed added virtual baton to clock 2016-03-17 09:48: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
ericrius1
03c1bd2970 lights turning on and off 2016-03-16 19:03:36 -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
ericrius1
1645ace200 clock working for one person- no baton yet 2016-03-16 17:35:56 -07:00
ericrius1
24ba70263c time working right 2016-03-16 17:27:38 -07:00
ericrius1
30dcebc43b homereset 2016-03-16 16:06:11 -07:00
ericrius1
e39df5fdba number of frames on cuckoo animation is high 2016-03-16 15:54:29 -07:00
James B. Pollack
8477b721a4 add kinetic objects 2016-03-16 15:48:17 -07:00
ericrius1
bf30102534 refactor for names 2016-03-16 15:33:03 -07:00
ericrius1
333abddeee homereset 2016-03-16 15:09:57 -07:00
ericrius1
54a5b31930 fixed minute hand 2016-03-16 14:57:29 -07:00
ericrius1
72c0f84d2e changed second hand to hour hand 2016-03-16 14:42:47 -07:00
ericrius1
4eb37dac25 minutes and seconds 2016-03-15 18:29:18 -07:00
ericrius1
5c9fa3dcd4 hour and minute hand in right place 2016-03-15 18:15:39 -07:00
ericrius1
e9d3246809 second hand moving based on actual time 2016-03-15 17:49:03 -07:00
Eric Levin
377d89e9d6 added lifetime to water particle effect 2016-03-15 14:08:50 -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
Andrew Meadows
cb62af770f namechange urchin --> anemone 2016-03-14 17:10:33 -07:00
Andrew Meadows
d18f988cba namechange URCHIN --> ANEMONE 2016-03-14 17:07:35 -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
James B. Pollack
68cc87298f cleanup 2016-03-11 16:39:58 -08:00
James B. Pollack
801f2b3f9f add animated urchin 2016-03-11 16:38:39 -08:00
James B. Pollack
0733cd4bda plays sounds and stuff 2016-03-10 17:09:16 -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
09cccd563d constraints for music box 2016-03-09 16:57:40 -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
James B. Pollack
f8b4cf942e initial 2016-03-09 11:58:32 -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
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
5f9b64444c second bubble system, quieter noise 2016-03-07 10:19:21 -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
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
2958030d5a clean 2016-02-23 18:58:51 -08:00
James B. Pollack
cf6d78b26e disconnect 2016-02-23 18:29:10 -08:00
James B. Pollack
35831856ea prints 2016-02-23 18:25:05 -08:00
James B. Pollack
c362b779ae fish size 2016-02-23 18:20:27 -08:00
James B. Pollack
03a4de4f92 branch 2016-02-23 18:10:12 -08:00
James B. Pollack
4866ab9ead cleanup by default 2016-02-23 17:35:58 -08:00
James B. Pollack
19a72871ac fishes run by an entity with a handoff 2016-02-23 17:17:15 -08:00
James B. Pollack
6fd149f22d no avatar 2016-02-23 12:27:05 -08:00
James B. Pollack
fb7943efae new start 2016-02-23 12:24:10 -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
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
James B. Pollack
380ddf8b47 working with destroy etc; 2016-02-17 16:19:20 -08:00
James B. Pollack
75b17bc1cd work 2016-02-17 10:08:25 -08:00
James B. Pollack
d5a28565ce end of day 2016-02-16 18:33:54 -08:00
James B. Pollack
af91a06897 cleanup 2016-02-16 17:26:18 -08:00
James B. Pollack
355f25bb8f updatez 2016-02-16 17:25:56 -08:00
James B. Pollack
979c2feeb0 tiltmaze 2016-02-16 12:49:28 -08:00
James B. Pollack
e828a7e6e2 quiet prints 2016-02-12 19:38:40 -08:00
James B. Pollack
f346ac7023 logging 2016-02-12 13:58:02 -08:00
James B. Pollack
0bf822f17b update and add another entity script 2016-02-11 16:48:54 -08:00
James B. Pollack
9a34b68bff add ownership hack to own and handoff movement 2016-02-10 12:50:11 -08:00
James B. Pollack
22c53fc395 full voiceover vol 2016-02-10 10:05:26 -08:00
James B. Pollack
d920a3d721 updates 2016-02-09 18:05:14 -08:00
James B. Pollack
937ba3b796 zoom differently o avoid bug 2016-02-08 16:07:54 -08:00
James B. Pollack
0368bfc4ee sound on the server 2016-02-08 13:53:12 -08:00
James B. Pollack
325c7525c7 work 2016-02-08 13:43:41 -08:00
James B. Pollack
a80641a2c4 changes 2016-02-08 13:15:49 -08:00
James B. Pollack
720175f862 a couple more prints 2016-02-05 19:51:02 -08:00
James B. Pollack
82789113a8 quiet print messages 2016-02-05 19:50:08 -08:00
James B. Pollack
0c92c52d26 more volume 2016-02-04 14:52:50 -08:00
James B. Pollack
76350a39f8 increase volume more and fix not having logDebug function 2016-02-04 14:46:58 -08:00
James B. Pollack
708c6e8d25 volume 2016-02-04 11:37:46 -08:00
James B. Pollack
82f9b3f97f increase vol for voiceover 2016-02-04 11:33:54 -08:00
James B. Pollack
663dadd1b4 only disconnect mouse if connected 2016-02-04 08:51:42 -08:00
James B. Pollack
51b335c902 reduce cellscience volume 2016-02-03 09:53:14 -08:00
James B. Pollack
822a64a08b decrease volume 2016-02-01 17:16:27 -08:00
James B. Pollack
25fe8583c8 decrease all volume 2016-02-01 16:48:15 -08:00
James B. Pollack
bad6a15f09 light update 2016-02-01 14:48:17 -08:00
James B. Pollack
3e43821a52 remove doc file from scripts dir 2016-01-30 12:44:45 -08:00
James B. Pollack
fb6fcab078 add simple headers to all files 2016-01-30 12:28:48 -08:00
James B. Pollack
7d0eb79115 sanatize files and remove unused messages stuff 2016-01-30 12:13:40 -08:00
James B. Pollack
514edee3f1 cleanup and fix script paths to get random movement working again 2016-01-30 11:53:10 -08:00
James B. Pollack
0e036d3e2c cellscience 2016-01-29 16:58:49 -08:00