Commit graph

960 commits

Author SHA1 Message Date
Midnight
7da4bc04d3 Add DodgeBall. 2017-08-18 13:36:07 -07:00
Elisa Lupin-Jimenez
65f876acf3 enabled version check 2017-08-18 10:49:40 -07:00
Elisa Lupin-Jimenez
4c28b9f09a attempt to check version of interface 2017-08-17 18:16:41 -07:00
Elisa Lupin-Jimenez
4b1498f727 moved blocksApp.js to unpublished scripts, added icon 2017-08-17 10:18:29 -07:00
Elisa Lupin-Jimenez
a9d5cb45e9 changed icon to white 2017-08-17 10:11:29 -07:00
Elisa Lupin-Jimenez
930f163ca1 added app icon 2017-08-16 17:57:32 -07:00
Elisa Lupin-Jimenez
e032979794 a little cleanup 2017-08-16 17:33:14 -07:00
Elisa Lupin-Jimenez
bf35b08179 Emoji tablet app 2017-08-16 17:27:29 -07:00
vladest
15f8bc0141 Keep old function names for compatibility 2017-08-16 22:17:34 +02:00
vladest
51a5c30353 Reimplement asset browsing for async 2017-08-15 17:05:55 +02:00
Cain Kilgore
e7a4bff705 Made Changes per Review, added js 2017-08-14 22:47:18 +01:00
Andrew Meadows
23c3715e8f Merge pull request #10902 from jmo7/21391
Worklist #21391 Implement a Parenting Tool
2017-08-08 14:56:24 -07:00
VRCat\VRKitten
41c8c5da99 Order of multiplication of quaternions for rotation reversed
Per AndrewMeadows comments and up = yAxis not necessarily always being true in the future, the ROT_Y_180 has been moved to be the second quaternion in the multiplcation to determine rotation
2017-08-07 14:17:32 -06:00
Anthony Thibault
732d0de48d Merge pull request #10976 from humbletim/21446
WL 21446: Add doppleganger "move-as-you-move" roomscale functionality
2017-08-03 17:22:49 -07:00
VRCat\VRKitten
dfb6027347 Last Fixes
- Made parent-ator be off unless it is equipped (this does have the ramification that it does not turn on when it first rezzes. When you equip it it turns on)
- Added the localOnly: true setting to the audio
2017-08-02 16:50:23 -06:00
rabelaiis
f1d7ef76e7 Add the mallet js file 2017-08-01 23:41:16 +07:00
rabelaiis
1f6b92a519 Vibrate only the controller that hits the key and decrease timeout so that the xylophone can be played faster 2017-07-31 17:27:49 +07:00
humbletim
b5f5a037f0 remove "grabbable: true" property from attachment Overlays 2017-07-30 16:25:56 -04:00
rabelaiis
8b7a29c3f3 remove putils reference 2017-07-28 06:22:29 +07:00
rabelaiis
dd76c30de5 Make Xylophone mallets equipable, make the mallets provide haptic feedback, fix a closing bracket bug stopping the xylophone from working and clean up code according to coding standards 2017-07-27 17:31:30 +07:00
Melissa Brown
e50422d5b9 Merge pull request #11034 from MrRoboman/21342-dart
added dart scripts
2017-07-26 15:10:58 -07:00
VRCat\VRKitten
635be3e2e9 Fixes for issues found with last Pull Request
1)  Does not give the message regarding not having permissions except for when first rezing the tool.
▶ Fixed - Added in a check for every time there is a collision between the parent-ator and another entity

2) Sound almost unhearable due to distortion
▶ Fixed -  Changed audio to 16 bit mono

3) The Parent-ator model rezzes pointing at the user's face. Would probably be better to add 180 to START_POSITION.y then normalize.
▶ Fixed - Added 180 to START_ROTATION (instead fo START_POSITION) and normalized

4) The Parent-ator model floats away. Would suggest increasing linear damping from the default. Maybe go to 0.9 or more.
▶ Fixed - Added damping of 0.9

5) The face normals are inverted on the three rings surrounding the barrel of the Parent-ator model.
▶ Fixed - Normals flipped

6) Also if the user taps an object then releases and re-equips with the Parent-ator it continues to display "tap the child" but will set the object tapped first as the child of the first other object tapped after re-equipping. So the messages change from Tap the child to the "Yay" success message.
▶ Fixed - Re-equiping now resets the parent-ator.

7) Parenting can be broken with this. On occasions the Parentator seems to get out of sequence. With a group of objects eventually one or more can get orphaned. In effect (occasionally ) a single first tap can produce the success message.
▶ Believed to be fixed - I was unable to really reproduce the problem but the fix for the previous item should fix this too, I believe.

8) There is an error in the description on line 7 of parentator.js
▶ Fixed - Changed reference to pingpong gun to parent-ator

9) Equipping can fail with a smaller than normal avatar as the offsets are hard coded rather than scaled relative to the user's scale.
▶ Fixed - I realized I was adding the entity with larger dimensions than the model normally had. I've scaled it down to where it should be and I think this has solved the issue.
2017-07-26 12:14:59 -06:00
VRCat\VRKitten
a1f2e786af Merge branch 'master' of https://github.com/highfidelity/hifi into 21391 2017-07-26 11:54:56 -06:00
Zach Fox
30a571cc48 Merge pull request #11041 from amvmoody/wl_21472
WL 21472: restore snails ability to eat sprouts
2017-07-25 13:07:58 -07:00
Mike Moody
34594b914d Added and removed different normalizations. 2017-07-24 23:55:44 -07:00
Mike Moody
dc53017dd4 Created script to let Snails eat brussel sprouts. 2017-07-24 23:17:13 -07:00
Mike Moody
1bf2855e9b Created script for spherical gravity. 2017-07-24 18:47:24 -07:00
Mike Moody
62efb32671 Created script for spherical gravity. 2017-07-24 18:39:09 -07:00
Mike Moody
e900dae708 Created script for spherical gravity. 2017-07-24 18:34:58 -07:00
Rob Kayson
507368726f added dart scripts 2017-07-24 14:38:22 -07:00
Clément Brisset
18be917358 Merge pull request #10574 from humbletim/21180
CR #21180 Camera control app
2017-07-18 15:35:32 -07:00
humbletim
7bcd9f9f95 * integrate support for room scale "moves as you move"
* migrate doppleganger debug controls into separate module
* misc cleanup
2017-07-17 12:47:29 -04:00
Zach Fox
2c94917fb8 Add necessary button protection 2017-07-13 12:58:47 -07:00
Zach Fox
dc1b4b5324 New icons 2017-07-12 16:48:04 -07:00
Zach Fox
a4d95f9bf8 Play sound when turning camera on 2017-07-12 16:39:56 -07:00
Zach Fox
6237b5fc0a Camera faces you, but offset 2017-07-12 16:24:56 -07:00
Zach Fox
b5a1c65622 New model, smaller filesize 2017-07-12 16:10:20 -07:00
Zach Fox
5f50f29060 New model 2017-07-12 15:56:39 -07:00
Zach Fox
8294df8b76 != to !== 2017-07-12 15:37:06 -07:00
Zach Fox
e6f7457d0c Fixes 2017-07-12 15:17:23 -07:00
Zach Fox
d37789234d Remove from default scripts 2017-07-12 14:37:57 -07:00
Zach Fox
63b0e70833 Prepare for marketplace submission 2017-07-12 14:19:08 -07:00
Seth Alves
4a35ad105b Merge pull request #10615 from amvmoody/21358
WL 21358 Create a Laser Pointer app
2017-07-10 14:21:54 -07:00
Mike Moody
4b593d1ab4 Added fallback method using controllers if joints do not exist. 2017-07-08 15:18:27 -07:00
VRCat\VRKitten
0f44e67c88 Worklist #21391 Implement a Parenting Tool 2017-07-05 15:45:49 -06:00
Zach Fox
495f702722 Merge pull request #10868 from CainFoool/rocket-hands
WL 21421 - Script to Fly with Rocket Hands
2017-07-03 12:05:06 -07:00
Cain Kilgore
eddb7a349c Boilerplate 2017-07-03 20:01:01 +01:00
Cain Kilgore
1c5923914b Combining three if statements into one! 2017-07-03 19:58:26 +01:00
Cain Kilgore
bfcddcf3b7 Cleaned up the code, created a function to check if the hands are in the right position. 2017-07-03 19:53:29 +01:00
Cain Kilgore
5f600b4ea9 Cleanup again 2017-07-03 19:31:41 +01:00
Cain Kilgore
44624c5fab space 2017-07-03 19:11:57 +01:00
Cain Kilgore
2c53b5b372 QA Cleanup 2017-07-03 19:09:54 +01:00
Cain Kilgore
7d382d9da0 Fixed spelling, added is in HMD Check, removed Haptic Feedback as it wasn't part of the WL 2017-07-03 17:47:54 +01:00
Chris Collins
19bbe307b2 Merge pull request #9927 from Patterntrick/21210
Xylophone scripts
2017-07-03 05:57:36 -07:00
Cain Kilgore
44f0b8bd60 Support for Oculus & Vive - cleaned up some code, using Script.connect instead of setInterval 2017-07-02 11:41:33 +01:00
Cain Kilgore
e0120ebf30 Rocket Hands 2017-07-02 03:20:07 +01:00
Brad Hefta-Gaub
a32f7b2395 Merge pull request #10743 from humbletim/21383
CR 21383: Integrate attachments into doppleganger mirror
2017-06-26 09:54:04 -07:00
humbletim
d6eb77e815 changes per feedback to quiet print debugs throughout 2017-06-23 13:09:22 -04:00
Brad Hefta-Gaub
a2fa1cd532 Merge pull request #10757 from CainFoool/master
WL 21386: ShortBow Improvements
2017-06-22 13:38:41 -07:00
humbletim
0ef623ba06 * revert button icons and name
* add new attachmentsUpdated signal and connect to 'doppleganger_attachments' logAction
* fix typo in debug mode
2017-06-22 12:45:53 -04:00
Mike Moody
ae960b840a accounted for the forward offset 2017-06-21 21:24:34 -07:00
Mike Moody
6e34971889 Changed to use with Index finger and minor cleanup. 2017-06-21 20:43:16 -07:00
humbletim
c9874a7489 more workarounds for the backwards-incompatible EventBridge changes 2017-06-21 16:35:29 -04:00
humbletim
9d4f9b0a4b more safeguards to help diagnose broken EventBridges 2017-06-21 16:00:47 -04:00
humbletim
3d7676e918 reduce non-debug log spam 2017-06-21 15:57:28 -04:00
humbletim
01436675b1 * recent changes in master broke event bridge; updated to latest scheme
* fix update throttling for rapidly-changed values from the tablet UI
* include default values for several advanced settings (so if user changes the RESET button works better)
* reduce log spam
2017-06-21 15:22:32 -04:00
humbletim
294d588fc4 fix Scene.shouldRender* debugging checkboxes 2017-06-21 12:59:05 -04:00
Cain Kilgore
02b3a07e67 Removed old smoke 2017-06-20 20:55:07 +01:00
Cain Kilgore
d4665da065 Fixed new smoke effect not spawning correctly. 2017-06-20 20:53:04 +01:00
Cain Kilgore
6652399534 Replaced texture & sound effect. 2017-06-20 20:33:50 +01:00
humbletim
e6e1ae16db swap-in different icon for now 2017-06-19 17:23:56 -04:00
humbletim
46e9ada424 cleanup pass 2017-06-19 16:58:06 -04:00
humbletim
e25b567ff1 comment-out debug requires, bump back to 60fps 2017-06-19 16:11:18 -04:00
humbletim
1a9db003e5 doppleganger + attachments 2017-06-19 16:01:59 -04:00
humbletim
89ebf4998f relocate/archive original doppleganger mirror into unpublishedScripts/marketplace/doppleganger-mirror 2017-06-19 10:28:56 -04:00
Cain Kilgore
394560c979 Added sound effect (temp) when you hit a ball, plus added a check to ensure the game doesn't hang waiting for balls out of the arena. 2017-06-18 07:27:49 +01:00
Cain Kilgore
135beb2d48 Small amounts of cleanup - added Smoke effect when Ball is Hit by Arrow 2017-06-18 02:03:29 +01:00
Thijs Wenker
57692051c0 bake shortbow 2017-06-17 01:56:38 +02:00
Cain Kilgore
26446b6b33 Debugging info - check what the arrow hit 2017-06-17 00:51:34 +01:00
Cain Kilgore
80b50927d3 Added smoke image & references 2017-06-17 00:33:16 +01:00
Cain Kilgore
2e56b0d639 Test C ommit 2017-06-17 00:29:25 +01:00
humbletim
2a8b91e45e cleanup pass 2017-06-16 16:07:50 -04:00
humbletim
c8d503f717 split into smaller modules for review 2017-06-11 05:42:55 -04:00
humbletim
16170cd754 create clean branch for unpublishedScripts/marketplace/camera-move app 2017-06-09 07:09:26 -04:00
Liv
0e27ad767c Move chat app to be included as part of the default scripts 2017-06-08 13:07:01 -07:00
Mike Moody
9f669748f4 header and cleanup. 2017-06-04 21:34:56 -07:00
Mike Moody
fb869034f2 fixing magic numbers
changing to local entity
making var names more friendly
2017-06-04 21:05:30 -07:00
Clément Brisset
0a864a7ce9 Merge pull request #10570 from ctrlaltdavid/21376
Move record script files to unpublishedScripts directory
2017-06-02 16:25:56 -07:00
Mike Moody
91db29e92f laser initial commit 2017-06-02 15:34:25 -07:00
David Rowe
f0c56dac3f Further files required for record script 2017-06-01 09:09:17 +12:00
David Rowe
d891c834ba Move record script files to unpublishedScripts directory 2017-05-31 09:06:11 +12:00
David Rowe
019e92b2a3 Fix buttons not working with controllers 2017-05-27 11:27:18 +12:00
David Rowe
8a659955cc Delete old script 2017-05-26 13:02:26 +12:00
David Rowe
b1280ff810 Implement start/stop and reset button actions 2017-05-26 13:02:05 +12:00
David Rowe
f25a9dcede Add entities to capture stopwatch button clicks 2017-05-26 13:01:19 +12:00
David Rowe
504faf430d Fix rotation axes of stopwatch hands 2017-05-25 09:35:51 +12:00
Andrew Meadows
d705f529a0 use 'tractor' instead of 'spring' in JS files 2017-05-16 08:35:54 -07:00
Brad Hefta-Gaub
8ce31ccc89 Merge pull request #10385 from SimHacker/21280
Implemented chat interface script and tablet web page for worklist #21280
2017-05-12 12:29:40 -07:00
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