David Rowe
ebe3561582
Merge branch 'master' into 21249
2017-04-08 10:46:16 +12:00
Brad Davis
91f8bf45b8
Merge pull request #10159 from highfidelity/revert-10158-revert-10157-brown
...
Fixing the rendering bug triggered with Nvidia driver 381.65
2017-04-07 09:53:41 -07:00
Howard Stearns
5d341778c5
fix notification word wrapping
2017-04-07 07:08:19 -07:00
samcake
f82310545c
Revert "Revert "Fixing the rendering bug triggered with Nvidia driver 381.65""
2017-04-07 02:03:58 -07:00
samcake
ab3d39951e
Revert "Fixing the rendering bug triggered with Nvidia driver 381.65"
2017-04-07 02:03:31 -07:00
Sam Cake
b1a4bc329b
Introducing a fix to the graphics bug
2017-04-07 01:10:18 -07:00
Sam Cake
da1355dc32
Introducing a fix to the graphics bug
2017-04-07 01:03:07 -07:00
David Rowe
1ef5f048a3
Inform user if recording failed to start
2017-04-07 18:53:20 +12:00
David Rowe
ce898ae42a
Play recording
2017-04-07 18:38:55 +12:00
David Rowe
75d970f5d5
Remove unresponsive players from list
2017-04-07 17:30:03 +12:00
David Rowe
81d8d238de
Refactor log and error messages
2017-04-07 17:13:23 +12:00
David Rowe
5e55233934
Assignment client player script receives "play" command from recorder
2017-04-07 17:04:24 +12:00
David Rowe
506a414762
Lint fix
2017-04-07 14:06:16 +12:00
David Rowe
858e9650a3
Encapsulate recording methods in Recorder object
2017-04-07 14:03:08 +12:00
howard-stearns
b089fd03b8
make connection messaging when not logged in
2017-04-06 16:48:11 -07:00
David Rowe
68901c8af5
Merge branch 'master' into 21249
2017-04-07 11:04:43 +12:00
David Rowe
49907970fb
Fix countdown showing if restart with dialog open and recording enabled
2017-04-07 11:01:11 +12:00
David Rowe
f164fe7532
Improve error handling
2017-04-07 10:46:40 +12:00
Dante Ruiz
a89081601c
fix merge issues
2017-04-06 22:31:47 +01:00
Dante Ruiz
52fd446d4d
toggle goto in tablet
2017-04-06 22:27:37 +01:00
Seth Alves
3c6429cdf3
Merge pull request #10103 from vladest/master-qml-bugfixes
...
Master qml bugfixes
2017-04-06 14:22:06 -07:00
Howard Stearns
f7ef587c61
Merge pull request #10138 from davidkelly/dk/3935
...
Now you can forget connections
2017-04-06 14:05:25 -07:00
David Kelly
34a2cefb98
Merge pull request #10132 from davidkelly/dk/analyticsForConnections
...
initial analytics for connections
2017-04-06 10:45:39 -07:00
David Kelly
a92162dea9
no mo useless debug statements
2017-04-06 08:50:22 -07:00
David Rowe
23c937e55d
Make avatar recording and upload to asset server
2017-04-06 18:50:47 +12:00
David Rowe
a9f5b60319
Fix recording starting on tablet when close dialog rather than tablet
2017-04-06 15:32:42 +12:00
David Rowe
982c0ec559
Display countdown in overlay
2017-04-06 15:01:53 +12:00
David Kelly
61ece265f4
now you can forget connections
2017-04-05 18:16:16 -07:00
David Rowe
4580b89aa6
Add countdown delay before starting recording
2017-04-06 12:08:27 +12:00
Anthony Thibault
be2fdd9388
Merge pull request #10063 from hyperlogic/feature/vive-tracked-objects
...
Vive: Expose all 16 tracked poses to the controller system
2017-04-05 16:53:47 -07:00
David Rowe
096909d423
Close dialog if open when stop script
2017-04-06 10:10:07 +12:00
David Rowe
b8de31db12
Make toolbar icon close dialog if it's open
2017-04-06 10:09:41 +12:00
David Rowe
813a5684e3
Display instruction text only if recording is enabled
2017-04-06 09:22:01 +12:00
Seth Alves
2e4e10759f
teleport raypick now ignores equipped or grabbed entities
2017-04-05 13:17:03 -07:00
David Kelly
1b6bf90843
initial analytics for connections
2017-04-05 11:10:06 -07:00
David Rowe
b29bfd4bb4
Dialog instructions refer to tablet or window as appropriate
2017-04-05 17:49:13 +12:00
David Rowe
54a0bea8c0
Toolbar icon state and start/stop recording with window closing/opening
2017-04-05 17:48:35 +12:00
David Rowe
a625fd4523
Add dialog with "Enable recording" checkbox
2017-04-05 16:20:04 +12:00
David Rowe
d748068373
Stub new avatar recording script that records when tablet is hidden
2017-04-05 13:19:46 +12: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
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
