Roxanne Skelly
|
90b9de8623
|
Merge branch 'master' of https://github.com/highfidelity/hifi into Case20832
|
2019-03-25 14:48:26 -07:00 |
|
Roxanne Skelly
|
1608b24be1
|
ase 20832 - Inventory app login and cancel buttons don't work on logout
|
2019-03-25 14:48:17 -07:00 |
|
Sam Gondelman
|
85024bcc0b
|
Merge pull request #15214 from SamGondelman/lasers
Case 21505: Fix laser ghosting
|
2019-03-25 14:43:52 -07:00 |
|
Shannon Romano
|
16d791703d
|
Merge pull request #15206 from thoys/feat/avatarTools/avatarDoctorWarningURLs
Case 21353: Avatar Doctor documentation / Video URLs
|
2019-03-25 14:36:30 -07:00 |
|
David Rowe
|
4a832be8c6
|
Fix JSDoc post-merge
|
2019-03-26 10:03:30 +13:00 |
|
David Rowe
|
cf4370ed3a
|
Merge branch 'master' into M21222
|
2019-03-26 09:44:48 +13:00 |
|
David Rowe
|
839a03ebe6
|
Miscellaneous JSDoc fixes noticed in passing
|
2019-03-26 09:41:07 +13:00 |
|
David Rowe
|
b78ae80ae6
|
Address review comments and add further examples
|
2019-03-26 09:40:47 +13:00 |
|
Shannon Romano
|
6710cd3e03
|
Merge pull request #15233 from roxanneskelly/Case20407
Case 20407 - Pay-In API doesn't display error when no username specified
|
2019-03-25 12:41:57 -07:00 |
|
Andrew Meadows
|
cd2dbbb955
|
fix logic typo
|
2019-03-25 11:52:52 -07:00 |
|
Wayne Chen
|
afe46cd78b
|
update indent spacing
|
2019-03-25 11:29:34 -07:00 |
|
Wayne Chen
|
4658e34b4b
|
update indent spacing
|
2019-03-25 11:29:27 -07:00 |
|
SamGondelman
|
57a02bc1d5
|
capture lambda by value
|
2019-03-25 11:29:25 -07:00 |
|
Wayne Chen
|
1952ad4be6
|
Merge branch 'master' into audio-mixer-volume-control
|
2019-03-25 11:28:14 -07:00 |
|
Wayne Chen
|
e9253a630b
|
Merge pull request #15211 from wayne-chen/fixAudioSettingsScreen-master
Case 21781: show up audio screen using Settings > Audio
|
2019-03-25 11:25:42 -07:00 |
|
Wayne Chen
|
7b5c379bb9
|
Merge pull request #15182 from wayne-chen/fixAudioSettingsScreenScrolling
Case 21717: adding scrolling in audio settings window
|
2019-03-25 11:25:30 -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 |
|
SamGondelman
|
de5643b5b9
|
quint64 -> uint64_t
|
2019-03-25 10:33:32 -07:00 |
|
NissimHadar
|
179dfab2a0
|
Merge branch 'master' of github.com:highfidelity/hifi into 21660-updateNitpickForQuest
|
2019-03-25 08:17:40 -07:00 |
|
Simon Walton
|
8872e9e4e7
|
Remove unused debugging variable
|
2019-03-23 20:05:26 -09:00 |
|
Ken Cooke
|
b5e8176b0f
|
Merge branch 'master' into audio-mixer-volume-control
|
2019-03-23 16:15:29 -07:00 |
|
Ken Cooke
|
649bb92e6c
|
Prototype an updated Audio tab with 3 independent volume controls
|
2019-03-23 16:00:02 -07:00 |
|
Sam Gateau
|
69a83e647e
|
Merge pull request #15157 from jherico/compositeless
Case 21730: Remove composite framebuffer from display plugins
|
2019-03-23 10:38:15 -07:00 |
|
Ken Cooke
|
cbeb4b0b20
|
Persist the audio-mixer settings across domain changes and server resets
|
2019-03-23 06:48:37 -07:00 |
|
Ken Cooke
|
e671a124c3
|
Cleanup
|
2019-03-22 17:58:17 -07:00 |
|
Simon Walton
|
d7a1ecdbb3
|
Expose hero-status to scripts
|
2019-03-22 17:19:39 -07:00 |
|
SamGondelman
|
7db498a130
|
fix shadows when tablet is open and misc threading issues
|
2019-03-22 16:20:54 -07:00 |
|
Andrew Meadows
|
55b3b5034a
|
always update OwingAvatarID of AvatarEntities
|
2019-03-22 15:47:13 -07:00 |
|
Simon Walton
|
137c25f907
|
Use a 1 m offset for position test; call-out nonavatars in stats web page
|
2019-03-22 15:40:13 -07:00 |
|
Simon Walton
|
a1660dad95
|
Follow dynamic updates to hero zones; make reserved fraction a domain setting
|
2019-03-22 12:30:49 -07:00 |
|
SamGondelman
|
c1c45d8a01
|
revert some now unnecessary changes that were impacting performance
(cherry picked from commit b6984de16c2fd17f04ea72de7b339c31db6467ab)
|
2019-03-22 11:55:04 -07:00 |
|
Roxanne Skelly
|
efffb8b819
|
Merge pull request #15239 from roxanneskelly/Case20617
Case 20617 - People app filter bar breaks when deleting connections
|
2019-03-22 11:31:46 -07:00 |
|
NissimHadar
|
a8dba041a2
|
Merge branch 'master' of github.com:highfidelity/hifi into 21660-updateNitpickForQuest
|
2019-03-22 11:24:18 -07:00 |
|
NissimHadar
|
faf11480b6
|
Working changes before merge.
|
2019-03-22 11:22:14 -07:00 |
|
David Back
|
77ea47a9db
|
fix no name material override, hide auto scale text after sliding
|
2019-03-22 11:21:39 -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 |
|
David Back
|
6956d01099
|
Merge pull request #15203 from dback2/avatarExporterBlockExportFromConfigMaster
Case 21760: Avatar Exporter v0.3.7 - block exporting from Humanoid
|
2019-03-22 10:23:21 -07:00 |
|
Ken Cooke
|
23a6a66528
|
Add local injector gains to the Audio scripting interface
|
2019-03-22 10:21:54 -07:00 |
|
Ken Cooke
|
e6c720f793
|
Add AudioClient mixing gains for local injectors and system sounds
|
2019-03-22 10:12:31 -07:00 |
|
Andrew Meadows
|
8977aba7c7
|
Merge pull request #15175 from NissimHadar/21691-improveNitpickWebPage
Case 21691: Improve nitpick web page.
|
2019-03-22 10:06:08 -07:00 |
|
NissimHadar
|
05618931b1
|
Merge branch 'master' of github.com:highfidelity/hifi into 21660-updateNitpickForQuest
|
2019-03-22 09:55:14 -07:00 |
|
Shannon Romano
|
13e8baeff9
|
Merge pull request #15246 from ctrlaltdavid/M21846
Case 21846: Make JSDoc use "@returns {Signal}" instead of "@signal"
|
2019-03-22 09:51:28 -07:00 |
|
David Back
|
8db6abb58d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarExporterBlockExportFromConfigMaster
|
2019-03-22 09:28:22 -07:00 |
|
Olivier Prat
|
d8b457895a
|
Adding OpenEXR vcpkg port
|
2019-03-22 10:30:24 +01:00 |
|
Shannon Romano
|
9f19ee61e2
|
Merge pull request #15236 from howard-stearns/termsofservice
update terms of service links
|
2019-03-21 19:35:34 -07:00 |
|
Sam Gondelman
|
40f5a0263c
|
Merge pull request #15201 from SamGondelman/emit
Case 21756: Entities.emitScriptEvent works now
|
2019-03-21 18:05:17 -07:00 |
|
Sam Gondelman
|
385970c39d
|
Merge pull request #15200 from SamGondelman/web
Case 21755: Allow Web Entities to use alpha from html/qml textures
|
2019-03-21 18:04:57 -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 |
|
Shannon Romano
|
212f02598c
|
Merge pull request #15231 from AndrewMeadows/fix-vanishing-avatar-entities
Case 21838: fix vanishing avatar entities for 0.82.0
|
2019-03-21 17:39:11 -07:00 |
|
Shannon Romano
|
659aa6f82c
|
Merge pull request #15238 from robin-k-wilson/fixAvatarBookmarksDeleteBookmark
Remove deleteBookmark function call from AvatarBookmarks
|
2019-03-21 17:35:03 -07:00 |
|