Commit graph

677 commits

Author SHA1 Message Date
Brad Davis
abb71ba604 Don't request an OpenGL 2.0 context via the dock widget 2019-06-19 14:10:53 -07:00
Shannon Romano
d6859a42d9
Merge pull request #15762 from annabrewer/quest-login-keybrd
BUGZ-531: Quest tablet login missing keyboard
2019-06-13 16:44:49 -07:00
Anna
7099b04911 appeasing jenkins 2019-06-13 12:21:41 -07:00
Preston Bezos
8dcf6e6a03 removed a dead line of code, made a couple formating changes 2019-06-12 15:47:19 -07:00
Preston Bezos
29d795af5b hopefully good now 2019-06-12 15:36:20 -07:00
Anna
4b30065ad1 fixed keyboard on quest login and cleaned up qml files 2019-06-12 15:17:37 -07:00
Preston Bezos
34e9acc0b5 better fix for the toolbar remnant 2019-06-12 14:31:43 -07:00
Zach Fox
fade8f9c04 It works! 2019-06-12 12:47:48 -07:00
Zach Fox
51c2cc793a Tinkering with toolbar visibility signal - not quite working 2019-06-12 10:26:32 -07:00
David Rowe
92eb418690 Doc review 2019-06-12 10:50:37 +12:00
David Rowe
15d3c7231e Fix typos 2019-06-07 12:21:32 +12:00
David Rowe
beb70988c3 Tablet and related JSDoc 2019-06-07 08:34:53 +12:00
amerhifi
5a3585ea5b adressing pr comments 2019-05-24 14:36:42 -07:00
amerhifi
6f04e039fe adding whitelisting for dockedWidgets 2019-05-24 14:12:24 -07:00
amerhifi
bd88a68a0f testing context passing to dockWidget via whitelisting. 2019-05-24 10:58:13 -07:00
Shannon Romano
15484436ca
Merge pull request #15507 from danteruiz/dockable-windows
case LILY-30: Dockable Interactive Windows
2019-05-08 12:16:04 -07:00
danteruiz
3806631bf1 dockable window 2019-05-08 10:04:31 -07:00
Thijs Wenker
119b97216f Fix crash for active async messageBoxes on exit of client 2019-05-02 19:11:02 +02:00
danteruiz
d73f685ef2 change mac default window size 2019-04-26 16:56:38 -07:00
jennaingersoll
fb1842cbfa
Merge pull request #15455 from ctrlaltdavid/M22330
Case 22330: Regularize JSDoc deprecation notices
2019-04-26 09:48:45 -07:00
SamGondelman
0e4ea4aff2 fix openDirectory 2019-04-25 13:20:18 -07:00
David Rowe
8e69e0b049 Regularize deprecation notices 2019-04-25 20:55:30 +12:00
SamGondelman
31b3f0e8f1 possible fix for openUrl exploit 2019-04-24 16:39:31 -07:00
Sam Gondelman
04ecdb463f
Merge pull request #15173 from SamGondelman/audio
Case 21457, Case 16836, Case 15782: Improve AudioInjector threading
2019-03-21 18:03:58 -07:00
danteruiz
5f3e31b119 add ui to kick api 2019-03-15 18:15:18 -07:00
SamGondelman
609c4ab52e try to fix audio injector threading issues 2019-03-12 18:41:43 -07:00
SamGondelman
cfb84967d5 these seemed dangerous 2019-03-01 10:54:44 -08:00
John Conklin II
87556059d3
Merge pull request #13901 from Cristo86/android_handshake
case 20058: Android - Handshake implementation
2019-02-20 13:33:52 -08:00
Brad Davis
0b171ffe13 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-15 10:31:04 -08:00
Bradley Austin Davis
d45d87031d
Merge pull request #14782 from SamGondelman/NOverlaysFinal
Case 20723, Case 20334: Internally, replace all overlays with local entities
2019-02-14 13:49:47 -08:00
Brad Davis
292602afd7 Resolving more master differences 2019-02-14 12:55:28 -08:00
Brad Davis
0f4d1f073b Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-14 12:49:56 -08:00
Shannon Romano
8a07e2b31a
Merge pull request #14895 from ctrlaltdavid/M21132
Case 21132: Add "Avatar Script" classification to relevant JSDoc APIs
2019-02-13 10:35:00 -08:00
Brad Davis
a6f23f48d6 Merge branch 'feature/quest_custom_plugins' into feature/quest 2019-02-12 09:53:12 -08:00
Brad Davis
b896e2577b Fix QML file selectors 2019-02-11 16:17:06 -08:00
SamGondelman
f53ccf7363 fix create, working on mini tablet 2019-02-11 14:54:53 -08:00
David Rowe
8e0ff9b4de Fix up some "Client Entity" JSDoc API classifications 2019-02-12 11:50:09 +13:00
David Rowe
5428bb19dc Add "Avatar Script" JSDoc API classification 2019-02-12 11:49:49 +13:00
Brad Davis
d3301803d3 Support custom display / input plugin lists and small tweaks 2019-02-07 15:15:26 -08:00
Cristian Duarte
babb972d89 Merge remote-tracking branch 'hifi/master' into android_handshake 2019-02-07 14:44:22 -03:00
Brad Davis
b40595b14f Fix merge issue 2019-02-06 13:06:04 -08:00
Brad Davis
91e18f569b Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-06 10:15:36 -08:00
Jeff Clinton
35608c35de
Merge pull request #14808 from danteruiz/webengine-fileselector
Case 20879: Migrate  webEngine referencing  QML into +webengine folder
2019-02-05 12:57:38 -08:00
Dante Ruiz
93a91cdba2 webengine fileselector 2019-01-30 13:57:49 -08:00
Gabriel Calero
6a665835e7 Merge remote-tracking branch 'upstream/master' into android_handshake 2019-01-30 17:06:41 -03:00
Brad Davis
0d34030135 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-01-29 14:13:11 -08:00
Shannon Romano
72d3eb9d33
Merge pull request #14797 from kencooke/audio-injector-stereo-distattn-bugfix2
case 20805: RC78.1 to master: Fix the distance attenuation of stereo local injectors
2019-01-29 13:12:51 -08:00
Ken Cooke
fa08e42da6 Restore legacy attenuation behavior for system sounds and scripts that do not set position.
JS detects when "position" was not set by the script.
C++ explicitly sets .positionSet=false when not set (for system sounds).
Local rendering uses a direct mix (no attenuation/HRTF) when not set.
2019-01-29 11:21:02 -08:00
Brad Davis
b1e4e17f47 Santa Cruz 2019-01-28 15:52:36 -08:00
SamGondelman
4b67a79561 more web entity wip 2019-01-11 09:57:42 -08:00