Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-17 17:47:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
77164 commits 6 branches 1 tag 1.1 GiB
Commit graph

77164 commits

This branch
This branch
All branches
Author SHA1 Message Date
Simon Walton
e62270fccf Fixes for inline jsdoc 2019-03-27 12:00:30 -07:00
Simon Walton
6b21fc1af7 Merge remote-tracking branch 'upstream/master' into avatar-hero-zone-improvements 
Fix jsdoc conflict, also minor clean-up.
 2019-03-27 10:54:49 -07:00
Shannon Romano
d464415e0b
Merge pull request #15255 from AndrewMeadows/fix-owningAvataID 
Case 21897: fix bug where AvatarEntities vanish after going to serverless and back
 2019-03-27 09:11:36 -07:00
Simon Walton
b8f79d3364 Guard against Node linked-data being null 2019-03-26 17:41:22 -07:00
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
David Back
754b281bbf
Merge pull request #15249 from dback2/avatarExporterNoNameMaterial 
Case 21761: Avatar Exporter v0.4.0 - fix no name material override
 2019-03-26 11:07:13 -07:00
Simon Walton
da6ca38282 Revert to using avatar's _globalPosition for zone membership 
According to Tony this should be the hip position, i.e.
a joint pos in T-pose, not neccesarily OK root. Also
SpatiallyNestable::WorldPos may depend on parent entity
and so not known by mixer.
 2019-03-26 10:48:59 -07:00
Shannon Romano
de5b5301d6
Merge pull request #15261 from thoys/fix/avatarTools/clashingHyperlinks 
Case 21910: Fix clashing hyperlinks in AvatarPackager project page
 2019-03-25 18:21:53 -07:00
Simon Walton
c4fd58eb3e Merge remote-tracking branch 'origin/avatar-hero-zone-improvements' into avatar-hero-zone-improvements 2019-03-25 15:43:06 -07:00
Simon Walton
46f897b693 Better estimate of avatar centre for zone membership 2019-03-25 15:42:30 -07:00
John Conklin II
e5a999b66a
Merge pull request #15256 from SamGondelman/shadow 
Case 21898: Fix shadows when tablet is open and misc threading issues
 2019-03-25 15:20:23 -07:00
Thijs Wenker
0173c87695 Fix clashing hyperlinks in AvatarPackager project page 2019-03-25 22:48:30 +01: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
SamGondelman
57a02bc1d5 capture lambda by value 2019-03-25 11:29:25 -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
Simon Walton
8872e9e4e7
Remove unused debugging variable 2019-03-23 20:05:26 -09: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
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
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
David Back
77ea47a9db fix no name material override, hide auto scale text after sliding 2019-03-22 11:21:39 -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
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
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
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
Thijs Wenker
c257f2fb07
Merge pull request #15245 from thoys/fix/create/dontIgnoreAllUpdatesWhenFocussedVR 
Case 21877: [CreateApp] give onWebEventReceived the correct context in VR [RC82]
 2019-03-22 00:51:21 +01:00
David Rowe
ba0923a3ad Fix signal summary text 2019-03-22 12:20:22 +13:00
David Rowe
025326b85f Remove custom @signal tag 2019-03-22 12:20:10 +13:00
David Rowe
4c7d5c7da7 Detect signal functions based on their return type 2019-03-22 12:19:20 +13:00
Thijs Wenker
5e35db1f76
Merge pull request #15199 from dback2/avatarExporterOldUnityVersionsFixMaster 
Case 21751: Avatar Exporter v0.3.6 - fix 2017.4 Unity versions
 2019-03-22 00:04:15 +01:00
Thijs Wenker
9a14cfc7df make sure that onWebEventReceived has the correct context in VR 2019-03-21 23:46:33 +01:00
Andrew Meadows
206792f851 don't queue AvatarEntity messages when not in domain 2019-03-21 15:00:11 -07:00