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

625 commits

Author SHA1 Message Date
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
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