Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-07 01:30:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
83223 commits 70 branches 57 tags 1.2 GiB
Commit graph

951 commits

Author SHA1 Message Date
James B. Pollack
e24c6f1b17 cell stuff 2016-04-26 12:29:43 -07:00
James B. Pollack
61ff4d0f60 end of day 2016-04-25 18:27:04 -07:00
Andrew Meadows
3f5a5a831e move examples/toybox to unpublishedScripts/DomainContent/Toybox/ 2016-04-25 17:37:40 -07:00
James B. Pollack
8899ac71a1 move cellscience to production 2016-04-25 10:16:39 -07:00
James B. Pollack
4c9c5a10f6 fanning 2016-04-13 14:33:23 -07:00
James B. Pollack
0767f4eef0 robot position 2016-04-13 11:50:45 -07:00
James B. Pollack
d1001cfe4a cleanup 2016-04-11 14:47:13 -07:00
James B. Pollack
2052b617b3 fix name for tilt maze ball 2016-04-11 13:07:16 -07:00
James B. Pollack
ee210c5038 cleanup 2016-04-10 16:42:00 -07:00
James B. Pollack
f5f603f56e update cuckoo clock lock 2016-04-10 11:13:33 -07:00
James B. Pollack
6781a7cb91 add headers, add virtual baton, try another way of disabling grab while trigger already held when using music box 2016-04-10 11:08:27 -07:00
James B. Pollack
d849154466 try to lock cuckoo 2016-04-08 17:26:38 -07:00
James B. Pollack
ce670fbd21 fans, avatars, desk lamp, reset script 2016-04-08 17:22:35 -07:00
James B. Pollack
4961b38aef end of day 2016-04-07 16:18:27 -07:00
James B. Pollack
3adb8dedb0 mostly working muzak boxxx 2016-04-06 18:03:57 -07:00
James B. Pollack
5b6b289bba Merge branch 'homereset' of github.com:imgntn/hifi into homereset 2016-04-06 18:03:43 -07:00
James B. Pollack
2667f827cf working opening lid for music box 2016-04-06 14:03:51 -07:00
James B. Pollack
7cd8b183e8 Merge pull request #22 from ericrius1/atpHomeReset 
Added some book names
 2016-04-06 11:48:21 -07:00
James B. Pollack
30b32f27f8 rotateable lid 2016-04-06 11:46:02 -07:00
ericrius1
1f00ae99e8 Added book names 2016-04-06 11:45:38 -07:00
James B. Pollack
416c8752b3 after much struggle... what seems to be a working reset. at home IRL 2016-04-05 22:38:11 -07:00
James B. Pollack
a9e4707470 temp disable ping 2016-04-05 21:52:07 -07:00
James B. Pollack
078fe7db90 music box and revert hand grab 2016-04-05 18:49:33 -07:00
James B. Pollack
cb8adf6c2f Merge branch 'homereset' of github.com:imgntn/hifi into homereset 2016-04-05 18:23:46 -07:00
ericrius1
ed3b9ab209 lamp is now always grabbable 2016-04-05 16:42:04 -07:00
James B. Pollack
7d6018e895 Merge pull request #20 from ericrius1/atpHomeReset 
Whiteboard marker and eraser fixes, and some name changes
 2016-04-05 16:04:40 -07:00
ericrius1
bf46eda6c1 name changes 2016-04-05 15:57:32 -07:00
James B. Pollack
738d3d249b lid stuff 2016-04-05 15:54:13 -07:00
ericrius1
1257fac0f5 removed s3 paths 2016-04-05 15:08:32 -07:00
ericrius1
bd4e3b3460 whiteboard markers and erasers now spawn back at rack when they collide with home 2016-04-05 15:01:08 -07:00
James B. Pollack
40be28a916 Merge branch 'homereset' of github.com:imgntn/hifi into homereset 2016-04-05 10:33:58 -07:00
James B. Pollack
024ce4954c wrappers 2016-04-05 10:33:54 -07:00
James B. Pollack
9f60a4e05c music boxin it 2016-04-05 09:37:00 -07:00
James B. Pollack
e780e46d5f most of a music box 2016-04-04 19:56:25 -07:00
James B. Pollack
d833c52e4b various scripts 2016-04-04 15:11:06 -07:00
James B. Pollack
9e8f590ffe plant hull and whiteboard marker delay 2016-04-04 10:06:06 -07:00
James B. Pollack
4998ceb604 music boxx 2016-04-02 22:56:58 -07:00
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
James B. Pollack
12f8d83a6f plant stuffs 2016-03-30 13:02:46 -07:00
ericrius1
6d4c0e940a json changes to posters 2016-03-30 10:26:17 -07:00
ericrius1
1597ee57e2 added json 2016-03-30 10:18:00 -07:00
ericrius1
cbb6c5fe98 added portkey to posters 2016-03-30 10:07:04 -07:00
James B. Pollack
b15e182e80 doll transformer 2016-03-30 10:06:06 -07:00
James B. Pollack
4a3650b309 reset atp 2016-03-30 10:05:16 -07:00
James B. Pollack
096bb4e340 rotate tank things and add some mouse callbacks to tilt maze 2016-03-30 09:51:59 -07:00
James B. Pollack
8e1fec2943 Merge branch 'homereset' of https://github.com/imgntn/hifi into homereset 2016-03-30 09:44:07 -07:00
James B. Pollack
b2f6357928 rotate tank things 2016-03-30 09:44:04 -07:00
James B. Pollack
d8d891bfd3 yo 2016-03-29 19:52:03 -07:00
James B. Pollack
2c975f38cf atp 2016-03-29 17:55:50 -07:00
James B. Pollack
7e87bfbd5f atp 2016-03-29 16:28:21 -07:00
James B. Pollack
d9e66db6f6 atp 2016-03-29 15:43:00 -07:00
James B. Pollack
195543558e atp 2016-03-29 15:17:07 -07:00
James B. Pollack
2f460f165b atp 2016-03-29 15:14:17 -07:00
James B. Pollack
1f3d1ac1b9 watering can atp 2016-03-29 15:05:39 -07:00
James B. Pollack
864fa4b760 new hull for hollds 2016-03-29 13:49:57 -07:00
James B. Pollack
d43b63eabc move dolls down a little 2016-03-29 13:44:04 -07:00
James B. Pollack
1a6b6b94a1 move rotator block up a smidge 2016-03-29 13:33:26 -07:00
James B. Pollack
1b6b5756e2 close obj 2016-03-29 13:29:33 -07:00
James B. Pollack
6692736c07 doll separation 2016-03-29 13:23:51 -07:00
James B. Pollack
5acd5916af rotator block and dais 2016-03-29 13:16:31 -07:00
James B. Pollack
a03fd12159 dais 2016-03-29 13:09:05 -07:00
James B. Pollack
60ad268838 various changes 2016-03-29 10:48:34 -07:00
James B. Pollack
f745a3f06d overlay fish 2016-03-29 10:12:37 -07:00
James B. Pollack
b10592b98d new tank 2016-03-29 10:03:00 -07:00
James B. Pollack
aa3538855e add name to left drawer 2016-03-28 18:28:11 -07:00
James B. Pollack
f24c42586f end of day 2016-03-28 18:22:18 -07:00
James B. Pollack
afa1a6900e re add drawers to reset for now 2016-03-28 17:46:45 -07:00
James B. Pollack
6534f5b6c1 doll dimensions scale 2016-03-28 17:24:39 -07:00
James B. Pollack
faf56f92ec new 2016-03-28 17:04:52 -07:00
James B. Pollack
a1004919a5 Merge branch 'musicbox' into homereset 2016-03-28 15:45:03 -07:00
James B. Pollack
42792fdd92 transformer and tiltmaze ball 2016-03-28 15:24:11 -07:00
James B. Pollack
cb1f5e3e4f dressing room and tilt maze thangs 2016-03-28 15:07:14 -07:00
James B. Pollack
3f6b7c2f1c derp day 2016-03-28 14:32:30 -07:00
James B. Pollack
774cf8f42f single spawner tank 2016-03-28 11:44:11 -07:00
James B. Pollack
19a8fa82e3 wrapper clean 2016-03-28 10:49:54 -07:00
James B. Pollack
50b27b1fe2 Merge branch 'homereset' of github.com:imgntn/hifi into homereset 2016-03-28 10:49:37 -07:00
James B. Pollack
054b910e20 try hard coding doll sizesw 2016-03-28 10:42:17 -07:00
James B. Pollack
cffe37b984 merge master into home content branch 2016-03-27 21:41:50 -07:00
James B. Pollack
ca4931e6ce re enable things 2016-03-27 18:23:35 -07:00
James B. Pollack
d74114ff55 cleannnn 2016-03-27 18:22:50 -07:00
James B. Pollack
a57ba39fdd return early for now 2016-03-27 16:44:53 -07:00
James B. Pollack
f099f927e1 doll rotation 2016-03-27 14:56:12 -07:00
James B. Pollack
5fef23ae34 userdata 2016-03-27 14:48:09 -07:00
James B. Pollack
fa0a740370 ud parse order 2016-03-27 14:41:56 -07:00
James B. Pollack
8898c5ba04 go little peeps 2016-03-27 14:40:06 -07:00
James B. Pollack
a8ec78ed2f object typo 2016-03-27 14:32:08 -07:00
James B. Pollack
816873204a log 2016-03-27 14:28:52 -07:00
James B. Pollack
271996d93d test pathing 2016-03-27 14:26:44 -07:00
James B. Pollack
9d4ddc24d4 script scope 2016-03-27 13:42:29 -07:00
James B. Pollack
e40fe09364 dont check userdata if we dont need to 2016-03-27 13:34:07 -07:00
James B. Pollack
624cefa806 add shapetype to dolls 2016-03-27 13:32:05 -07:00
James B. Pollack
0dcb86db92 logging 2016-03-27 13:29:36 -07:00
James B. Pollack
d3980f18eb transformer 2016-03-27 13:26:16 -07:00
James B. Pollack
ed2691eada typo 2016-03-27 13:24:17 -07:00
James B. Pollack
81e14d1d1c logging 2016-03-27 13:23:18 -07:00
James B. Pollack
b3b58b561b remove drawers from reset script 2016-03-27 13:15:48 -07:00
James B. Pollack
39a3c9280a try to cleanup tank 2016-03-27 13:13:15 -07:00
James B. Pollack
12c3792c06 init with userdata 2016-03-27 13:05:31 -07:00
James B. Pollack
19e7b19533 push 2016-03-27 12:59:57 -07:00
James B. Pollack
75016be64e fix typo 2016-03-27 11:44:15 -07:00
James B. Pollack
c7a709414b add urls 2016-03-27 09:51:13 -07:00
James B. Pollack
8083eedcb0 transformer 2016-03-26 19:24:15 -07:00
James B. Pollack
f34e17fdea start transformer, remove doppelganger, various cleanup 2016-03-26 13:30:35 -07:00
ericrius1
89cea2a5ca chair is now atp 2016-03-25 16:08:49 -07:00
ericrius1
c60a3c1f00 scripts atp 2016-03-25 14:41:08 -07:00
ericrius1
3ad7096364 atp raindrop 2016-03-25 14:36:54 -07:00
ericrius1
388c562d4d more atp reworking 2016-03-25 14:29:36 -07:00
ericrius1
556f4b936d Merge remote-tracking branch 'james/homereset' into homereset 2016-03-25 13:01:56 -07:00
ericrius1
0577bdd2b9 tidy guy doesnt go away on cleanup 2016-03-25 10:11:29 -07:00
ericrius1
9e00f7ea14 new water can sounds 2016-03-25 10:03:56 -07:00
James B. Pollack
623cf1fb7a back to reality 2016-03-24 18:10:55 -07:00
ericrius1
327e937970 positioned posters and lamp 2016-03-24 17:51:24 -07:00
James B. Pollack
d3e7e4c791 revert revert 2016-03-24 17:01:43 -07:00
James B. Pollack
542ad2ed62 test revert 2016-03-24 16:59:04 -07:00
James B. Pollack
fa9f988719 hifi 2016-03-24 16:53:36 -07:00
James B. Pollack
adc0637001 still trying 2016-03-24 16:52:58 -07:00
ericrius1
aa4817ea26 attaching trigger box to base of lamp in living room 2016-03-24 16:52:37 -07:00
James B. Pollack
6bed4d4e8e thangz 2016-03-24 16:50:49 -07:00
ericrius1
54e125871f adding bulldog lamp to desk in living room 2016-03-24 16:08:24 -07:00
James B. Pollack
1ad3e1ae98 list joints 2016-03-24 16:00:04 -07:00
James B. Pollack
74648b6a25 throttle 2016-03-24 15:58:23 -07:00
James B. Pollack
392a4c3313 testing 2016-03-24 15:54:03 -07:00
James B. Pollack
4f1fc296e6 werk 2016-03-24 15:31:32 -07:00
James B. Pollack
aba8794428 freezer 2016-03-24 15:25:59 -07:00
James B. Pollack
8eb0f51f56 testing 2016-03-24 15:23:15 -07:00
ericrius1
e916e6b937 dog lamp light works 2016-03-24 14:35:56 -07:00
James B. Pollack
b4a4f276ea logs etc 2016-03-24 14:33:58 -07:00
James B. Pollack
5f3c176269 get avatar everytime 2016-03-24 13:23:44 -07:00
James B. Pollack
6e6e052a31 experiments 2016-03-24 13:13:02 -07:00
James B. Pollack
46b3c9641b pos not rot derp 2016-03-24 12:55:54 -07:00
James B. Pollack
a1e63280e0 fan utils 2016-03-24 12:53:06 -07:00
James B. Pollack
91499b6fd9 logs 2016-03-24 12:49:58 -07:00
James B. Pollack
e9b7982390 try manually resizing doppelganger to natural dimensions 2016-03-24 12:41:46 -07:00
James B. Pollack
cfa39bec7f rotation 2016-03-24 12:37:41 -07:00
James B. Pollack
fa5d9f8442 syntax fix 2016-03-24 12:09:16 -07:00
James B. Pollack
90ce52a2ae avatar fbx parsing yay 2016-03-24 11:58:34 -07:00
James B. Pollack
106c140bd4 occupied 2016-03-24 09:15:27 -07:00
James B. Pollack
d8b728f30f doppel the fun 2016-03-23 19:27:37 -07:00
James B. Pollack
7934eee368 Merge pull request #13 from ericrius1/homereset 
Water effect for water can created on hold and deleted on release now
 2016-03-23 16:50:53 -07:00
ericrius1
22629bf6c4 water effect created on hold 2016-03-23 16:46:38 -07:00
ericrius1
7bbb8167d0 fixed rotation plant 2016-03-23 16:41:57 -07:00
James B. Pollack
6f0d3201de poster 2016-03-23 16:10:33 -07:00
James B. Pollack
536027d96b posters 2016-03-23 15:53:52 -07:00
James B. Pollack
3acd37dc90 faxing berlin 2016-03-23 15:34:09 -07:00
James B. Pollack
057c31c384 enable reset 2016-03-23 15:32:40 -07:00
ericrius1
dd5e972a5c adeed blocks 2016-03-23 15:18:21 -07:00
ericrius1
42196ea5c4 homereset 2016-03-23 15:09:14 -07:00
James B. Pollack
5a508d6f23 tanksss 2016-03-23 15:05:36 -07:00
James B. Pollack
d75db853c2 add posters and such 2016-03-23 13:56:39 -07:00
ericrius1
1809c2971e clock works with arbitrary rotations 2016-03-23 11:28:31 -07:00
ericrius1
cf9ef1078d rotation working for second hand 2016-03-23 11:17:49 -07:00
ericrius1
6758c5f210 in progress 2016-03-23 10:53:35 -07:00
James B. Pollack
f7b1129152 dont set at begin for tank 2016-03-23 10:38:23 -07:00
ericrius1
2b8027042c clock face 2016-03-23 10:14:25 -07:00
James B. Pollack
a52926c4af Merge branch 'homereset' of github.com:imgntn/hifi into homereset 2016-03-23 10:11:49 -07:00
ericrius1
9ce14a28ed clock rotation in progress 2016-03-22 16:30:20 -07:00
ericrius1
7c96735592 added name to trashcan 2016-03-22 13:21:42 -07:00
ericrius1
4cac7cf912 updated second hand to a model with wood texture 2016-03-22 12:15:44 -07:00
ericrius1
ddc35e7040 updated query string 2016-03-22 09:49:46 -07:00
ericrius1
e1d585c848 updated water can model 2016-03-21 17:33:21 -07:00
ericrius1
a36cc7862f rotation can 2016-03-21 17:06:08 -07:00
James B. Pollack
a6cd1e8335 add tank assets to reset 2016-03-21 12:10:39 -07:00
James B. Pollack
dece01179e make everything 2016-03-21 11:01:50 -07:00
James B. Pollack
feda022975 Merge pull request #10 from ericrius1/homereset 
batn fix Homereset
 2016-03-21 11:01:50 -07:00
ericrius1
1da1c1dce1 only disconnect if connected 2016-03-21 10:57:51 -07:00
James B. Pollack
35efe1e9dd no rot cuckoo 2016-03-21 10:40:41 -07:00
James B. Pollack
bcc4dcb362 Merge pull request #9 from ericrius1/homereset 
fixed baton bug
 2016-03-21 10:36:38 -07:00
ericrius1
66e969fec7 volume change 2016-03-21 10:35:10 -07:00
ericrius1
9188c9de0d iown false 2016-03-21 10:31:27 -07:00
James B. Pollack
93a920f80d tank 2016-03-21 10:28:41 -07:00
James B. Pollack
c71d8914d5 clean 2016-03-21 10:24:50 -07:00
ericrius1
795747f408 merged 2016-03-21 10:23:51 -07:00
ericrius1
a0d9c24365 merged 2016-03-21 10:22:18 -07:00
ericrius1
16baeb9955 fix merge conflics 2016-03-21 10:14:19 -07:00
James B. Pollack
258d6d391f no tank 2016-03-21 10:08:19 -07:00
ericrius1
52665e38c7 every 30 seconds, syncing local time 2016-03-18 18:36:12 -07:00
ericrius1
156f186e49 fixed bugs 2016-03-18 18:28:59 -07:00
James B. Pollack
87bdffa273 visualize them 2016-03-18 17:28:48 -07:00
ericrius1
257424ae61 fan sounds 2016-03-18 17:10:42 -07:00
James B. Pollack
90dba7d472 tank rotation 2016-03-18 17:06:33 -07:00
James B. Pollack
9433ea8f06 syntax 2016-03-18 16:46:23 -07:00
James B. Pollack
8ae2468165 check 2016-03-18 16:44:33 -07:00
James B. Pollack
b112bb2080 start pos 2016-03-18 16:40:48 -07:00
James B. Pollack
d37ff80541 tank 2016-03-18 16:36:06 -07:00
ericrius1
f51e7f463c fixed merge conflics 2016-03-18 16:30:17 -07:00
ericrius1
7bf97bfb92 fixed syntax error 2016-03-18 16:22:45 -07:00
ericrius1
af234d56f1 uncomment stuff; 2016-03-18 16:12:28 -07:00
ericrius1
b61fec657c merge 2016-03-18 16:11:45 -07:00
ericrius1
4c8be15ca3 baton logging 2016-03-18 16:08:51 -07:00
ericrius1
3dace325b3 dressing room lights toggling on and off 2016-03-18 15:57:13 -07:00
ericrius1
a7d2ff7c29 fixed whiteboard markers not hsowing up 2016-03-18 15:23:53 -07:00
James B. Pollack
acba6817f2 hmm 2016-03-18 14:52:34 -07:00
ericrius1
bdfaadc892 living room lights emit texture toggling correctly 2016-03-18 14:31:51 -07:00
James B. Pollack
0aab01d774 remove switches to prep for next merge 2016-03-18 12:37:28 -07:00
ericrius1
4eb31c9459 Merge remote-tracking branch 'james/homereset' into dressingRoomFix 2016-03-18 11:58:29 -07:00
James B. Pollack
bc2270f4a0 kinetic objects 2016-03-18 11:48:03 -07:00
James B. Pollack
9e6cea2f41 gravity and cleaning 2016-03-18 10:55:10 -07:00
James B. Pollack
5dff9de3a0 reset by searching 2016-03-18 10:49:14 -07:00
James B. Pollack
0f17d1f12e add reset userdata to everything 2016-03-17 22:19:20 -07:00
James B. Pollack
c072cd323e start fish fix 2016-03-17 19:11:12 -07:00
James B. Pollack
855f505ae1 minor adjustments 2016-03-17 17:01:48 -07:00
ericrius1
c1725dda58 living room lights 2016-03-17 15:09:07 -07:00
James B. Pollack
8f00e9ea27 werk 2016-03-17 15:08:35 -07:00
ericrius1
009326b085 logs 2016-03-17 14:34:41 -07:00
ericrius1
ef0872ec52 fan switch working; 2016-03-17 14:31:48 -07:00
ericrius1
2168a1a6ed changed time 2016-03-17 13:43:17 -07:00
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
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
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
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
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
Seth Alves
5dd044dc29 Merge pull request #7041 from imgntn/cellscience 
Change the way cellscience entities intitialize & audio plays
 2016-02-10 14:22:30 -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
ericrius1
39bb68931f updated gun position 2016-02-05 15:48:34 -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
Eric Levin
2af6c08057 Merge pull request #7022 from imgntn/mastertoys 
Fix userData for pistol in toybox reset scripts
 2016-02-03 17:47:21 -08:00
Eric Levin
32fc973698 Merge pull request #7010 from imgntn/cellscience 
Decrease Cell Science Volume
 2016-02-03 17:46:56 -08:00
James B. Pollack
51b335c902 reduce cellscience volume 2016-02-03 09:53:14 -08:00
James B. Pollack
61daed5376 fix userdata for pistol 2016-02-02 17:39:43 -08:00
Andrew Meadows
ee96341380 Merge pull request #7001 from imgntn/masterOffsets 
Update reset scripts to use new offset style
 2016-02-02 08:25:32 -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
d2bea1f32c update reset scripts to use new offset style 2016-02-01 13:53:27 -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
James B. Pollack
64cb053c16 update it in the other spawner script 2016-01-26 10:30:26 -08:00
James B. Pollack
ce97fae1be update dice location 2016-01-26 10:27:55 -08:00
James B. Pollack
eca75ba66d cleanup 2016-01-25 14:48:15 -08:00
James B. Pollack
9a49504c56 cleanup 2016-01-25 14:32:52 -08:00
James B. Pollack
be15227bf7 test rotation 2016-01-25 14:08:19 -08:00
James B. Pollack
296a897f94 also rotate string before parenting 2016-01-25 14:03:40 -08:00
James B. Pollack
a56e213478 master scripts 2016-01-25 13:57:09 -08:00
James B. Pollack
f0ff0b45de Update hiddenEntityReset.js 2016-01-21 09:33:56 -08:00
James B. Pollack
ff9eb7f20d Update masterReset.js 2016-01-21 09:33:21 -08:00
James B. Pollack
8d3468265f make pistol collision sound quieter, other adjustments 2016-01-20 10:44:02 -08:00
Andrew Meadows
48374ef5bc more ignoreForCollisions to collisionless 2016-01-19 09:06:17 -08:00
Andrew Meadows
29a52bf0ba namechange collisionsWillMove --> dynamic 2016-01-15 15:23:52 -08:00
ericrius1
9a51a011c5 further tweaks 2016-01-13 15:51:22 -08:00
ericrius1
5a9d533e70 ping pong and gun tweaks 2016-01-13 15:30:12 -08:00
ericrius1
cda6d6e4ea bow tweaks 2016-01-13 14:44:42 -08:00
ericrius1
f02cc8fd46 Tweaked bow position 2016-01-13 14:43:52 -08:00
ericrius1
0a371e4b75 Adjusted relative hand grab data for gun, ping ponger, and bow to to optimize for owen grabbing 2016-01-13 11:06:29 -08:00
James B. Pollack
74badfb667 Update masterReset.js 
leading zeroes
 2015-12-28 21:16:38 -08:00
James B. Pollack
79a60c0648 Update hiddenEntityReset.js 
leading zeroes
 2015-12-28 21:16:15 -08:00
ericrius1
cc35eaf4be Added glow effect to ravestick 2015-12-28 17:32:10 -08:00
James B. Pollack
4b50a030e0 Update masterReset.js 2015-12-28 10:23:08 -08:00
James B. Pollack
4f80753d7b Update masterReset.js 2015-12-28 10:22:34 -08:00
James B. Pollack
679070ff6e Update hiddenEntityReset.js 2015-12-28 10:22:02 -08:00