Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-24 03:09:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67560 commits 25 branches 0 tags 1.1 GiB
Commit graph

982 commits

Author SHA1 Message Date
Sam Gateau
eec4e966a7 Fix the linux build and correct the name of the property Intensity to Opacity 2017-12-10 10:13:49 -08:00
Zach Fox
6f5028080b Remove useless Wallet.buy() scripting endpoint 2017-12-08 18:23:23 -08:00
samcake
9a4f667059 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-08 08:50:33 -08:00
Seth Alves
91b2d8df8a
Merge pull request #11874 from luiscuenca/audioscope 
Improve Audio Scope
 2017-12-08 07:15:28 -08:00
samcake
7a9d77fed4 return a legit selectedItemsList js object as long as the list exist, only void if the list name is unknown 2017-12-07 17:53:30 -08:00
samcake
ace8e153c2 making sure the ID of an object in the Selection list is unique and more refined debugging 2017-12-07 17:45:40 -08:00
samcake
6148458aeb Workable state, need final clean up and testing 2017-12-07 16:04:08 -08:00
samcake
5f85e8e2cb Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-07 08:48:12 -08:00
Sam Gateau
0245a7005d Adding the query of a particular selection content 2017-12-06 22:44:58 -08:00
samcake
5500a6d11c More to come 2017-12-06 18:02:30 -08:00
Elisa Lupin-Jimenez
1d5875c45b removed key 2017-12-06 17:40:39 -08:00
Elisa Lupin-Jimenez
66b6be1302 fixed weird merge conflicts 2017-12-06 17:37:44 -08:00
Elisa Lupin-Jimenez
4ed689672e can fetch poly asset list synchronously 2017-12-06 16:07:29 -08:00
unknown
5e1064800a fix marketplace 2017-12-05 18:39:17 -08:00
samcake
1483195285 almost complete setup working, yeah 2017-12-05 18:27:53 -08:00
luiscuenca
8abe8b9879 move save logic to audioclient 2017-12-05 18:22:14 -08:00
luiscuenca
20d6615417 emit only when recording 2017-12-05 16:13:44 -08:00
Elisa Lupin-Jimenez
d6e1a9defe Created poly scripting interface template 2017-12-05 09:43:01 -08:00
samcake
de410b6833 I need a color editor 2017-12-04 17:29:01 -08:00
Elisa Lupin-Jimenez
7bb44f4139 Created poly scripting interface template 2017-12-04 16:46:58 -08:00
David Back
3873a8f91e
Merge branch 'master' into mergeAccountGlobalServices 2017-12-04 14:46:59 -08:00
luiscuenca
4030688e7a added record wav files 2017-12-03 11:54:37 -07:00
SamGondelman
c5ebb8a279 expose Window.getDeviceSize() 2017-11-28 16:16:30 -08:00
samcake
1514cdfb2f extend the set of interface for multi highlight 2017-11-21 17:59:45 -08:00
samcake
aa163db4e6 Trying to make selection threadsafe 2017-11-20 17:21:15 -08:00
samcake
e0740b323d keep debuging the seelction highlight 2017-11-17 18:11:18 -08:00
samcake
08dd76c9a8 changes of the day 2017-11-16 17:52:12 -08:00
Sam Gateau
3a0b2651d5 Keep spinning on the bridge between js interface and the highlighting feature 2017-11-16 00:55:51 -08:00
samcake
771c64fc97 Working on the selection highlight js interface 2017-11-15 18:21:07 -08:00
David Rowe
4f083a1b20 Further Menu API JSDoc improvements 2017-11-16 13:39:14 +13:00
David Rowe
bdb1bbe88d Menu API JSDoc improvements 2017-11-16 13:34:50 +13:00
samcake
d4f93b9203 Adding style from VariantMap 2017-11-14 18:21:02 -08:00
Sam Gateau
fc53c26190 drafting the interface 2017-11-14 00:40:37 -08:00
samcake
fd46aa15ff adding occluded/visisble to highlight outline 2017-11-13 17:23:21 -08:00
David Rowe
4a84116877 Merge branch 'master' into 21602 2017-11-14 08:27:13 +13:00
David Rowe
2119e01ac3 Tidying 2017-11-13 11:59:21 +13:00
David Rowe
9d9f684af5 Tidying 2017-11-12 11:44:51 +13:00
David Rowe
f5e155bf94 Expand Menu's JSDoc 2017-11-11 17:01:55 +13:00
David Rowe
c8734ccd63 Menu JSDoc improvements 2017-11-11 16:18:05 +13:00
David Rowe
a576cc04e1 Clipboard JSDoc improvements 2017-11-11 16:16:24 +13:00
David Rowe
c77a12f5fa Update Clipboard and Menu JSDoc to use JavaScript type names 2017-11-11 07:55:57 +13:00
David Rowe
036ac8de6d Update JSDoc for Menu JavaScript API 2017-11-10 21:55:42 +13:00
David Rowe
875b9846a0 Remove unused signal 2017-11-10 21:55:03 +13:00
David Rowe
7bbe5cdf70 Update JSDoc for Clipboard JavaScript API 2017-11-10 21:53:55 +13:00
Sam Gateau
e145e30049 Drafting the selection to highlight interface 2017-11-06 22:47:07 -08:00
Olivier Prat
e9743d4c95 Added jsdoc to SelectionScriptingInterface 2017-11-02 10:00:30 +01:00
Olivier Prat
f2444f9a30 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-11-02 09:25:07 +01:00
Ryan Downe Karpf
28a99fe685
Merge pull request #11655 from dback2/tabletcontextualmode 
add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place
 2017-10-30 08:56:26 -07:00
David Back
c8a0f9761a fix reference return for getUsername 2017-10-24 16:13:22 -07:00
David Back
08a6eb4dd3 reset tablet contextual mode back to false when toggling tablet show/hide 2017-10-24 15:50:09 -07:00
Zach Fox
48c8d52c09 Cleanup 2017-10-24 13:30:27 -07:00
David Back
f6f49fc2e5 account to global services merge tweaks 2017-10-24 13:26:28 -07:00
David Back
b60bf4f8cb remove unused AccountScriptingInterface functions and merge/wrap the rest into GlobalServicesScriptingInterface 2017-10-24 10:17:36 -07:00
David Back
b5f1793863 add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place 2017-10-23 14:21:18 -07:00
Olivier Prat
732fe3b8db Improved outline debugging script for easier test plan 2017-10-20 11:32:43 +02:00
Dante Ruiz
d14e6b6e5a Merge pull request #11450 from ElderOrb/case7722 
7722 Add onHover Outline to Tablet "X" Button
 2017-10-13 11:38:38 -07:00
SamGondelman
403b18977b remove unused HFMetaEvents 2017-10-11 14:37:23 -07:00
Sam Gateau
f143c28625 Merge pull request #11542 from SamGondelman/bubbleBoy 
Move HUD and HUD overlay rendering out of display plugin
 2017-10-10 14:26:20 -07:00
Zach Fox
b105248dd7 Merge pull request #11555 from zfox23/commerce_daveIntegration2 
2017-10-09 Commerce Frontend Updates
 2017-10-10 12:34:30 -07:00
Clément Brisset
3b48833cc0 Merge pull request #11451 from huffman/feat/upload-user-event 
Add uploading to asset server event
 2017-10-10 11:03:33 -07:00
Ryan Huffman
9c120f1194 Update AssetMappingsScriptingInterface to not open file for activity event 2017-10-10 09:44:13 -07:00
Zach Fox
733df8391f Round 2 2017-10-09 12:27:56 -07:00
SamGondelman
fa838e4715 merge from master 2017-10-03 15:53:33 -07:00
Zach Fox
ea3da6c9dd Merge pull request #11495 from zfox23/pop_interfaceChanges2 
Commerce: One step closer!
 2017-10-03 11:56:00 -07:00
Sam Gateau
ab8757eeb2 Merge pull request #11504 from AndrewMeadows/main-loop-stats-audit 
Tweak debug stats for more clarity
 2017-10-03 11:23:16 -07:00
Zach Fox
11d0062104 Progress on buy endpoint 2017-10-02 16:57:41 -07:00
druiz17
68780f56b7 Merge branch 'master' of github.com:highfidelity/hifi into fix-hud-module 2017-10-02 14:06:26 -07:00
Andrew Meadows
8d2153d2f3 cleanup debug stats, use more correct names 2017-10-02 13:08:17 -07:00
Zach Fox
15c0a21e0e Varied commit - styling changes, beginnings of new Wallet endpoint, etc 2017-10-02 12:19:24 -07:00
Andrew Meadows
0fc6bf1e89 Merge pull request #11471 from Atlante45/feat/auto-bake 
Asset Browser tweaks
 2017-10-02 11:29:36 -07:00
druiz17
20918641f4 saving work 2017-09-29 16:48:25 -07:00
Zach Fox
63396a2fc3 WalletScriptingInterface; wallet status refactor 2017-09-29 13:42:04 -07:00
SamGondelman
b59ec07171 move hud rendering to render thread, still need to separate out hud overlays 2017-09-29 09:49:08 -07:00
Ryan Huffman
ff019d6195 Fix extension detection when tracking asset uploads 2017-09-28 13:56:49 -07:00
Ryan Huffman
97bf093cab Fix ambiguous conversion in AssetMappingScriptingInterface 2017-09-28 08:16:54 -07:00
Atlante45
eb06c33187 Naming coding standard fix 2017-09-27 15:32:53 -07:00
Ryan Huffman
88810d28c1 Add activity logging for uploading_asset 2017-09-27 09:33:11 -07:00
Ryan Huffman
014a7bc9b0 Fix bytes downloaded stat tracking 2017-09-27 09:33:10 -07:00
Atlante45
acb0bf8d20 Asset Browser tweaks 2017-09-26 17:26:46 -07:00
beholder
24a12a2f8f 7722 Add onHover Outline to Tablet "X" Button 2017-09-26 22:31:56 +03:00
Dante Ruiz
e397d49564 Merge pull request #11159 from vladest/modal_dialogs_async 
Modal dialogs async
 2017-09-26 11:07:42 -07:00
Atlante45
8583be41ce Don't refresh if not connected to the Asset Server 2017-09-21 18:57:09 -07:00
Atlante45
1a571d0991 Add Asset Server auto refresh 2017-09-21 14:41:59 -07:00
Ryan Huffman
a56303a3fe Merge pull request #11379 from highfidelity/feat/auto-bake 
Add auto baking to Asset Server and mesh compression for FBXs
 2017-09-21 08:33:51 -07:00
vladest
67771bc297 Merge branch 'master' into modal_dialogs_async 2017-09-19 21:51:02 +02:00
vladest
6297448e90 Build fix 2017-09-19 19:49:19 +02:00
vladest
6c32783a09 Merge branch 'master' into audio_devices_split 2017-09-19 17:43:03 +02:00
vladest
1cde504c74 Memleak fix. Cleanup 2017-09-16 22:57:26 +02:00
vladest
a8d24d9161 Cleanup 2017-09-16 22:41:18 +02:00
vladest
3ceeb0d83e Rework all c++ calls 2017-09-16 22:04:53 +02:00
vladest
0bfa29d0d4 Merge branch 'master' into modal_dialogs_async 2017-09-14 20:21:29 +02:00
Atlante45
7d9daea0f6 Transmit baking errors to interface for display. 2017-09-13 09:54:54 -07:00
Anthony J. Thibault
72e0c844e4 Merge branch 'master' into feature/ant-man 2017-09-08 14:08:26 -07:00
Stephen Birarda
5e1decb02b Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake 2017-09-07 12:06:53 -07:00
Brad Hefta-Gaub
c5098abfb9 Merge pull request #10937 from kencooke/zzmp-audio/peak-values 
Add peak values for all input devices in selection dialog
 2017-09-07 11:58:50 -07:00
vladest
57643bd904 Merge branch 'master' into audio_devices_split 2017-09-06 14:20:41 +02:00
Dante Ruiz
fec8482b69 Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man 2017-09-05 16:26:51 -07:00
Dante Ruiz
e69227aef8 Merge pull request #11209 from vladest/tablet_login_button 
Added login button to Tablet
 2017-09-05 12:59:02 -07:00
Stephen Birarda
55d44a8c8f Merge pull request #11285 from Atlante45/feat/baking-enabled 
Wire "Use baked" checkbox
 2017-09-01 16:25:49 -07:00
vladest
681fc529dc Merge branch 'master' into modal_dialogs_async 2017-09-01 13:31:15 +02:00
Anthony J. Thibault
6618ba12e9 Merge branch 'master' into feature/ant-man 2017-08-31 18:10:39 -07:00
Atlante45
a9cfc01df3 Set Baking Enabled API 2017-08-31 13:11:27 -07:00
Atlante45
764e5d2e4c Move constant to central location 2017-08-31 13:08:18 -07:00
Atlante45
da2bede6fe Hide .baked items from the Asset Browser 2017-08-31 13:08:18 -07:00
Zach Fox
dbb7023fc1 Fix warnings 2017-08-30 15:26:25 -07:00
vladest
b547b2573e Added logged in property 2017-08-30 23:15:39 +02:00
Zach Fox
0cdef28cfd Fixup after Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface 2017-08-28 14:55:18 -07:00
vladest
38295ab73f Merge conflicts 2017-08-28 16:58:30 +02:00
vladest
78aa5820d0 Added proper destructor call for audio scripting interface. Save settings in destructor. Added logging to check readed audio settings 2017-08-27 11:56:28 +02:00
Atlante45
8a291f16ff Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-08-25 15:26:38 -07:00
Atlante45
9e6502fe92 More UI work 2017-08-25 10:54:34 -07:00
Atlante45
28c9aa031c Setup script model status 2017-08-25 10:54:34 -07:00
vladest
26026cb2b5 Added logout. Truncate username to 8 characters 2017-08-25 17:37:10 +02:00
Zach Fox
3c7fadb1ce Final touch 2017-08-24 14:30:42 -07:00
Zach Fox
56950e4614 It's working! 2017-08-24 14:17:39 -07:00
Zach Fox
baad5f195e I'm locking something wrong 2017-08-24 12:53:48 -07:00
Zach Fox
d370eeea2f Just gotta test 2017-08-24 11:07:58 -07:00
Zach Fox
e834e9d7a7 Progress 2017-08-24 10:46:18 -07:00
Zach Fox
92e8f84dc5 I understood last night at midnight 2017-08-24 09:43:35 -07:00
Zach Fox
657beef70f I understand again...getting started again 2017-08-23 17:42:02 -07:00
Zach Fox
52ef0f2037 More progress 2017-08-23 16:37:13 -07:00
Zach Fox
88c24c16d7 I finally understand - initial progress 2017-08-23 15:02:07 -07:00
Zach Fox
69364f2ecd Initial progress 2017-08-22 17:10:57 -07:00
Zach Fox
edb64b047f It compiles! 2017-08-22 16:00:44 -07:00
Zach Fox
ec2a27e68c Progress 2017-08-22 15:02:06 -07:00
Zach Fox
2a75d97006 First steps 2017-08-22 12:56:16 -07:00
vladest
e403f7266a Merge branch 'master' into audio_devices_split 2017-08-22 20:46:03 +02:00
Anthony J. Thibault
963ddce7bc Use eye-height to match user and avatar scales, follow fixes 
Fix postPhysicsUpdate to properly transform follow displacement into sensor frame.
 2017-08-21 17:42:24 -07:00
vladest
3783b8a57c Merge branch 'master' into tablet_login_button 2017-08-19 17:27:46 +02: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
Sam Gondelman
cbf2bb3a61 Merge pull request #10980 from SamGondelman/sharks 
Reduce laser pointer lag
 2017-08-18 13:14:38 -07:00
Elisa Lupin-Jimenez
65f876acf3 enabled version check 2017-08-18 10:49:40 -07:00
vladest
2e5e0c94f1 Added login button to Tablet 2017-08-18 15:34:15 +02:00
Elisa Lupin-Jimenez
4c28b9f09a attempt to check version of interface 2017-08-17 18:16:41 -07:00
vladest
1a32a6fac3 Merge branch 'master' into audio_devices_split 2017-08-17 17:20:11 +02:00
Zach Fox
ecd1f13197 Allow users to take a snapshot from the secondary camera 2017-08-16 15:34:06 -07:00
vladest
15f8bc0141 Keep old function names for compatibility 2017-08-16 22:17:34 +02:00
vladest
4e5c650621 Modified some usecases for async dialogs 2017-08-16 21:41:18 +02:00
vladest
273261ee57 Reworked WindowScriptingInterface browse method for async methods 2017-08-15 23:12:35 +02:00
vladest
8afdb27c1b Reworked WindowScriptingInterface save method for async methods 2017-08-15 22:55:44 +02:00
vladest
51a5c30353 Reimplement asset browsing for async 2017-08-15 17:05:55 +02:00
vladest
e9ed05c3ba Reimplement snapshot dir browser for async 2017-08-15 15:55:36 +02:00
vladest
560696e41c Split logic and interface for HMD and desktop devices. Added CheckBox control based on QQC2 2017-08-11 20:39:17 +02:00
vladest
556569819d 1st stage of moving to async dialogs 2017-08-09 14:00:19 +02:00
SamGondelman
489e08aef0 Merge branch 'master' of https://github.com/highfidelity/hifi into sharks 2017-08-07 13:29:00 -07:00
Ken Cooke
1fc050fdef Fix _devices access via shared_ptr 2017-08-07 08:11:43 -07:00
Brad Davis
1ecca9fd29 Merge branch 'master' into zzmp-audio/peak-values 2017-08-06 17:21:00 -07:00
Brad Davis
86e3489167 Updates from Threaded Rendering project 2017-08-04 15:22:14 -07:00
Sam Gondelman
fcaa39b245 Merge branch 'master' into sharks 2017-07-26 18:18:09 -07:00
SamGondelman
3149c3e16c warnings 2017-07-25 10:16:50 -07:00
SamGondelman
3c8b964cc9 replace setHandLasers with drawHUDLayer overlay property 2017-07-24 18:16:40 -07:00
Brad Davis
5b5e94700e Additional audio fixes 2017-07-21 09:52:44 -07:00
Brad Davis
d1c2218a31 Temporary patch for deadlock 2017-07-21 09:52:36 -07:00
David Rowe
091b666d7e Fix noise reduction checkbox not always working 2017-07-20 12:06:19 +12:00
Brad Davis
d43432bd71 Cleanup dead code, fix startup behavior 2017-07-17 18:54:52 -07:00
Brad Davis
aab56cf2a9 Trying to resolve QML / Audio deadlocks 2017-07-17 16:21:28 -07:00
Ken Cooke
50deee1d38 Replace tabs with spaces 2017-07-12 12:29:25 -07:00
Tingjin
80916b62bb Remove unnecessary code 
Remove two lines of unnecessary code.
 2017-07-11 20:52:28 -07:00
Ken Cooke
d6eb731f3a Merge branch 'master' into audio/peak-values 2017-07-10 21:55:11 -07:00
Seth Alves
70a7b302fc Merge pull request #10860 from jherico/deadlock_guards 
Don't use blocking connections on the main thread
 2017-07-03 09:05:56 -07:00
Brad Davis
31d2c9980e Merge pull request #10797 from ctrlaltdavid/21396 
Make Leap Motion a plugin
 2017-06-30 14:37:23 -07:00
Brad Davis
6fc82bb351 Switch to preprocessor macro for blocking invokes to capture function information 2017-06-30 11:36:24 -07:00
Brad Davis
8372d73fec Additional thread safety 2017-06-30 09:15:06 -07:00
Brad Davis
b52dd7b822 Don't use blocking connections on the main thread 2017-06-29 20:45:17 -07:00
Zach Pomerantz
631e5a7b04 add override to AudioInputDeviceList::newDevice 2017-06-29 17:34:01 -04:00
Seth Alves
794495c197 make ResourceManager be owned by DependencyManager 2017-06-28 14:18:14 -07:00
Zach Pomerantz
5353437f59 add peakValues to scripting API 2017-06-27 17:51:45 -04:00
David Rowe
6e266dfbac Merge branch 'master' into 21396 2017-06-24 09:19:12 +12:00
Brad Hefta-Gaub
dc649e84df Merge pull request #10792 from jherico/qml_crashes 
Trying to fix QtQml/QtScript crashes
 2017-06-23 12:41:43 -07:00
druiz17
91ce9235ea Merge pull request #10747 from zzmp/audio/select-log 
Log audio selections
 2017-06-23 07:54:03 -07:00
Zach Pomerantz
a82cc0ec09 retab 2017-06-23 09:35:48 -04:00
Brad Davis
4439de240a Trying to fix QtQml/QtScript crashes 2017-06-22 16:39:57 -07:00
David Rowe
6ff8aed5e3 Merge branch 'master' into 21396 2017-06-22 23:54:15 +12:00
Brad Hefta-Gaub
f7d42c782d Merge pull request #10764 from thoys/feat/ac-location-jsapi 
Expose location scripting interface to Agent (AC script)
 2017-06-21 10:22:48 -07:00
Thijs Wenker
47643e1efe Expose location API to Agent scripts (side-effect, agents now can teleport) 2017-06-21 06:31:36 +02:00
Zach Pomerantz
497ee3a522 add Audio.inputLevel 2017-06-19 17:07:43 -07:00
Zach Pomerantz
4bff925506 rm unused bools 2017-06-19 17:01:39 -07:00
Zach Pomerantz
3d80774317 clean up select_audio_device 2017-06-19 15:57:24 -07:00
Zach Pomerantz
837f37220a log selected_audio_device 2017-06-19 15:11:02 -07:00
Zach Pomerantz
5f236bd025 simplify device settings 2017-06-19 15:11:02 -07:00
Zach Fox
cbdffce88e Merge branch 'master' of https://github.com/highfidelity/hifi into spectatorCamera_mergeable_20170619 2017-06-19 13:53:29 -07:00
Brad Davis
ed6620fc51 Merge pull request #10718 from jherico/frame_thread 
Cleanup and refactoring
 2017-06-19 13:31:44 -07:00
Zach Fox
7a76c9cf7f Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-16 14:59:23 -07:00
Zach Fox
416ebaa2e8 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-16 10:08:10 -07:00
Brad Davis
fece438602 Cleanup and refactoring 2017-06-15 18:58:56 -07:00
ZappoMan
d352163d77 fix no audio device from previously removed audio device 2017-06-15 09:24:14 -07:00
David Rowe
a8501a7ac6 Remove old Leap Motion code 2017-06-15 14:45:40 +12:00
Zach Pomerantz
969582c23d clean audio device names 2017-06-14 09:04:22 -04:00
Zach Pomerantz
a8f69bb2e0 Merge branch 'master' of github.com:highfidelity/hifi into audio/parity 2017-06-13 17:41:52 -04:00
Zach Pomerantz
79563b7d83 fix header on AudioDevices.h 2017-06-13 14:55:20 -04:00
Zach Pomerantz
9b131ee4af rm old AudioDevice interface 2017-06-13 14:55:10 -04:00
Zach Pomerantz
4a39798a97 sticky audio selection 2017-06-13 14:38:52 -04:00
Zach Fox
7d1a7f4c0b Merge branch 'master' of https://github.com/highfidelity/hifi into 
spectator-camera - INCLUDING MERGE CONFLICT FIXES
 2017-06-13 09:42:14 -07:00
Zach Pomerantz
89bd895054 mv showAudioTools to just AvatarInputs 2017-06-13 12:31:05 -04:00
Zach Pomerantz
7d3bf75f0b wip: sticky devices 2017-06-12 18:48:26 -04:00
Zach Pomerantz
b5dab39f83 sticky mic meter / noise reduction 2017-06-12 18:41:32 -04:00
Zach Pomerantz
8dac83d3fe add reverb to qml Audio 2017-06-12 18:11:08 -04:00
Zach Pomerantz
b37a0239b0 up to reverb (needs cherry-picking) 2017-06-12 18:00:52 -04:00
Chris Collins
4b6c13bc1f Merge pull request #10646 from ZappoMan/debugAudioProblems 
Fix for no-audio on clean install
 2017-06-10 11:32:42 -10:00
ZappoMan
6fe20f90a3 add better debugging for audio problems 
use OS default device if settings have no values
 2017-06-09 13:36:12 -07:00
Zach Fox
a4f5d327a2 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-09 11:38:35 -07:00
Seth Alves
485df396ef Merge pull request #10628 from jherico/qt59 
Fixes for Qt 5.9 compatibility
 2017-06-08 16:51:08 -07:00
howard-stearns
51982b1294 display textures in plugins 2017-06-07 14:39:18 -07:00
Bradley Austin Davis
fc6a278217 Fixing dangling thread issues, consolidating thread management 2017-06-06 15:02:16 -07:00
Zach Pomerantz
67288528da add Audio.context 2017-06-06 17:55:06 -04:00
Zach Pomerantz
9395de1873 add nop notify signals to Audio(Devices) 2017-06-05 14:57:44 -04:00
Seth Alves
552b69bb1c cleanups 2017-06-01 13:47:19 -07:00
Seth Alves
eca05d9c42 more use of head input 2017-06-01 10:57:53 -07:00
Zach Pomerantz
954e4979f8 expose Audio.devices.input/output 2017-05-31 20:14:58 -04:00
Seth Alves
e37387f45c sync 2017-05-31 14:01:09 -07:00
Zach Pomerantz
4a3f2e1d09 use subclass for interface's Audio interface 2017-05-28 19:25:37 -04:00
Seth Alves
af5ba3a90a ask display-plugins if they are head-controllers 2017-05-25 15:14:10 -07:00
Seth Alves
3823ece153 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-05-25 10:57:46 -07:00
Seth Alves
bdbc6ddcc1 change some code to look at head-controller position rather than hmd position 2017-05-25 10:50:41 -07:00
samcake
80b6fd65ae Cleaning up counters and naming schemes... 2017-05-17 18:31:28 -07:00
Vladyslav Stelmakhovskyi
bd6ac7a39e Code style fixes 2017-05-11 20:38:09 +02:00
Vladyslav Stelmakhovskyi
2d46f9d30e Move most of the logic to C++ model, speed up initialization. Reduce number of AudioClient blocking calls to minimum 2017-05-10 21:21:39 +02:00
Vladyslav Stelmakhovskyi
d522864141 Remove debug prints 2017-05-04 21:16:58 +02:00
Vladyslav Stelmakhovskyi
e789b69a8e Merge branch 'master' into audio-source-sync 2017-05-02 20:57:01 +02:00
Brad Davis
40e4e2f307 Merge pull request #10327 from jherico/face_tracker_refactor 
Remove Faceshift
 2017-05-01 12:14:55 -07:00
Brad Davis
2b43a1989f Moving face and eye trackers out of interface 2017-04-28 23:28:17 -07:00
Vladyslav Stelmakhovskyi
368334e07e Merge branch 'master' into audio-source-sync 2017-04-28 23:04:17 +02:00
Vladyslav Stelmakhovskyi
d18ac6dd49 Reimplemented Tablet Audio screen using C++ model 2017-04-28 23:02:28 +02:00
Zach Fox
3221214283 New Snap FTUE flow 2017-04-27 14:01:07 -07:00
Zach Fox
880bcf3b1e Checkpoint 2017-04-27 14:01:06 -07:00
Howard Stearns
88c3b4d9d3 Merge pull request #10258 from howard-stearns/watch-for-announcements 
watch for announcements
 2017-04-27 14:00:39 -07:00
howard-stearns
ce7f3197f6 watch for announcements 2017-04-21 14:27:38 -07:00
David Rowe
2108300272 Merge branch 'master' into 21249 2017-04-20 08:43:00 +12:00
David Rowe
00b6b2a2c0 Implement desktop recordings browser dialog 2017-04-19 12:34:59 +12:00
Andrew Meadows
1137bd1436 pull qApp spaghetti out of Avatar class 
some ends of spaghetti get pushed into AvatarManger class
split Camera class into Camera base and FancyCamera derivation
Application::getCamera() returns Camera by refence instead of pointer
 2017-04-18 11:52:21 -07:00
David Rowe
dae6d6fb69 Stub desktop dialog to select recording to play from ATP assets 2017-04-18 11:43:42 +12:00
Zach Fox
e6edce5352 Entirely remove addressBarToggle() 2017-04-17 12:13:01 -07:00
Zach Fox
d9dc8ebc41 More improvements 2017-04-13 15:48:51 -07:00
Zach Fox
75f1168b19 Clearer function names 2017-04-12 14:45:57 -07:00
Zach Fox
e296383b1b Checkpoint! 2017-04-12 14:45:56 -07:00
Zach Fox
8a96969471 Merge pull request #9873 from highfidelity/PAL_v2 
PAL v2.0
 2017-03-31 17:00:41 -07:00
Ryan Huffman
150dcd7dec Merge remote-tracking branch 'upstream/master' into stable-merge 2017-03-30 14:22:27 -07:00
Howard Stearns
3a7edebb94 Adjust reporting of availability to metaverse. 2017-03-29 16:12:50 -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
Delamare2112
4f7cbd5b7c Add limitless connection and scripting interface 2017-03-29 12:47:58 -07:00
Howard Stearns
c795d2ca3b Four-way discoverability. (Needs testing.) 2017-03-28 18:31:08 -07: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
David Kelly
76657a670c added notifications (faked user name for now), along with switch to avatar entities 2017-03-27 11:28:57 -07:00
Vladyslav Stelmakhovskyi
fc23c348cb Implemented Audio settings screen for Tablet UI 2017-03-25 13:17:38 +01:00
Zach Fox
6c4b23195b One-line warning fix...I swear I've done this before 2017-03-20 13:26:50 -07:00
Zach Fox
fc2a501474 Cleanup JS<->QML messaging 2017-03-16 15:38:39 -07:00
Zach Fox
beb848373b Update from zfox23/PALv2 branch 2017-03-13 10:15:06 -07:00
Seth Alves
fffff817a3 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-10 10:20:40 -08:00