Commit graph

23489 commits

Author SHA1 Message Date
Shannon Romano
1d5f9cc0ec
Merge pull request #15149 from ctrlaltdavid/M21222
Case 21222: Agent, Avatar, and MyAvatar JSDoc
2019-03-26 15:43:32 -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
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
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
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
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
Andrew Meadows
206792f851 don't queue AvatarEntity messages when not in domain 2019-03-21 15:00:11 -07:00
Shannon Romano
33e73953eb
Merge pull request #15163 from danteruiz/fix-laser-scaling
Case 21499: Lasers are offset in front of hands after scaling avatar down then relaunching
2019-03-21 13:13:18 -07:00
Shannon Romano
b82c808562
Merge pull request #15207 from danteruiz/kick-ui
Case 21771: Possible Entity Scipt Ban Incident
2019-03-21 13:10:54 -07:00
NissimHadar
f7ad5a4d3c
Merge pull request #15160 from NissimHadar/21675-removeGetOperatingSystemTypeFromTestClass
Case 21675: removed redundant method.
2019-03-21 12:28:37 -07:00
Robin Wilson
c777f94231 remove AvatarBookmarks.deleteBookmark function 2019-03-21 11:12:30 -07:00
Shannon Romano
a6d4f98ee7
Merge pull request #15204 from roxanneskelly/Case21025
Case 21025 conditionalizing TabletWebView features
2019-03-20 14:21:37 -07:00
Andrew Meadows
9d11e44b4b update AvatarEntity trait when parentID changes 2019-03-20 11:37:16 -07:00
Shannon Romano
4ac25121e0
Merge pull request #15190 from roxanneskelly/Case20393
Case20393 - Add item counts to interface categories
2019-03-19 17:53:30 -07:00
Wayne Chen
db22fa9eec show up audio screen using Settings > Audio 2019-03-18 09:23:17 -07:00
danteruiz
2ab8eb98e8 better implementation 2019-03-17 14:00:41 -07:00
Thijs Wenker
b5a45be7b9 avatar doctor documentation urls 2019-03-16 02:09:00 +01:00
SamGondelman
d4e1ec9741 fix emitScriptEvent 2019-03-15 16:20:01 -07:00
SamGondelman
83bac723ef fix wearable duplication on domain switch 2019-03-15 13:38:25 -07:00
Roxanne Skelly
9182db8bd4 Case 21025 conditionalizing TabletWebView features 2019-03-15 12:56:43 -07:00
David Rowe
74edea8034 Miscellaneous JSDoc fixes 2019-03-14 10:25:31 +13:00
David Rowe
277ef56f49 Fill in JSDoc for new flow functions 2019-03-14 10:24:19 +13:00
SamGondelman
300dd39abf fix script engine shutdown 2019-03-13 12:23:31 -07:00
Roxanne Skelly
2dc38df779 Case 20393 - Display item counts in categories dropdown in Marketplace 2019-03-13 10:17:39 -07:00
David Rowe
7445d73857 Merge branch 'master' into M21222
# Conflicts:
#	libraries/avatars/src/AvatarData.h
2019-03-13 16:14:14 +13: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
danteruiz
6303f61cc3 fix lasers scale issue 2019-03-12 14:26:59 -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
07ddd4e1dd moving key press detection to JSON 2019-03-11 14:27:47 -07:00
Shannon Romano
801306364a
Merge pull request #15148 from samcake/rc81-hero
Case 21639: RC81: Adding Hero support in simulation of avatars
2019-03-11 14:13:49 -07:00
Wayne Chen
7b51061b5f fixing initialization in switch statement 2019-03-10 19:46:01 -07:00
Wayne Chen
20487b2ad1 connecting pushingToTalkChanged with handlePushedToTalk 2019-03-10 19:39:45 -07:00
Wayne Chen
3dcc53a945
Merge branch 'master' into ptt 2019-03-10 17:14:54 -07:00
r3tk0n
04c6c42512 Fix build error from merge. 2019-03-10 14:28:31 -07:00
David Rowe
24286273b4 Miscellaneous JSDoc fixes 2019-03-09 19:22:07 +13:00
Sam Gateau
3464fe09c1 Applying the hero changes to master soon to be rc81 2019-03-08 18:13:20 -08:00
Anthony Thibault
c36d752b6b
Merge pull request #15141 from luiscuenca/flowAPIExtra
add getFlowData method to MyAvatar
2019-03-08 17:45:11 -08: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