Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-05 08:38:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
50738 commits 25 branches 0 tags 1.1 GiB
Commit graph

641 commits

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