Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-16 16:56:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
84571 commits 74 branches 59 tags 1.2 GiB
Commit graph

1557 commits

Author SHA1 Message Date
Sam Gateau
b5e4a47375 Proper allocation of the resource in forward and starting to remove the ui as we have it 2019-06-19 17:33:26 -07:00
Sam Gateau
53094ef70c One more pass of clean up on the platform api, returning the complete description in a single call, adding the version of the OS and deprecating legacy PlatformInfo calls 2019-06-19 16:52:33 -07:00
David Rowe
351bb3b934 Fix JSDoc naming of some Test API functions 2019-06-15 10:44:55 +12:00
Sam Gateau
5288314d02 Drafting ways to rescale in forward 2019-06-13 17:42:32 -07:00
Preston Bezos
36e1366cc4 added Notifies to various QProperties in order to remove warnings in interface logs 2019-06-06 14:51:43 -07:00
Sam Gateau
9bc6c3bfcd INtroduce range check for int value against the several enums we exposed through the js api for REnder and PErformance settings 2019-06-05 17:56:14 -07:00
Sam Gateau
f51e491d85 Removing the atomics and fixing mistakes pointed out inreview 2019-06-04 10:11:12 -07:00
Sam Gateau
2a4d0cfaec Addressing the initialization bug not applying REnderMethod properly, Adjusting RefrehRateProfile to Realtime in High performancePreset 2019-06-03 18:06:28 -07:00
Sam Gateau
db04f61c5b Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-06-03 09:37:13 -07:00
Sam Gateau
54d1705f06 Testing a different approach 2019-05-31 18:42:26 -07:00
Zach Fox
97bd0d5413 Make this work! 2019-05-31 12:50:32 -07:00
Sam Gateau
4e2480d032 cleaning up case of enum names and aligning the PerformancePreset with the PlatformTier 2019-05-31 00:00:44 -07:00
Sam Gateau
916ff31cf6 adjust the preset options 2019-05-30 17:51:21 -07:00
Sam Gateau
b88deb52b0 Cleaning up the interface for the Performance PRESET and the associated debug ui 2019-05-30 12:03:44 -07:00
Sam Gateau
48ecb4265c re declare q_enum on platformProfile 2019-05-29 16:43:28 -07:00
Sam Gateau
bf7617ea8e INtroducing the PerformanceManager 2019-05-29 15:47:14 -07:00
Sam Gateau
aedc631c45 Gathering all the needed settings in one place 2019-05-28 21:55:17 -07:00
Sam Gateau
0862e40b41 Adding ui to debug render settings 2019-05-28 18:01:39 -07:00
Sam Gateau
5001a04326 Updating the platform lib, implementing the first version of the profiler and exposing all these through the PlatformInfoScriptingInterface 2019-05-25 15:53:54 -07:00
Zach Fox
934ea76966
Merge pull request #15613 from zfox23/SUI/newAudioProperties 
Fix the janky audio output settings UI
 2019-05-22 16:45:02 -07:00
David Rowe
2c591ba196 Doc review 2019-05-23 10:18:03 +12:00
David Rowe
04573da96b Selection JSDoc revision 2019-05-23 09:51:30 +12:00
Zach Fox
0c90b7c4c2 JSdocs 2019-05-22 14:51:11 -07:00
Zach Fox
3a4bf2e8f7 Fix the janky audio output settings UI 2019-05-22 14:27:06 -07:00
jennaingersoll
38a379cb38
Merge pull request #15605 from ctrlaltdavid/M22528 
Case 22528: Snapshot JSDoc
 2019-05-22 12:27:33 -07:00
jennaingersoll
416e2799ad
Merge pull request #15604 from ctrlaltdavid/M22527 
Case 22527: Settings JSDoc
 2019-05-22 12:08:27 -07:00
David Rowe
a246e40815 Fix taking snapshot example 2019-05-22 14:14:06 +12:00
David Rowe
30da972a14 Snapshot JSDoc 2019-05-22 14:13:42 +12:00
David Rowe
1f3bffca4a Settings JSDoc polish 2019-05-22 12:08:14 +12:00
SamGondelman
2e666836c7 add more options to render scripting interface 2019-05-20 13:42:53 -07:00
David Rowe
4ce2c39d0a Revise display plugin JSDoc in the Window API 2019-05-17 21:34:36 +12:00
SamGondelman
db813fab6a threadsafe setRenderMethod 2019-05-16 16:48:23 -07:00
SamGondelman
451c52fa47 merge with master 2019-05-16 16:02:52 -07:00
SamGondelman
fee20d9e46 render scripting interface + renderMethod control 2019-05-16 16:01:21 -07:00
Sam Gateau
6b3707873b
Merge pull request #15562 from jherico/bugz-133 
BUGZ-133: Expose additional functionality to QML/Scripts
 2019-05-16 12:03:22 -07:00
Brad Davis
6a0b479041 Fix warning and build failures 2019-05-16 10:53:29 -07:00
Brad Davis
9bcc23f0c4 PR comments 2019-05-16 09:40:22 -07:00
Sam Gateau
edbd354760 Instead of returning the main window dimension (modulo the height of the menu bar) let s return the size of the actual 3d viewport widget 2019-05-15 17:57:53 -07:00
Brad Davis
8c375db90f Add display plugin introspection to the window scripting interface 2019-05-15 12:55:47 -07:00
Brad Davis
5db78ef2e1 Add scripting to set the refresh rate 2019-05-15 12:55:25 -07:00
David Rowe
997dc963d3 Merge branch 'master' into M22147 2019-05-15 07:59:10 +12:00
David Rowe
d5bb7f25e1 Doc review 2019-05-15 07:56:55 +12:00
Shannon Romano
32d3014d0d
Merge pull request #15301 from SaracenOne/disable_away_on_focus_loss_push_2 
case 22190: Disable triggering away state when interface focus lost
 2019-05-13 13:22:28 -07:00
Shannon Romano
6aa8dc7c42
Merge pull request #15534 from kencooke/audio-PTT-output-ducking 
Reduce echo when push-to-talk is used
 2019-05-09 15:54:15 -07:00
Ken Cooke
1b733d3fb3 While PTT is active, duck the audio output by 20dB to reduce echo 2019-05-09 12:56:07 -07:00
David Rowe
302e876857 Update InteractiveWindow JSDoc per changes in master 2019-05-09 10:26:16 +12:00
David Rowe
414f27208d Merge branch 'master' into M22147 
# Conflicts:
#	interface/src/scripting/DesktopScriptingInterface.h
#	interface/src/ui/InteractiveWindow.h
 2019-05-09 08:43:05 +12: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
David Rowe
9c12a39368 Merge branch 'master' into M22147 2019-05-06 11:28:22 +12:00
David Rowe
7183d10879 Desktop JSDoc 2019-05-06 10:26:16 +12:00
Shannon Romano
caefa3e06a
Merge pull request #15362 from ctrlaltdavid/M22075 
Case 22075: Controller JSDoc update
 2019-05-02 11:34:58 -07:00
jennaingersoll
57b9b18012
Merge pull request #15363 from ctrlaltdavid/M22068 
Case 22068: Clipboard JSDoc
 2019-05-02 11:15:25 -07:00
David Rowe
e217909f17 Merge branch 'master' into M22075 2019-05-02 20:19:17 +12:00
David Rowe
e3ff0bbcdf PlatformInfo JSDoc 2019-05-01 08:18:00 +12:00
David Rowe
7359d42b5c Window JSDoc update 2019-05-01 08:17:27 +12:00
David Rowe
3032b58abc Revise formatting of Facilities and Entity Methods sections 2019-04-30 10:10:46 +12:00
Shannon Romano
9261df5c24
Merge pull request #15383 from ctrlaltdavid/M22196 
Case 22196: HMD JSDoc update
 2019-04-29 13:05:32 -07:00
David Rowe
407ce745d5 Merge branch 'master' into M22075 
# Conflicts:
#	libraries/controllers/src/controllers/Actions.cpp
 2019-04-27 10:51:13 +12:00
David Rowe
eff97d48d3 Doc review 2019-04-27 10:34:06 +12:00
David Rowe
72ef36db02 Merge branch 'master' into M22196 2019-04-27 10:26:10 +12:00
David Rowe
fbe49bbfd4 Doc review 2019-04-27 10:20:35 +12:00
David Rowe
311826c04d Merge branch 'master' into M22215 2019-04-27 10:03:24 +12:00
Sam Gateau
c647bbcb16
Merge pull request #15400 from danteruiz/throttle-refresh-rate 
Case 22253: Refresh Rate Controller
 2019-04-26 12:04:39 -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
jennaingersoll
24196e2776
Merge pull request #15321 from ctrlaltdavid/M21956 
Case 21956: Audio JSDoc
 2019-04-25 17:03:58 -07:00
NissimHadar
2685550cc1 Merge branch 'master' of github.com:highfidelity/hifi into 21976-implementScriptAPIFor_gpuTextureMemSizeStable 2019-04-25 14:18:43 -07:00
NissimHadar
261277e4c1 Wrong method call fixed. 2019-04-25 13:49:56 -07:00
Sam Gondelman
ef64de7c04
Merge branch 'master' into openurl 2019-04-25 13:21:27 -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
Dante Ruiz
0bdc37859d Refresh Rate Controller 2019-04-24 16:16:08 -07:00
NissimHadar
6f4ee601fb CR corrections. 2019-04-23 13:27:21 -07:00
NissimHadar
ec69fd38eb Added set minimum GPU texture memory cycles to API. 2019-04-23 12:26:13 -07:00
Wayne Chen
ad22af1379 set AudioClient mute state as catch-all 2019-04-23 09:47:15 -07:00
David Rowe
fbc8e1c347 Miscellaneous fixes 2019-04-23 14:49:14 +12:00
David Rowe
6e09c4885f Review updates 2019-04-23 14:35:25 +12:00
NissimHadar
f786f5a4a6 Corrected jsdoc comment. 2019-04-22 16:00:44 -07:00
Wayne Chen
55f3c3a11a allowing context change to change mute state 2019-04-19 18:28:10 -07:00
Wayne Chen
38115b0c09 simplify PTT logic 2019-04-19 07:30:48 -07:00
Wayne Chen
da8f8e0873 real fix 2019-04-18 14:46:08 -07:00
Wayne Chen
5baf2f21d8 adding settingsLoaded bool check 2019-04-18 07:48:59 -07:00
David Rowe
60298245da Menu JSDoc update 2019-04-16 11:24:24 +12:00
David Rowe
1906ce7812 HMD JSDoc update 2019-04-13 11:10:33 +12:00
David Rowe
9a70416f2b Update Clipboard JSDoc 2019-04-10 12:09:48 +12:00
David Rowe
59533d0f59 Controller JSDoc update 2019-04-10 08:51:14 +12:00
David Rowe
a6ae79a2d8 Misc. fixes. 2019-04-04 11:34:10 +13:00
David Rowe
93f917527d Merge branch 'master' into M21956 
# Conflicts:
#	interface/src/scripting/Audio.h
 2019-04-04 11:06:09 +13:00
NissimHadar
6b83f2f94d Set stability count to 2 (enough for nitpick) 2019-04-02 08:39:04 -07:00
NissimHadar
670fb017f3 Moved API call to Test interface. 2019-04-01 10:29:31 -07:00
Saracen
90e979bda7 Add option to disable triggering an away state when interface 
focus is lost.
 2019-03-31 18:44:16 +01:00
David Rowe
dff013128e Text improvements and typos 2019-03-30 10:09:48 +13:00
David Rowe
da45b4db38 Add further Audio API examples 2019-03-30 09:51:02 +13:00
David Rowe
5c8d89fb12 Fill in and tidy Audio API JSDoc 2019-03-29 18:53:30 +13:00
Wayne Chen
f3708ba27b
Merge branch 'master' into newAudioMuteStates 2019-03-27 15:49:39 -07:00
Wayne Chen
060932ad4b fixing typo 2019-03-26 09:13:10 -07:00
Wayne Chen
6aebd000d6 changing api to match verbiage of overall code 2019-03-25 15:41:03 -07:00
Wayne Chen
1952ad4be6
Merge branch 'master' into audio-mixer-volume-control 2019-03-25 11:28:14 -07:00
Wayne Chen
0676e4de5c
Merge pull request #15165 from wayne-chen/fixMuteStateWarning-master 
Case 21684: Microphone is still live after reopening Interface
 2019-03-25 11:14:29 -07:00
Ken Cooke
b5e8176b0f
Merge branch 'master' into audio-mixer-volume-control 2019-03-23 16:15:29 -07:00
Ken Cooke
e671a124c3 Cleanup 2019-03-22 17:58:17 -07:00
Wayne Chen
3ea45de7c7 fixing qml bug in MicBar 2019-03-22 16:37:23 -07:00
Wayne Chen
77b7cc2457 separating out bubble icon qml - adding support for transparency 2019-03-22 14:16:29 -07:00
Ken Cooke
e8ddee280d Quantize and limit the local injector gains to match the network protocol 2019-03-22 10:24:30 -07:00
Ken Cooke
23a6a66528 Add local injector gains to the Audio scripting interface 2019-03-22 10:21:54 -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
Ken Cooke
7311c3ac06 Move the new audio volume API from Users scripting interface to Audio scripting interface 2019-03-21 11:51:49 -07:00
SamGondelman
609c4ab52e try to fix audio injector threading issues 2019-03-12 18:41:43 -07:00
Wayne Chen
186588ddc4 set audio client muted when loaded data 2019-03-12 15:27:02 -07:00
NissimHadar
41662b183b Removed redundant method. 2019-03-12 10:45:04 -07:00
Wayne Chen
0279373d11
Merge branch 'master' into ptt 2019-03-11 17:09:37 -07:00
Jason Najera
3c5fd06959
Remove useless comment. 
Comment was not helpful.
 2019-03-11 16:16:58 -07:00
Wayne Chen
36c2358dc0
Merge branch 'master' into muteWarningModified 2019-03-11 14:35:13 -07:00
Wayne Chen
20487b2ad1 connecting pushingToTalkChanged with handlePushedToTalk 2019-03-10 19:39:45 -07:00
r3tk0n
04c6c42512 Fix build error from merge. 2019-03-10 14:28:31 -07:00
Wayne Chen
e0fe11056e fixing compile error 2019-03-08 16:37:41 -08:00
Shannon Romano
ca87e217bd
Merge pull request #15097 from wayne-chen/audioSettingsModified 
Case 21562: Audio settings screen
 2019-03-08 16:22:52 -08:00
Wayne Chen
d46074d43f
Merge branch 'ptt' into pushToTalk 2019-03-08 16:09:58 -08:00
Wayne Chen
f4db9fefd0 Push to talk changes + rebased with master (#7) 
Push to talk changes + rebased with master
 2019-03-08 16:06:46 -08:00
r3tk0n
88a125aff0 Initial implementation (deadlocks still occurring in Audio.cpp) 2019-03-08 16:05:24 -08:00
Wayne Chen
b7d44403e1 updating compile failure + icons/settings update 2019-03-08 16:02:15 -08:00
Wayne Chen
a688c0a92b exposing setting pushingToTalk 2019-03-08 16:02:15 -08:00
Wayne Chen
60b98d2c70 Push to talk changes + rebased with master (#7) 
Push to talk changes + rebased with master
 2019-03-08 16:02:15 -08:00
Wayne Chen
7cb17b2d6e laying groundwork for audio app + fixing deadlocks 2019-03-08 16:02:14 -08:00
r3tk0n
15d49fd9a9 Initial implementation (deadlocks still occurring in Audio.cpp) 2019-03-08 16:02:14 -08:00
Roxanne Skelly
b38fc65372 Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-03-07 10:06:05 -08:00
Wayne Chen
e218e4bead updating compile failure + icons/settings update 2019-03-06 17:29:32 -08:00
Wayne Chen
a318b715c3 exposing setting pushingToTalk 2019-03-06 11:45:43 -08:00
Wayne Chen
5ffd9bc30b
Merge branch 'ptt' into pushToTalk 2019-03-06 11:07:34 -08:00
Wayne Chen
8b4123b5dc laying groundwork for audio app + fixing deadlocks 2019-03-06 11:00:09 -08:00
r3tk0n
d88235a08f Initial implementation (deadlocks still occurring in Audio.cpp) 2019-03-06 09:40:49 -08:00
r3tk0n
23e8a8bed4 Initial implementation (deadlocks still occurring in Audio.cpp) 2019-03-05 17:09:54 -08:00
Wayne Chen
4187104b17 culling mute state 2019-03-04 14:12:09 -08:00
Seth Alves
3ecd86caee add a way to disble muted warning from audio panel. 
fix positioning of warning.  hide warning when removing timer.
 2019-03-04 13:47:55 -08:00
Seth Alves
d54d0280c2 rework audioMuteOverlay.js 2019-03-04 13:47:54 -08:00
Oren Hurvitz
7780db813d Save the "Mute Microphone" setting 2019-03-04 13:47:54 -08:00
Seth Alves
38256df0f2 add a way to disble muted warning from audio panel. 
fix positioning of warning.  hide warning when removing timer.
 2019-03-04 11:08:06 -08:00
Seth Alves
3f52361753 rework audioMuteOverlay.js 2019-03-04 11:08:06 -08:00
Oren Hurvitz
18325ef5e3 Save the "Mute Microphone" setting 2019-03-04 11:08:06 -08:00
nimisha20
ba3895efdd
Update AccountServicesScriptingInterface.h 
Minor copy-edit
 2019-02-25 22:56:36 -08:00
nimisha20
736a050e68
Update AccountServicesScriptingInterface.h 2019-02-25 22:55:56 -08:00
nimisha20
4825ecdbf3
Update AccountServicesScriptingInterface.h 2019-02-25 22:44:16 -08:00
Roxanne Skelly
2dffd14fa7 Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-02-25 10:20:52 -08:00
nimisha20
e20f13f0ae
Update AccountServicesScriptingInterface.h 
Adding ctrlaltdavid's changes
 2019-02-25 09:28:56 -08:00
nimisha20
2bcee4e454
Update AccountServicesScriptingInterface.cpp 
Changes according to ctrlaltdavid's comments.
 2019-02-25 08:54:47 -08:00
David Rowe
4e9d162172 AccountServices, HifiAbout, and WalletScriptingInterface JSDoc review 2019-02-24 13:23:20 +13:00
Ken Cooke
c1786edc24 Emulate the old behavior of _lastInputLoudness 2019-02-21 18:45:17 -08:00
Roxanne Skelly
d957b38f10 Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-02-19 12:34:10 -08:00
ingerjm0
c8791841de
Merge pull request #14918 from ctrlaltdavid/M21128 
Case 21128: AccountServices, HifiAbout, and WalletScriptingInterface JSDoc
 2019-02-15 14:15:13 -08:00
Roxanne Skelly
be98fb1ac7 Standalone Tags - checkpoint 2019-02-15 11:21:40 -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
David Rowe
6a00834147 Merge branch 'master' into M21128 
# Conflicts:
#	interface/src/AboutUtil.h
 2019-02-15 08:06:41 +13:00
David Rowe
d717e803dd WalletScriptingInterface API JSDoc 2019-02-15 08:00:53 +13:00
David Rowe
2a338124ae AccountServices API JSDoc 2019-02-15 08:00:19 +13:00
David Rowe
5428bb19dc Add "Avatar Script" JSDoc API classification 2019-02-12 11:49:49 +13:00
SamGondelman
d988de4a17 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-11 10:27:12 -08:00
Brad Hefta-Gaub
a23f436a9f
Merge pull request #14880 from kencooke/audio-meter-improvements 
Case 21091: Improved audio metering
 2019-02-08 19:08:31 -08:00
Ken Cooke
b04a59af1b Calibrate meter to encourage hotter mic levels 2019-02-07 16:31:25 -08:00
Ken Cooke
2617febbcd Replace ad-hoc audio meter with meter calibrated in dBFS 2019-02-07 15:31:13 -08:00
SamGondelman
e74ff18bef Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-07 09:49:27 -08:00
Ken Cooke
ba00f95f72 Expose clipping status to audio scripting interface 2019-02-06 18:23:50 -08:00
Roxanne Skelly
2b40260953 QmlMarketplace - disable HTML for quest 2019-02-05 09:27:12 -08:00
SamGondelman
5ce8f566cc more overlay wip 2019-01-25 11:10:11 -08:00
Seth Alves
fd09180776
Merge pull request #14645 from ctrlaltdavid/M19774-d 
Make mouselook directly proportional to right-click mouse
 2019-01-16 09:09:38 -08:00
Seth Alves
6589db628a fix a couple shutdown crashes and a class of asan warning 2019-01-11 15:53:49 -08:00
SamGondelman
62dbca6ce7 fix export entities 2019-01-07 14:08:52 -08:00
NissimHadar
65d975fe5b Added detection of Rift and Vive controllers. 2019-01-02 16:53:38 -08:00
NissimHadar
56ee91dc60 Fixed Ubuntu warnings. 2019-01-02 13:23:20 -08:00
David Rowe
3b531f3c99 Update JSDoc 2019-01-02 13:41:55 +13:00
NissimHadar
c0a784fa94 Get graphics card type works on Mac laptop 2019-01-01 12:44:09 -08:00
NissimHadar
a3dde612d1 Can get total memory on Mac 2018-12-31 11:56:27 -08:00
NissimHadar
9c00bdcddb getCPUBrand works on Mac 2018-12-31 11:00:29 -08:00
NissimHadar
76ce63da64 Can read graphics card type. 2018-12-30 20:24:00 -08:00
NissimHadar
6debd996c5 Added method to get total system memory in MB. 2018-12-29 21:59:18 -08:00
NissimHadar
3a9214747a Can read number of logical processors 2018-12-29 20:49:54 -08:00
NissimHadar
63ea300921 Can get CPU brand. 2018-12-29 17:24:44 -08:00
NissimHadar
246c4dab94 Created the PlatformInfo scripting object. 2018-12-28 14:41:55 -08:00
NissimHadar
c28167f797 Initial creation of class - has COPY of getOperatingSystemType(). 2018-12-28 14:24:19 -08:00
Wayne Chen
1ce7d8a31c dev feedback 2018-12-13 13:47:07 -08:00
Wayne Chen
4116f6ca9a
Merge branch 'master' into loginInitiative2 2018-12-12 18:00:07 -08:00
Dante Ruiz
51bdf1bf78 adding keyboards settings 2018-12-12 11:55:13 -08:00
Wayne Chen
4e6f162e01 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-07 10:12:46 -08:00
Sam Gondelman
b690faeb12
Merge branch 'master' into NOverlays 2018-12-06 11:29:06 -08:00
Wayne Chen
09bc886c20
Merge branch 'master' into loginInitiative2 2018-11-30 13:05:17 -08:00
Dante Ruiz
29028386c8 Keyboard menu option in general settings 2018-11-27 11:56:07 -08:00
SamGondelman
e282d51883 CR 2018-11-26 01:15:07 -05:00
Wayne Chen
d55c9467e7 fixing keyboard offset 2018-11-20 10:37:30 -08:00
Wayne Chen
1419ec907b adding wip 2018-11-19 13:57:55 -08:00
Wayne Chen
b8d8710604 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-19 09:02:16 -08:00
Shannon Romano
ba699e3e9b
Merge pull request #14273 from NissimHadar/MAC 
Case 19722 - Auto-Tester on Mac.
 2018-11-16 12:49:58 -08:00
NissimHadar
a74e123229 Merge branch 'master' of https://github.com/highfidelity/hifi into MAC 2018-11-14 20:20:41 -08:00
Atlante45
31033ad685 Update TTS audio API use 2018-11-14 15:42:39 -08:00
Wayne Chen
c85b840db0 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-14 14:47:56 -08:00
SamGondelman
079d1dcbd6 convert clientOnly to entityHost and add local entities 2018-11-14 11:25:37 -08:00
Wayne Chen
7375840eda adding 3d keyboard/get anchor id wip for reposition 2018-11-13 17:09:47 -08:00
Brad Hefta-Gaub
bb2239c0bd
Merge pull request #14359 from howard-stearns/no-url-logging 
remove urls from logs in Interface
 2018-11-13 13:19:30 -08:00
Brad Hefta-Gaub
41d8220cbd
Merge pull request #14362 from ctrlaltdavid/M19768 
Add option to enable/disable the mini tablet
 2018-11-13 11:59:24 -08:00
NissimHadar
ef34ff622a Merge branch 'master' of https://github.com/highfidelity/hifi into MAC 2018-11-13 11:11:53 -08:00
Brad Hefta-Gaub
63e52ba8bd
Merge pull request #14284 from ctrlaltdavid/M19404 
Fix interstitial page not displaying at Interface start-up
 2018-11-13 10:38:38 -08:00
Howard Stearns
545b85bc9d Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-13 09:55:54 -08:00
NissimHadar
fc832bff58 Merge branch 'master' of https://github.com/highfidelity/hifi into MAC 2018-11-13 08:27:23 -08:00
John Conklin II
ec4f2f781d
Merge pull request #14352 from Atlante45/feat/solo-source 
[master] Add audio soloing feature
 2018-11-12 14:07:30 -08:00
Howard Stearns
66ae01e0c3 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-12 12:55:20 -08:00
NissimHadar
dddb08b7fb Merge branch 'master' of https://github.com/highfidelity/hifi into MAC 2018-11-08 17:50:14 -08:00
David Rowe
de61f0f010 Add missing JSDoc noticed in passing 2018-11-09 14:00:47 +13:00
David Rowe
c9b3fda724 Merge branch 'master' into M19768 
# Conflicts:
#	interface/src/scripting/HMDScriptingInterface.h
 2018-11-09 13:56:44 +13:00
David Rowe
5c97954e66 Merge branch 'master' into M19404 
# Conflicts:
#	scripts/system/interstitialPage.js
 2018-11-09 13:35:11 +13:00
Wayne Chen
f66326fc4d Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-08 15:51:24 -08:00
Wayne Chen
e266532888
Merge branch 'master' into loginInitiative2 2018-11-08 11:17:24 -08:00
Dante Ruiz
501746b156 3D Keyboard 2018-11-08 09:58:53 -08:00
Zach Fox
1ab1cb95d8 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-08 09:57:10 -08:00
Zach Fox
cee1454f6e CR feedback - thanks Ken! 2018-11-07 15:09:53 -08:00
Wayne Chen
8e075c2a7c fixing login qml/using HMD position for overlay 2018-11-07 14:05:06 -08:00
NissimHadar
189a799a3a Added method to detect OS type. Needed for running automated tests. 2018-11-07 08:58:38 -08:00
David Rowe
28097933ed Add setting to enable/disable the mini tablet 2018-11-07 14:39:06 +13:00
Howard Stearns
05becb870f remove urls from logs in Interface 2018-11-06 13:47:07 -08:00
Clement
0ca0a6f3be Fix JSDoc arrays 2018-11-06 12:57:17 -08:00
Zach Fox
378bf911d4 Fix another build error 2018-11-06 12:48:17 -08:00
Clement
4e802b0f3f Add JSDoc comments 2018-11-06 11:59:15 -08:00
Zach Fox
58dd690c0a Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-06 10:29:05 -08:00
NissimHadar
91fb592d3f Merge branch 'master' of https://github.com/highfidelity/hifi into MAC 2018-11-06 10:19:52 -05:00
NissimHadar
c0e7a4348b Reverted changes to Interface. 2018-11-05 22:10:20 -05:00
Zach Fox
d0854ca2ab Use AccountManager instead of settings 2018-11-02 16:42:18 -07:00
Zach Fox
402c23e359 Use useragent instead of queryparam to determine limitedCommerce 2018-11-02 16:07:29 -07:00
NissimHadar
51272d8fec Added setGeometry script command. 2018-11-02 13:09:07 -07:00
NissimHadar
70c0addc3f Removed setWindowSize - crashes on both Windows and Mac. 
Fixed typo.
 2018-11-02 10:47:17 -07:00
NissimHadar
c7353e6c59 Added setWindowSize - FOR TESTING ON MAC 2018-11-02 09:57:58 -07:00
NissimHadar
470a490494 Typo. 2018-11-01 17:31:10 -07:00
NissimHadar
d851720cb0 Added method to detect OS type. Needed for testing. 2018-11-01 16:57:28 -07:00
Zach Fox
20cd1df22c Lotsa changes 2018-11-01 16:48:08 -07:00
Zach Fox
b6344acc1d Big checkpoint. be aware - things may be broken 2018-10-30 15:08:13 -07:00
David Rowe
e2ae50362e Add missing JSDoc of Window.interstitialModeEnabled property 2018-10-26 19:21:58 +13:00
Howard Stearns
c85dbb8233 limitedCommerce switch 2018-10-25 11:25:56 -07:00
Zach Fox
d1556ae4e8 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-23 15:51:34 -07:00
Zach Fox
947391e49e Fix build errors 2018-10-23 12:45:16 -07:00
Zach Fox
1d8994993c Whitelist TTS scripting interface to TTS app, which is now a default script 2018-10-22 17:05:31 -07:00
Zach Fox
1023e6d2b9 Fix ClipboardScriptingInterface: 2018-10-22 14:00:04 -07:00
Zach Fox
d44f9e2ccc Tons of improvements 2018-10-22 13:59:57 -07:00
Zach Fox
493262052c Remove extraneous code changes; remove QUrlAncestry code; remove extra logging 2018-10-22 13:59:52 -07:00
Zach Fox
7be5d5674d Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2 2018-10-22 13:59:35 -07:00
Zach Fox
1eca1bfd55 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-22 11:18:10 -07:00
Brad Hefta-Gaub
1ff69844f2
Merge pull request #14225 from wayne-chen/interstitialHideProgressJS-RC75 
hide progress overlays if interstitial mode
 2018-10-19 16:35:42 -07:00
Zach Fox
2f37a2b1a1 Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2 2018-10-18 11:12:26 -07:00
Zach Fox
2a9e0041b2 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-18 10:16:07 -07:00
Kerry Ivan Kurian
3b15548ea3 Display resource-access events in marketplace item tester 
Includes refactoring marketplace item tester into a single-page app.
 2018-10-18 01:04:47 -07:00
Wayne Chen
fd3c0d2f76 pushing with new fix 2018-10-17 15:03:09 -07:00
Zach Fox
26e388b139 Some experimentation yields promising results... 2018-10-16 17:34:48 -07:00
SamGondelman
ded8d4b547 variant conversions 2018-10-16 11:55:28 -07:00
Zach Fox
53226e7924 Prevent overflows; still not working 2018-10-12 11:19:52 -07:00
Zach Fox
daeedc6ef1 Lots of progress today 2018-10-11 17:10:14 -07:00