Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-15 22:19:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
54667 commits 72 branches 59 tags 1.2 GiB
Commit graph

736 commits

Author SHA1 Message Date
Ryan Huffman
d051cef1a5 Remove bow/entity.json 2016-12-02 08:40:39 -08:00
Ryan Huffman
680596d808 Move bow to unpublishedScripts 2016-12-02 08:18:47 -08:00
Ryan Huffman
47d7e89699 Update portal to ensure that properties exist 2016-10-27 15:03:15 -07:00
howard-stearns
963fd68cd9 remove backwards compatability 2016-10-24 11:06:32 -07:00
howard-stearns
4c4ec37eb3 add home portal entity script and make it go to correct welcome 2016-10-24 10:28:32 -07:00
Brad Hefta-Gaub
f9054bef9b Merge pull request #8816 from davidkelly/dk/1811 
CellScience play button doesn't play anything
 2016-10-17 21:20:57 -07:00
Howard Stearns
e5c6fcaa70 Get Cells and vesicles just once, 20 seconds after we start querying (and shut down queries). 2016-10-15 17:01:19 -07:00
David Kelly
18849d5416 Fixed sound issue 
Long ago, localOnly didn't change volume based on position, let alone
do HTRF.  Now it does, though only the former on stereo .wav files.  So
we were playing the sound at a position far from where you may have
been, and also with a really low volume.  This addresses both.
 2016-10-14 14:42:50 -07:00
David Kelly
89665d4853 Correct audio url for play button 
Probably this used to be correct?  Anyways seems to work now
 2016-10-13 12:05:59 -07:00
Ryan Huffman
c95b694524 Tweak tutorial to add delays between steps 2016-10-07 10:30:18 -07:00
Ryan Huffman
c84ccaaac0 Update overlay for tutorial 2016-10-07 10:30:18 -07:00
Atlante45
dd60683e29 Move steam.js to unpublishedScripts 2016-08-19 17:14:14 -07:00
James B. Pollack
708cce64b6 work with far trigger 2016-07-25 11:05:55 -07:00
James B. Pollack
f9e8ada954 new whiteboard for home 2016-07-21 17:18:45 -07:00
James B. Pollack
6d3129899b remove prints, fix typo, formatting 2016-06-29 11:47:41 -07:00
James B. Pollack
0e3b54c130 remove logging 2016-06-29 11:07:48 -07:00
James B. Pollack
fcb6e7869d logging 2016-06-29 10:54:24 -07:00
James B. Pollack
d8aeb26a6c haptic 2016-06-20 16:26:48 -07:00
James B. Pollack
f6d19ba32f add short haptic pulse on release 2016-06-20 16:25:48 -07:00
James B. Pollack
aa742a50ca release 2016-06-20 16:19:34 -07:00
James B. Pollack
7579102b1a updates 2016-06-20 15:50:49 -07:00
James B. Pollack
c545f53c75 target script attached in reset spawner 2016-06-07 14:43:23 -07:00
James B. Pollack
6573b3c71e remove bricabrac from dressing room shelves for now 2016-06-07 14:37:19 -07:00
James B. Pollack
9f4289ae1b add down velocity to shelfy things 2016-06-07 13:31:42 -07:00
James B. Pollack
577142a4d1 add ping pong target and milk pail game 2016-06-06 18:41:14 -07:00
James B. Pollack
3603c8cf2e add hover game scripts 2016-06-06 09:12:07 -07:00
James B. Pollack
eb3cafb4f9 shelf things 2016-06-06 08:59:41 -07:00
James B. Pollack
47a84fe91d make shelf stuff wearable 2016-06-04 20:51:46 -07:00
James B. Pollack
27594e6df2 remove afro 2016-06-03 17:07:08 -07:00
James B. Pollack
f6644ad2bb change artemis url 2016-06-02 16:58:48 -07:00
James B. Pollack
b171b5e9eb update blocky 2016-06-01 13:40:46 -07:00
James B. Pollack
f1e826b305 make blocky swipable 2016-05-24 15:28:11 -07:00
James B. Pollack
c7ae3396eb end of day 2016-05-23 17:29:16 -07:00
James B. Pollack
fafea94196 new blocky, delete old files 2016-05-23 16:48:21 -07:00
James B. Pollack
7cf56401f5 teleport sparkles, dressing room switch 2016-05-23 15:05:44 -07:00
James B. Pollack
266dfcd8e9 new lightswitches and cleanup old code, also more blocky stuff 2016-05-23 11:45:55 -07:00
James B. Pollack
5211b6ad77 add blocky 2016-05-21 11:43:12 -07:00
James B. Pollack
6bc745ee01 end of day 2016-05-20 17:05:38 -07:00
James B. Pollack
7f89ded241 add blocky 2016-05-20 16:55:12 -07:00
James B. Pollack
fdb0fa4559 add blocky start 2016-05-20 16:21:52 -07:00
James B. Pollack
a48d26a59d individual switches 2016-05-20 16:18:40 -07:00
James B. Pollack
f2f911ef29 remove blocks 2016-05-20 16:15:15 -07:00
James B. Pollack
69d3821424 Merge branch 'master' into moreshelfstuff 2016-05-20 14:35:02 -07:00
James B. Pollack
a00ce2599c cleanup 2016-05-19 17:54:10 -07:00
James B. Pollack
bc29bcf0d2 light switch swap 2016-05-19 11:18:30 -07:00
James B. Pollack
d50681243c bricabrac, bench, no blue chair, umbrella 2016-05-18 14:49:30 -07:00
James B. Pollack
d6d94b7d17 switch branches 2016-05-18 14:12:45 -07:00
James B. Pollack
8026a5e7f0 fix utils paths 2016-05-18 10:30:43 -07:00
James B. Pollack
17b617f1e1 umbrella 2016-05-18 10:23:45 -07:00
James B. Pollack
d24ec08f9f cleanup 2016-05-18 08:55:02 -07:00
James B. Pollack
5d1b2996d3 semicolon 2016-05-18 08:53:57 -07:00
James B. Pollack
946558d0f6 cleanup 2016-05-18 08:53:13 -07:00
James B. Pollack
0c5adf83ce fix hands 2016-05-18 08:43:53 -07:00
James B. Pollack
5442ffaf3e glow light 2016-05-12 16:58:29 -07:00
James B. Pollack
d1d0bbdd26 tidy 2.0 2016-05-12 16:46:58 -07:00
James B. Pollack
8cac61081d change cuckoo and whiteboard positions 2016-05-11 10:33:06 -07:00
James B. Pollack
46c6999dd4 add fire sound 2016-05-11 09:59:50 -07:00
James B. Pollack
af8a827c83 add fire remove plant 2016-05-10 17:18:21 -07:00
Brad Hefta-Gaub
d89c339b6a Merge pull request #7803 from imgntn/homeUpdates 
[Home] Dressing Room Updates
 2016-05-05 11:06:10 -07:00
James B. Pollack
6d3a3b0cc5 cleanup comments, semicolons 2016-05-05 10:37:32 -07:00
James B. Pollack
8d48f54313 fix ribosome location 2016-05-04 12:41:33 -07:00
James B. Pollack
e5ed5218e3 fix ribsome 2016-05-04 12:30:07 -07:00
James B. Pollack
83a7677766 update button position 2016-05-04 12:28:09 -07:00
James B. Pollack
d98732d5a1 dressing room updates 2016-05-03 12:08:44 -07:00
James B. Pollack
0b867713cb dressing room updates 2016-05-02 16:26:05 -07:00
Brad Hefta-Gaub
d599d008c3 Merge pull request #7757 from imgntn/cellProduction 
Move cellscience to production s3 bucket
 2016-05-02 10:11:08 -07:00
Clément Brisset
ddde4e2dc4 Merge pull request #7793 from imgntn/toyboxProduction 
Move Toybox Domain to Production s3
 2016-04-29 13:27:09 -07:00
James B. Pollack
4fd6647d0b add rave stick entity script 2016-04-28 18:25:09 -07:00
James B. Pollack
45bb91cb0b planky 2016-04-28 18:20:20 -07:00
James B. Pollack
d7d667c99b add utils scripts 2016-04-28 18:17:38 -07:00
James B. Pollack
f73ef9b4a9 cleanup 2016-04-28 18:03:38 -07:00
James B. Pollack
366d9869e6 convert the rest 2016-04-28 18:03:18 -07:00
James B. Pollack
5e31c5f385 convert flashlight and music player 2016-04-28 17:44:14 -07:00
James B. Pollack
a9c95d8e7c convert flappy avatars 2016-04-28 17:42:33 -07:00
James B. Pollack
cf2d82d320 convert cat and doll 2016-04-28 17:19:35 -07:00
James B. Pollack
703acd61eb convert bubblewand 2016-04-28 16:38:33 -07:00
James B. Pollack
6fc1cdc41f convert bow 2016-04-28 16:37:19 -07:00
James B. Pollack
6c6d5905cc more bball 2016-04-28 16:29:32 -07:00
Brad Hefta-Gaub
bc57719f5f Merge pull request #7771 from ericrius1/lampFix 
Lamp fix- moves light position up a bit on desklamp at home
 2016-04-28 16:29:03 -07:00
James B. Pollack
e519d483a9 convert sounds 2016-04-28 16:27:31 -07:00
James B. Pollack
40c1563b1f convert bball rack 2016-04-28 16:21:03 -07:00
James B. Pollack
3f0807fc68 add utils and rewrite a lot of include refs 2016-04-27 23:49:38 -07:00
James B. Pollack
b2564e8266 move toybox resetter scripts 2016-04-27 23:42:01 -07:00
ericrius1
72f272b5d3 lampfix 2016-04-27 09:48:16 -07:00
James B. Pollack
fc5960fa15 individual buttons 2016-04-26 17:00:12 -07:00
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