Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-05 21:12:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
87398 commits 68 branches 56 tags 1.2 GiB
Commit graph

962 commits

Author SHA1 Message Date
Anthony Thibault
c40e3d6ac9 Merge pull request #10272 from Triplelexx/21292 
21292 - Implement a script to hand-raise while in desktop mode
 2017-05-11 17:38:27 -07:00
Philip Rosedale
5f4625dbed Merge pull request #10232 from amvmoody/master 
audience applause meter
 2017-05-10 21:10:05 -07:00
Mike Moody
8daf9698bd works with new version from catlyn. 2017-05-09 03:44:29 -07:00
Ryan Huffman
773e4346f9 Update copyright in sphinx scripts 
These were meant to be updated before the PR was merged, but I
overlooked it.
 2017-05-08 15:59:29 -07:00
Ryan Huffman
b7af9e20c9 Merge pull request #10211 from Delamare2112/InteractionJS 
Just the interaction JS scripts
 2017-05-08 15:54:16 -07:00
Ryan Huffman
e670037198 Adjust copyright on Limitless Sphinx script 2017-05-08 15:49:42 -07:00
Don Hopkins
c6eb1aa4e8 Fixed silly bugs with /who response and drawing lines to identify avatars. DOH! 2017-05-05 23:32:05 +01:00
Don Hopkins
a9c1e2781e Implemented chat interface script and tablet web page for worklist #21280 2017-05-04 21:40:11 +02:00
Mike Moody
55fe2f9dc0 semicolons; 2017-05-02 22:53:00 -07:00
Mike Moody
01855c0d9c made the script work with the provided assets. 2017-05-02 21:40:23 -07:00
Patterntrick
3b06057ce4 Formatting corrections. 2017-04-30 14:06:36 -07:00
Patterntrick
29231f1ad1 Updated with new audio samples and mallet model. 2017-04-30 14:03:08 -07:00
Patterntrick
8f2416cecf Removed key movement. 
Removed key movment for now because of issues with physics simulation
ownership and hand off.
 2017-04-30 13:56:37 -07:00
Patterntrick
346e8f0997 Merge remote-tracking branch 'refs/remotes/highfidelity/master' into 21210 2017-04-30 06:19:13 -07:00
Patterntrick
607bd88a50 New audio samples and mallet models. 2017-04-30 06:06:18 -07:00
Mike Moody
d805f75d55 formatted code 2017-04-27 08:44:54 -07:00
Triplelexx
9b5f19399c create tablet-raiseHand.js 2017-04-25 00:45:06 +01:00
Thijs Wenker
9ea28ab8d6 remove Script.require-less code now that the release with Script.require is out. 2017-04-18 18:02:53 +02:00
Mike Moody
29d086d390 Fixed path to asset 2017-04-17 12:49:09 -07:00
Mike Moody
c240b24efd Fixing url and renaming a folder. 2017-04-17 12:45:07 -07:00
Mike Moody
e2fa72bae6 Adding in meter code and assets. 2017-04-17 12:28:04 -07:00
Thijs Wenker
588ddfde8d fix the Script.require based entity import functionality 2017-04-17 13:35:28 +02:00
Thijs Wenker
12ef157316 cr fixes and some more style/ESLINT/structure 2017-04-17 13:16:10 +02:00
Trevor Berninger
6b96cfad42 Just the interaction JS scripts 2017-04-13 13:04:28 -07:00
Patterntrick
6f19e9f507 Merge remote-tracking branch 'refs/remotes/highfidelity/master' into 21210 2017-04-12 10:24:14 -07:00
Thijs Wenker
5c3a746f62 beautify json 2017-03-31 19:20:45 +02:00
Thijs Wenker
6967197b62 Fix checkers, actually move the red checkers on the black squares to make it playable 2017-03-31 19:11:38 +02:00
Thijs Wenker
6470a08e8a move assets from lfs 2017-03-31 19:04:55 +02:00
Thijs Wenker
1f83ae53ba move assets and links to be local 2017-03-31 18:33:34 +02:00
Thijs Wenker
b8e7be087d removal of debug prints, style fixes, added headers 2017-03-31 17:51:23 +02:00
Thijs Wenker
4c09fbfe74 initial gameTable -> Assets to GIT-LFS 2017-03-31 17:26:09 +02:00
Patterntrick
8ff4eb0a96 Added copyright header, expanded tabs to spaces 2017-03-28 18:22:22 -07:00
Patterntrick
bc33e45d0e Update xylophoneKey.js 2017-03-28 18:19:35 -07:00
Patterntrick
7ec97d8331 Added copyright header 2017-03-28 18:17:19 -07:00
Patterntrick
4588f175f4 Add files via upload 2017-03-23 16:20:24 -07:00
Patterntrick
7c37297a4d Rename XylophoneRezzer.js to xylophoneRezzer.js 2017-03-23 16:15:21 -07:00
Patterntrick
f1c243ac4e Rename pUtils.js to unpublishedScripts/marketplace/xylophone/pUtils.js 2017-03-23 16:10:31 -07:00
Patterntrick
885a279bb0 Rename xylophoneKey.js to unpublishedScripts/marketplace/xylophone/xylophoneKey.js 2017-03-23 16:09:03 -07:00
Patterntrick
a340e2ceaa Rename XylophoneRezzer.js to unpublishedScripts/marketplace/xylophone/XylophoneRezzer.js 2017-03-23 16:08:08 -07:00
Thijs Wenker
dff67886d0 CR Changes - remove double constructor, use creation function instead 2017-03-22 17:28:10 +01:00
Thijs Wenker
b60534a855 - fix for multiple boppo's appearing after ESS restart (disconnect from message event instead of connect) 
- default volume for sounds coming from ESS
 2017-03-19 14:00:56 +01:00
Thijs Wenker
a8740614e2 CR Fixes 2017-03-18 01:22:06 +01:00
Thijs Wenker
535d4f5dea fixup links 2017-03-18 00:57:50 +01:00
Thijs Wenker
bdabc21d57 fix path issue 2017-03-18 00:12:13 +01:00
Thijs Wenker
2302b157f2 Boppo script for welcome area (will be in marketplace later) 2017-03-17 21:06:50 +01:00
Ryan Huffman
5b59939195 Merge pull request #9602 from huffman/feat/shortbow-entity-server 
Add shortbow to marketplace scripts
 2017-02-27 11:09:52 -08:00
Ryan Huffman
e47b1be9cf Update shortbow spawning to use precise picking to find the ground 2017-02-24 14:48:22 -08:00
Ryan Huffman
85099513cd Reduce enemy lifetime to 30s 2017-02-24 14:48:01 -08:00
Ryan Huffman
efd1a5c600 Update parameter name in getPropertiesForEntities 2017-02-23 16:38:28 -08:00
Ryan Huffman
0da9f72c42 Update spawn position/rotation of bows in shortbow 2017-02-23 16:05:12 -08:00
Ryan Huffman
4c310e1048 Update shortbow to use spawner entities to specify position/rotation at runtime 2017-02-23 16:02:56 -08:00
Ryan Huffman
c8ec5cbf5d Fix coding standard issues in shortbow 2017-02-23 13:15:14 -08:00
Ryan Huffman
dd895dc04a Fix js linting issues in shortbow 2017-02-22 16:49:22 -08:00
Ryan Huffman
619867293e Fix syntax error in spawnBow.js 2017-02-22 09:12:25 -08:00
Ryan Huffman
ae4879afeb Add minimum distance that you need to pull bow arrow back to shoot 2017-02-22 09:12:02 -08:00
Ryan Huffman
9e39d0a0bb Update shortbow enemy lifetime from 3 minutes to 1 minute 2017-02-17 10:54:55 -08:00
Ryan Huffman
7e5c1907d9 Update spawnShortbow.js to stop after done spawning 2017-02-17 10:53:40 -08:00
Ryan Huffman
0fab462181 Update shortbow to edit entities directly instead of using messsages 2017-02-17 10:53:10 -08:00
Ryan Huffman
750bd0ba12 Add bow.json 2017-02-14 13:28:29 -08:00
Ryan Huffman
5096993851 Add Amber.fbx to shortbow/models 2017-02-08 16:14:47 -08:00
Ryan Huffman
8c088336e8 Move shortbow models to /models 2017-02-08 14:32:16 -08:00
Ryan Huffman
f32df4f004 Move shortbow sounds to /sounds 2017-02-08 14:30:31 -08:00
Ryan Huffman
58e3351b25 Update stopwatch to use relative paths to models + sounds 2017-02-08 14:27:06 -08:00
Ryan Huffman
40bd7d9475 Update the stopwatch spawn script to exit when done 2017-02-08 14:10:04 -08:00
Ryan Huffman
bc11bf0a69 Update position and orientation of stopwatch 2017-02-08 14:09:50 -08:00
Ryan Huffman
f0238ec4d7 Merge pull request #9538 from huffman/feat/stopwatch 
Add stopwatch example script
 2017-02-06 08:32:19 -08:00
Ryan Huffman
4e18305813 Remove cache busters from shortbow 2017-02-03 10:38:18 -08:00
Ryan Huffman
bf311aad4e Remove bow/utils.js 2017-02-03 10:33:40 -08:00
Ryan Huffman
a8c8edd914 Fix typos in README 2017-02-03 10:14:36 -08:00
Ryan Huffman
280ea7b2c0 Move addition of localPosition to template data to shortbow.js 2017-02-03 10:14:35 -08:00
Ryan Huffman
69abdf7dd2 Add headers to shortbow scripts and add minor cleanup 2017-02-03 10:14:32 -08:00
Ryan Huffman
f412e4cdea Add more information to the shortbow README.md 2017-02-03 10:14:31 -08:00
Ryan Huffman
ecb8490978 Rename shortbow files and cleanup several names 2017-02-03 10:14:30 -08:00
Ryan Huffman
84f82f1838 Move shortbow to marketplace/shortbow 2017-02-03 10:14:29 -08:00
Ryan Huffman
d9861c2afd Remove old tower defense game content 2017-02-03 10:14:28 -08:00
Ryan Huffman
da2dd60bec Move shortbow content to separate directory 2017-02-03 10:14:27 -08:00
Ryan Huffman
ff71d5df97 Move enemy/scoreboard/startbutton in shortbow to actor model 2017-02-03 10:14:25 -08:00
Ryan Huffman
582b1eca46 Update max lives in shortbow to 6 2017-02-03 10:14:25 -08:00
Ryan Huffman
0e1d9b9d56 Add handling of lost entities to shortbow 2017-02-03 10:14:24 -08:00
Ryan Huffman
4df2489ff9 Fix scoreboard not updating in shortbow 2017-02-03 10:14:23 -08:00
Ryan Huffman
b60651487e Update shortbow to use Entity Server Script 2017-02-03 10:01:17 -08:00
Ryan Huffman
312c2b8138 Add fail-safe to shortbow if enemy killed message is lost 2017-02-03 10:01:16 -08:00
Ryan Huffman
01784ba85a Fix wave complete and game over sounds not playing at correct location 2017-02-03 10:01:15 -08:00
Ryan Huffman
3e3ca6596e Adjust bow gravity and position/rotation 2017-02-03 10:01:14 -08:00
Ryan Huffman
efa39dce2e Add support for global high score to shortbow 2017-02-03 10:01:13 -08:00
Ryan Huffman
01c285c842 Update shortbow platform dimensions: 2017-02-03 10:01:12 -08:00
Ryan Huffman
791cd5c0e7 Update bow behavior 
Velocity scaled based on how far you've drawn the arrow
Bow can't be pulled off the bow
 2017-02-03 10:01:11 -08:00
Ryan Huffman
3a6e2a1752 Update shortbow assets 2017-02-03 10:01:10 -08:00
Ryan Huffman
4487fd813d Adjust script udpate frequency to improve bow performance 2017-02-03 10:01:09 -08:00
Ryan Huffman
d5b5a1979e Update shortbow sounds and models 2017-02-03 10:01:08 -08:00
Ryan Huffman
6adc0d2aac Update shortbow button and layout 2017-02-03 10:01:07 -08:00
Ryan Huffman
8bbf3e8d89 Update bow strings to be updated after getting the hand position 2017-02-03 10:01:06 -08:00
Ryan Huffman
72da30e5bd Update bow.js to use setInterval 2017-02-03 10:01:05 -08:00
Ryan Huffman
410271a5b6 Add high score display to bowgame 2017-02-03 10:01:04 -08:00
Ryan Huffman
a2c5c0f36e Update lifetime of bow when using spawnBow.js 2017-02-03 10:01:01 -08:00
Ryan Huffman
40b428c788 Add random jumping to targets in wave game 2017-02-03 10:01:00 -08:00
Ryan Huffman
9f5435133a Add wave game sounds, fix wave 10 bug, update the way waves spawn 2017-02-03 10:00:59 -08:00
Stephen Birarda
871c5ad38b add a simple particle effect to arrows from bow 2017-02-03 10:00:58 -08:00
Ryan Huffman
ba5f8d0831 Add initial code for wave game 2017-02-03 10:00:57 -08:00
Ryan Huffman
43bbac2457 Update position that the arrow is held at 2017-02-03 10:00:56 -08:00
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 #9539 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 #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