Commit graph

1393 commits

Author SHA1 Message Date
Shannon Romano
8c981140b0
Merge pull request #16005 from ctrlaltdavid/DOC-61
DOC-61: Render API JSDoc
2019-08-06 13:18:17 -07:00
David Rowe
1abf0eb207 Merge branch 'master' into DOC-124
# Conflicts:
#	libraries/entities/src/EntityItemProperties.cpp
2019-08-06 10:59:50 +12:00
David Rowe
f97417932c Fix typo 2019-08-06 08:08:08 +12:00
David Rowe
419044021b Merge branch 'master' into DOC-61 2019-08-06 08:03:12 +12:00
Ken Cooke
437d0ea928 Save and restore the audio gain settings 2019-08-02 06:46:34 -07:00
David Rowe
789f9c7d67 Merge branch 'master' into DOC-124
# Conflicts:
#	interface/src/scripting/Audio.h
2019-08-02 20:34:09 +12:00
Seth Alves
8ec4505b95 add an on/off control for audio echo cancelation to Audio Settings page. It's not yet hooked to anything. 2019-07-30 14:09:32 -07:00
David Rowe
833bbf1cce Render API JSDoc 2019-07-30 11:36:56 +12:00
David Rowe
8c92f972e5 Merge branch 'master' into DOC-124
# Conflicts:
#	interface/src/scripting/Audio.h
2019-07-23 12:53:35 +12:00
David Rowe
6b80a27258 Tidy Audio API's gain properties etc. JSDoc 2019-07-23 11:26:48 +12:00
Shannon Romano
4f922e350e
Merge pull request #15913 from ctrlaltdavid/DOC-102
DOC-102: Overlays JSDoc Update
2019-07-22 16:24:53 -07:00
jennaingersoll
abe1ce288c
Merge pull request #15926 from ctrlaltdavid/DOC-115
DOC-115: Comfort mode JSDoc
2019-07-22 10:46:11 -07:00
David Rowe
3a3bfd1463 Doc review 2019-07-20 09:39:34 +12:00
David Rowe
0a32386f45 Merge branch 'master' into DOC-102 2019-07-20 09:13:52 +12:00
dante ruiz
e896a53113 fix interactive crash 2019-07-15 17:18:38 -07:00
Shannon Romano
3f7e5a48bb
Merge pull request #15533 from sethalves/squeeze-vision-while-moving
Case 21663: comfort mode
2019-07-15 14:54:31 -07:00
Shannon Romano
a64bc7f638
Merge pull request #15761 from danteruiz/fix-interactive-window-crash
BUGZ-400: Crash in Application::notify
2019-07-15 11:35:15 -07:00
David Rowe
8a82ea55c7 HMD API vision squeeze properties JSDoc 2019-07-13 10:39:40 +12:00
Seth Alves
9baf4c7078 comfort mode -- squeeze vision to avoid sickness 2019-07-12 09:14:17 -07:00
Zach Fox
ce2b7e5baa Finish all of the logic and most of the layout 2019-07-11 12:05:13 -07:00
David Rowe
2cb3425740 Merge branch 'master' into DOC-102 2019-07-11 16:38:23 +12:00
David Rowe
a45d8924fa Miscellaneous minor JSDoc fixes noticed in passing 2019-07-11 16:31:09 +12:00
dante ruiz
7c024b4e8a fix interactive window crash 2019-07-10 11:49:36 -07:00
Samuel Gateau
6ef652038b EXpose the master index for cpu, gpu and display and adjust the profuiler to support it / remove unsupported deferred for macs since now it is fixed 2019-07-05 16:15:19 +02:00
Zach Fox
73db19464f DEV-194: Iterate on PTT Ducking Slider design 2019-07-01 11:28:48 -07:00
Shannon Romano
89f654175c
Merge pull request #15856 from PrestonB1123/defaultShortcuts
DEV-173: Re-enable shortcuts
2019-06-28 15:29:53 -07:00
Preston Bezos
1315677aec fixed doc and removed log spam 2019-06-28 15:02:33 -07:00
Preston Bezos
d1470d3323 readded ctrl+n and ctrl+b as shortcuts with a default script 2019-06-28 14:33:03 -07:00
Shannon Romano
7ff751567b
Merge pull request #15848 from jherico/fix/dev-175-source
DEV-175: QML content URL validation, whitelist trusted sources
2019-06-28 14:18:56 -07:00
Brad Davis
e3393a8ee5 Apply URL validation to top level window QML 2019-06-28 10:43:03 -07:00
Zach Fox
5cc6efc831 CR feedback 2019-06-28 09:07:58 -07:00
Zach Fox
8af469992e BUGZ-858: Implement 'Reduce Other Volume While Pushing-to-Talk' option 2019-06-27 15:55:58 -07:00
Sam Gateau
48f9c33bdd
Merge pull request #15822 from samcake/yellow
BUGZ-664: Introduce scaling of rendering for forward renderer
2019-06-25 14:27:17 -07:00
Sam Gateau
768dd051aa Add sanity check for viewport resolution scale to avoid negative value 2019-06-25 11:54:50 -07:00
David Rowe
b2b7a6ae99 Merge branch 'master' into DOC-79 2019-06-22 12:11:22 +12:00
Sam Gateau
22cd631a04 Merge And Modifying the Graphics settings and the dev menu 2019-06-20 17:48:36 -07:00
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