Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-11 09:52:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2
87467 commits 67 branches 56 tags 1.2 GiB
Commit graph

962 commits

Author SHA1 Message Date
Ryan Huffman
d994e62726 Rename towerDefense to playTowerDefense.js 2017-02-03 10:00:55 -08:00
Ryan Huffman
10c7568398 Rename launch.js to launchEntity.js 2017-02-03 10:00:54 -08:00
Ryan Huffman
5c3be10c6c Rename destructibleEntity 2017-02-03 10:00:54 -08:00
Ryan Huffman
83ec0063c0 Update destructibleEntity to also be growable 2017-02-03 10:00:53 -08:00
Ryan Huffman
3cddf65ba1 Add wantsTrigger to blocks 2017-02-03 10:00:52 -08:00
Ryan Huffman
5022cdd2a7 Update tower defense blocks to grow 2017-02-03 10:00:51 -08:00
Ryan Huffman
ef62e6feb1 Add bow to tower defense 2017-02-03 10:00:50 -08:00
Ryan Huffman
e2e0e9d96d Add sounds and other improvements to tower defense 2017-02-03 10:00:49 -08:00
Ryan Huffman
8b9eef19c1 Integrate spawner, target, etc. into tower defense 2017-02-03 10:00:48 -08:00
Ryan Huffman
12ac274c60 Update towerButton.js reference to be relative 2017-02-03 10:00:47 -08:00
Ryan Huffman
5dbaa0ffa8 Move td files to DomainContent 2017-02-03 10:00:46 -08:00
Atlante45
58f8bd0059 Tower Defense AC script first draft 2017-02-03 10:00:45 -08:00
Ryan Huffman
5ac3ad7e50 Add border around block 2017-02-03 10:00:44 -08:00
Ryan Huffman
6598bb8d85 Add teamAreaEntity.js 2017-02-03 10:00:43 -08:00
Ryan Huffman
f53595c240 Add targetEntity.js 2017-02-03 10:00:42 -08:00
Ryan Huffman
44389bcad6 Add launcher to tower defense 2017-02-03 10:00:41 -08:00
Ryan Huffman
fa2fc83d38 Add destructibleEntity.js 2017-02-03 10:00:40 -08:00
Chris Collins
8b94e64082 Merge pull request from huffman/feat/tealight-entity-server 
Add tealight.js entity server script
 2017-01-31 20:51:19 -08:00
Ryan Huffman
8acb3f9b53 Update stopwatchServer.js to use self instead of this 2017-01-27 15:30:05 -08:00
Ryan Huffman
47235d24aa Add headers to stopwatch scripts 2017-01-27 15:29:48 -08:00
Ryan Huffman
9df7bf00df Add stopwatch spawner script 2017-01-27 15:19:40 -08:00
Ryan Huffman
f88433b7bb Add tealight.js entity server script 2017-01-27 11:23:17 -08:00
Seth Alves
204652514e fix some fallout from toolbar changes 2017-01-25 16:29:36 -08:00
Ryan Huffman
43255f16bf Add stopwatch scripts 2017-01-20 08:38:59 -08:00
Ryan Huffman
4766991cae Fix utils.js mergeObjects not checking hasOwnProperty 2016-12-05 08:22:15 -08:00
Ryan Huffman
fee9dcc981 Update bow collision hull with a simpler one 2016-12-02 09:27:53 -08:00
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 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 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 from imgntn/cellProduction 
Move cellscience to production s3 bucket
 2016-05-02 10:11:08 -07:00
Clément Brisset
ddde4e2dc4 Merge pull request 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 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 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 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 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 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 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 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 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 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