Commit graph

962 commits

Author SHA1 Message Date
Zach Fox
1b29946a48 I feel so close; why isn't this variable capturing? 2018-04-27 17:26:05 -07:00
Zach Fox
e0352bbb29 Put SpecCam v2.0 in the source tree 2018-04-27 14:53:06 -07:00
Triplelexx
704499a76d remove Limitless API 2018-04-09 18:22:48 +01:00
Seth Alves
c534e3a6e4
Merge pull request #12356 from ctrlaltdavid/21742
Handle tablet entities and overlays not being available
2018-02-22 08:48:13 -08:00
David Rowe
fa1f2267cf Support RC63 2018-02-22 10:06:00 +13:00
David Rowe
adb6f66a05 Handle tablet entities and overlays not being available 2018-02-08 09:51:48 +13:00
David Rowe
75cf22ca7f Remove support for old High Fidelity versions 2018-02-07 09:45:21 +13:00
David Rowe
7f6471fcd1 Fix recording just made not being automatically played back 2018-02-06 13:24:41 +13:00
David Rowe
e3f9cce6e6 Fix Record app dialog not always opening successfully 2018-02-06 12:14:33 +13:00
luiscuenca
27ea74f5bf Fix sortOrder param on tablet buttons 2018-01-19 11:22:37 -07:00
David Rowe
8c2427dd58 Rename Window.protocolVersion() to Window.protocolSignature() 2018-01-19 09:06:16 +13:00
David Rowe
2883e24285 Add Window.protocolVersion() as a replacement for location's 2018-01-17 12:00:35 +13:00
Zach Fox
b2bafed2bb Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-07 11:21:24 -08:00
David Back
1aeadcbc64 prevent spectator cam from updating secondary cam aspect ratio when its in use by mirrors 2017-11-22 11:38:52 -08:00
Elisa Lupin-Jimenez
b6e75d1222 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-11-20 10:07:11 -08:00
Elisa Lupin-Jimenez
88823a169b changed url for blocks app 2017-11-20 10:01:33 -08:00
Alexander Ivash
c5d2f598d7 8244 Rename captionColorOverride to captionColor 2017-11-16 15:46:49 +03:00
Brad Davis
bb2e061d77 Fixing global declarations in JS 2017-11-15 12:00:52 -08:00
Brad Davis
26a745be6f Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet 2017-11-15 11:59:06 -08:00
Brad Davis
1167be4102 Reverting tablet API rename, cleaning up duplicated code 2017-11-15 11:52:55 -08:00
Brad Davis
7bf1b176d7 Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem 2017-11-10 14:21:24 -08:00
luiscuenca
7dfdc8da59 Redesign and clean of unused lineWidths 2017-11-09 17:50:38 -07:00
luiscuenca
ee3900be4f Corrections 2017-11-07 18:26:41 -07:00
luiscuenca
332cb48a41 Lasers and teleport scale with avatar 2017-11-07 16:57:55 -07:00
Brad Davis
d162e1cff6 Whitelist functionality for tablet apps 2017-11-04 15:14:06 -07:00
David Rowe
7cb6bae1e6 Remove stopwatch source in favor of using source in hifi-content repo 2017-10-26 14:09:50 +13:00
David Rowe
f31e014e8b Quat.ZERO --> Quat.IDENTITY 2017-10-18 20:34:55 +13:00
David Rowe
74899e4798 Preload PNG files also 2017-10-12 13:58:18 +13:00
David Rowe
f3b2ccf5f8 Preload asset files so that they're in disk cache ready for use 2017-10-12 09:09:57 +13:00
David Rowe
765f3fc381 Move Shapes app files from scripts directory to marketplace directory 2017-10-09 10:38:40 +13:00
Dante Ruiz
e397d49564 Merge pull request #11159 from vladest/modal_dialogs_async
Modal dialogs async
2017-09-26 11:07:42 -07:00
Andrew Meadows
fcff198b61 Merge pull request #11410 from humbletim/21545
WL 21545: Fix up the doppleganger mirror script
2017-09-21 08:47:24 -07:00
David Rowe
80f56e48ca Fix Record app's toolbar button not highlighting when app dialog open 2017-09-20 16:50:19 +12:00
humbletim
708698f079 potential fix for the doppleganger "scrunching into a ball" issue 2017-09-19 23:21:46 -04:00
vladest
0bfa29d0d4 Merge branch 'master' into modal_dialogs_async 2017-09-14 20:21:29 +02:00
Menithal
59746c564b 21536: Applied forgotten beutify to file 2017-09-13 21:24:24 +03:00
Menithal
40beb4bca8 Some minor tweaks 2017-09-12 22:12:30 +03:00
Menithal
79603765c4 Removed unused check 2017-09-12 21:40:15 +03:00
Menithal
5aab3f3cf3 Switched from marketplace links to local 2017-09-12 21:24:14 +03:00
Menithal
ca2d22a192 Updated Scripts 2017-09-12 21:22:40 +03:00
Menithal
30c979bd31 Added Clap App to Repository
Addede Clap App Icons to tablet icons (there needs to be another way to
do this than link directly to link or use this method!)
Added module as valid global to eslintrc
2017-09-11 23:48:30 +03:00
Melissa Brown
fe1b614f39 Merge pull request #11213 from MidnightRift/21341
WL 21341 DodgeBall
2017-09-05 15:33:31 -07:00
vladest
38295ab73f Merge conflicts 2017-08-28 16:58:30 +02:00
Elisa Lupin-Jimenez
5c027705ba removed extraneous line from active tablet button code 2017-08-24 12:01:08 -07:00
Elisa Lupin-Jimenez
3444b0e84c blocks icon button now has active state 2017-08-24 11:38:01 -07:00
Elisa Lupin-Jimenez
20b6cddc56 attempt to add active tablet button 2017-08-23 15:38:11 -07:00
Midnight
9185e1d80d code style. 2017-08-21 14:48:10 -07:00
Midnight
6892cdb57d Consolidate Clear Prox Code, Add Clear Prox to collisionWithEntity. 2017-08-18 19:20:34 -07:00
Midnight
9ff68ce10c Remove particleTrailEntity from every prox check, the trail no longer needs to be updated each check. 2017-08-18 18:51:44 -07:00
Midnight
37ee2a31d4 Remove particleTrailEntity from every prox check, the trail no longer needs to be updated each check. 2017-08-18 18:50:03 -07:00
Midnight
397d2a6853 Minor Code Cleanup. 2017-08-18 16:12:56 -07:00
Elisa Lupin-Jimenez
44f1f340e1 Merge pull request #11147 from elisa-lj11/blocks
Adding Blocks Tablet App to Marketplace
2017-08-18 15:06:18 -07:00
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