Seth Alves
2e4e10759f
teleport raypick now ignores equipped or grabbed entities
2017-04-05 13:17:03 -07:00
Stephen Birarda
1b24538756
modify scripts to use new recording API
2017-04-05 11:18:52 -07:00
David Kelly
1b6bf90843
initial analytics for connections
2017-04-05 11:10:06 -07:00
Anthony J. Thibault
c33f10ca1b
Recenter body on teleport, also it works more consistently.
...
If your avatar happens to be squatting, your body will stand up straight after you teleport.
Also, setting MyAvatar.position can sometimes fail due to the multi-threaded nature of scripting.
Instead, teleport.js uses goToPosition to move the avatar, as a result teleport feels much more responsive now.
2017-04-04 18:05:46 -07:00
kunalgosar
a5b10cc51e
alert window to give directions
2017-04-04 15:35:38 -07:00
kunalgosar
b8500e45ad
added tutorial
2017-04-04 15:35:38 -07:00
kunalgosar
d66038fff2
press B to exit finger painting
2017-04-04 15:35:38 -07:00
Seth Alves
b0b214012c
Merge pull request #10118 from hyperlogic/bug-fix/tablet-restart-scripts
...
Fix broken eventBridge on tablet after Reload All Scripts.
2017-04-04 10:45:08 -07:00
Vladyslav Stelmakhovskyi
aa487faad1
Fixed No such signal QmlWindow_QMLTYPE_490::resized(QSizeF) and No such signal QmlWindow_QMLTYPE_490::moved(QVector2D) warnings
2017-04-04 16:59:09 +02:00
Seth Alves
d1827cf12c
Merge pull request #10002 from fayeli/tablet-photobooth
...
Photobooth Improvements: Using Tablet & Ability to Rotate Model
2017-04-03 16:05:13 -07:00
Anthony J. Thibault
8ff457a1b6
Fix broken eventBridge on tablet after Reload All Scripts.
...
The main issue here was the "webEventReceived" connection between the OffscreenQMLSurface and the TabletProxy object.
For whatever reason, if this is not a direct Signal to Slot connection, the webEventReceived event does not propagate.
2017-04-03 16:03:55 -07:00
Faye Li
2ca4203d85
fix for submerge in floor issue
2017-04-03 12:57:51 -07:00
Faye Li
d726bd352d
fix for locked camera state issue
2017-04-03 12:14:29 -07:00
Anthony Thibault
999bd0d339
Merge pull request #10075 from sethalves/tablet-ui
...
Tablet ui -- misc changes + landscape mode
2017-04-03 10:43:34 -07:00
Seth Alves
b9e84691ad
Merge pull request #10092 from ctrlaltdavid/dead-code
...
Remove some dead code in edit.js
2017-04-03 09:40:30 -07:00
Seth Alves
43e1cec8a3
merge from upstream
2017-04-03 06:28:59 -07:00
Chris Collins
3c62826ef9
Merge pull request #10091 from ctrlaltdavid/21248
...
Fix HTML controls not working properly in the tablet
2017-04-01 08:41:44 -07:00
Zach Fox
8a96969471
Merge pull request #9873 from highfidelity/PAL_v2
...
PAL v2.0
2017-03-31 17:00:41 -07:00
David Rowe
6a23f3a59b
Remove some dead code noticed in passing
2017-04-01 11:25:42 +13:00
David Rowe
f397adb22a
Reinstate scrollbars to marketplace pages
2017-04-01 11:06:27 +13:00
David Kelly
8ceb6a20f0
friend/unfriend working
2017-03-31 15:05:21 -07:00
Zach Fox
6a4c2c5e12
Fix issues; checkpoint on new ComboDialog
2017-03-31 14:56:42 -07:00
David Rowe
260309ae24
Remove CSS hack no longer needed
2017-04-01 10:53:46 +13:00
Seth Alves
54c66aff07
use tablet-ui stylus as default, rather than avatar finger
2017-03-31 13:18:40 -07:00
Seth Alves
3073b47ea3
Merge pull request #10065 from ctrlaltdavid/21242
...
Address tablet scrollbar issues
2017-03-31 12:43:53 -07:00
Ken Cooke
fa53ebef30
Merge pull request #9996 from zfox23/cleanup_selectAudioDevice
...
FB3651: Fix audio devices switching when they shouldn't
2017-03-31 12:07:49 -07:00
Seth Alves
715493922e
code review
2017-03-30 17:33:01 -07:00
Zach Fox
4712ec7400
Reset pollCount; debug log when expired generated by client
2017-03-30 17:02:15 -07:00
David Rowe
a5c683192b
Improve entity properties scroll handle operation in tablet
2017-03-31 12:26:22 +13:00
Howard Stearns
0edbf1fbd9
Merge pull request #10044 from howard-stearns/pal-backend-integration
...
Pal backend integration
2017-03-30 12:55:11 -07:00
Howard Stearns
3056bb16a2
typo, and delete request on abort/fail
2017-03-30 12:40:54 -07:00
Seth Alves
c62b07d26f
add setLandscape call to tablet
2017-03-30 11:36:21 -07:00
David Kelly
e66c075f8e
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-30 10:14:29 -07:00
David Rowe
9c4414cff6
No custom styling of marketplaces directory scrollbar
2017-03-30 14:38:17 +13:00
David Rowe
c7f648a6c2
Disable marketplace directory and Clara.io scrollbars in tablet
2017-03-30 14:20:32 +13:00
Anthony J. Thibault
0e63f97f77
Test script that displays tracking data from Vive.TrackedObjects
2017-03-29 18:17:32 -07:00
Zach Pomerantz
4a9fbf2bbd
delay 200ms to avoid recursive audio dev switches
2017-03-29 19:05:41 -04:00
Zach Pomerantz
c30ab4de8b
rm extra setDevice
2017-03-29 18:48:22 -04:00
Zach Fox
a6ff3fcdb7
Tablet PAL bugfix; Connections help text v1
2017-03-29 15:47:19 -07:00
Zach Fox
1b74576259
Fix tablet-close behavior for PAL; remove users-tablet.js
2017-03-29 14:53:45 -07:00
Seth Alves
ce9eb1a377
more tablet landscape changes
2017-03-29 14:21:38 -07:00
Seth Alves
371df35013
remove code related to tablet being a model rather than an overlay. start on landscape mode
2017-03-29 14:16:14 -07:00
Howard Stearns
b8f557ca54
Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration
2017-03-29 13:30:15 -07:00
Howard Stearns
53d484c318
makes connections!
2017-03-29 13:23:31 -07:00
Howard Stearns
b0c97d3a82
putative connection integration for 2-machine testing
2017-03-29 12:22:26 -07:00
Seth Alves
63ccaee129
Merge pull request #10048 from ctrlaltdavid/open-feed-in-tablet
...
Open feed in tablet after sharing snapshot from tablet
2017-03-29 10:08:51 -07:00
David Rowe
c618e8e001
Open feed in tablet after sharing snapshot from tablet
2017-03-29 16:52:52 +13:00
Zach Fox
b776f25b3b
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-28 18:09:17 -07:00
Zach Fox
81264c998b
Revert "Merge from upstream/master"
...
This reverts commit b5ba4a109d
2017-03-28 17:39:45 -07:00
Zach Fox
b5ba4a109d
Merge from upstream/master
2017-03-28 17:37:34 -07:00
howard-stearns
c2a49a582e
send credentials to local metaverse servers, and initial users data
...
integration.
2017-03-28 16:44:16 -07:00
samcake
a03d3a1ca8
Clean up the utilities scrips of the render folder
2017-03-28 16:00:18 -07:00
Seth Alves
4516ddf855
Merge pull request #9847 from highfidelity/tablet-ui
...
Tablet ui
2017-03-28 14:48:02 -07:00
Andrew Meadows
b9e80d3fa5
Merge pull request #9972 from kunalgosar/marketsBug
...
Fixed buttons on Marketplace
2017-03-28 12:45:25 -07:00
Zach Pomerantz
06bf5807ae
fix audio setting persistence for already selected device
2017-03-28 15:34:42 -04:00
Zach Pomerantz
5e0cfb6137
short-circuit audio switching on missing device
2017-03-28 15:34:13 -04:00
Zach Pomerantz
1bdef141c3
simplify audio menu parsing
2017-03-28 15:33:54 -04:00
Seth Alves
6df4dda746
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-28 11:42:14 -07:00
Seth Alves
8e38b41e44
Merge branch 'tablet-ui' of github.com:sethalves/hifi into tablet-ui
2017-03-28 11:41:58 -07:00
Seth Alves
851ea7dabc
fix initial finger/stylus setting
2017-03-28 11:41:51 -07:00
Clément Brisset
82114ae6ab
Merge pull request #9940 from Atlante45/fix/sit
...
Fix a few sitting bugs noticed at the meetup
2017-03-28 11:14:31 -07:00
Dante Ruiz
e276bb52d2
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help-script
2017-03-28 18:14:28 +01:00
Dante Ruiz
b0e437cc5a
remove help button from tablet when reloading scripts
2017-03-28 18:14:05 +01:00
Seth Alves
0cae616ab5
Merge pull request #10031 from hyperlogic/bug-fix/mouse-disconnect-issue
...
WebTablet.js: Don't remove or add mouse callbacks onHMDChanged
2017-03-28 10:07:52 -07:00
Seth Alves
9e675d4c93
Merge pull request #9990 from hyperlogic/bug-fix/sliders
...
Added inputMode property to Web3DOverlay
2017-03-28 10:07:37 -07:00
Anthony J. Thibault
29a159b90d
WebTablet.js: Don't remove or add mouse callbacks onHMDChanged
...
This should prevent the exception on destroy, caused by disconnecting a signal that is not attached.
2017-03-28 09:27:13 -07:00
David Kelly
92718b6051
cr feedback
2017-03-28 08:57:27 -07:00
Seth Alves
b50a02ea19
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-28 08:16:59 -07:00
David Rowe
6a3dea030e
Settings link
2017-03-28 15:15:33 +13:00
David Rowe
55033df354
Merge branch 'tablet-ui' into 21238-b
2017-03-28 14:47:57 +13:00
David Rowe
a6ef592353
Non-scrolling window with images scaled to fit
2017-03-28 14:43:26 +13:00
Seth Alves
cdac011472
fix home button
2017-03-27 18:21:00 -07:00
Zach Fox
0ae4ce7e98
Have I finally tamed the beast?
2017-03-27 16:15:11 -07:00
Seth Alves
343c9335b3
Merge pull request #10023 from hyperlogic/bug-fix/stylus-touching-deleted-entity
...
tablet bug fixes
2017-03-27 14:07:14 -08:00
Brad Hefta-Gaub
3bdcfd8b78
Merge pull request #9796 from ZappoMan/removePropertiesFromRayPick
...
remove properties from RayToEntityIntersectionResult
2017-03-27 14:26:51 -07:00
David Rowe
ead1f00bbf
Title
2017-03-28 09:10:20 +13:00
David Rowe
35305b4476
Make dialog single column with images above controls
2017-03-28 08:55:38 +13:00
David Kelly
5c1e085e7b
Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-27 11:29:18 -07:00
David Kelly
76657a670c
added notifications (faked user name for now), along with switch to avatar entities
2017-03-27 11:28:57 -07:00
Seth Alves
48ea9acfb3
Merge pull request #10016 from druiz17/tablet-goto
...
Porting goto to the tablet
2017-03-27 10:04:11 -08:00
Anthony J. Thibault
5796cbc898
Bug-fix for touching deleted entities or overlays.
2017-03-27 10:26:33 -07:00
Zach Fox
e1a880a5d4
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-27 09:10:12 -07:00
David Rowe
e58e3fbbf7
Disconnect snapshot event handler when tablet "home" button pressed
2017-03-27 17:32:04 +13:00
David Rowe
dc3095bfcd
Fix "don't share" button not closing window
2017-03-27 16:24:14 +13:00
David Rowe
d0fc352d3b
Address event bridge being shared with other scripts
2017-03-27 16:07:58 +13:00
David Rowe
aa8a1e1dda
Open snapshot dialog in tablet or window appropriately
2017-03-27 15:04:33 +13:00
Seth Alves
bb28976d0e
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-26 09:32:35 -07:00
Seth Alves
90db9af2f9
Merge pull request #9978 from Triplelexx/fix-tablet-users-typo
...
fix myVisibility typo
2017-03-26 07:36:11 -08:00
Seth Alves
d45e124529
Merge pull request #9995 from hyperlogic/bug-fix/no-scroll-bar-on-marketplace
...
Hide the scrollbar on the marketplace
2017-03-25 08:36:31 -08:00
Seth Alves
3abd6b3948
Merge pull request #10006 from druiz17/tablet-help
...
Ported help into the tablet
2017-03-25 08:33:41 -08:00
Vladyslav Stelmakhovskyi
edb66ae704
Merge branch 'tablet-ui' into tablet-ui-audio-screen
2017-03-25 13:20:43 +01:00
Vladyslav Stelmakhovskyi
fc23c348cb
Implemented Audio settings screen for Tablet UI
2017-03-25 13:17:38 +01:00
Zach Fox
73a77f7f25
OK, how about now
2017-03-24 18:19:34 -07:00
Zach Fox
e88895935b
Revert "Actually merge from master"
...
This reverts commit 056d6fbe4f
2017-03-24 17:56:48 -07:00
Dante Ruiz
6178a86a46
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help
2017-03-24 23:56:33 +01:00
Dante Ruiz
119a71d0d1
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-goto
2017-03-24 23:55:18 +01:00
Seth Alves
f1470e34f9
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-24 15:17:52 -07:00
Faye Li
8cb771d9a8
fix conflict
2017-03-24 14:46:24 -07:00
Faye Li
405be471c3
button state change
2017-03-24 13:47:19 -07:00
Brad Hefta-Gaub
9b26e8ee95
Merge pull request #9871 from Triplelexx/21208
...
21208 - Muted microphone indicator
2017-03-24 13:07:43 -07:00
