Commit graph

29110 commits

Author SHA1 Message Date
Shannon Romano
766854081a
Merge pull request #15457 from davidkelly/dk/22291
Tiny logical error in wallet creation
2019-04-25 14:10:00 -07:00
Sam Gondelman
ef64de7c04
Merge branch 'master' into openurl 2019-04-25 13:21:27 -07:00
SamGondelman
0e4ea4aff2 fix openDirectory 2019-04-25 13:20:18 -07:00
Shannon Romano
164984b15d
Merge pull request #15459 from luiscuenca/sentHandsCrashFix
Fix crash sending other avatars hands to flow
2019-04-25 12:32:06 -07:00
Thijs Wenker
cdcdae2fda
Merge pull request #15393 from ctrlaltdavid/M22188
Update Record app per Marketplace certification requirements
2019-04-25 20:00:13 +02:00
Shannon Romano
392b372815
Merge pull request #15452 from AndrewMeadows/send-after-applying-bookmark
Case 21884: send update after changing AvatarEntity via AvatarBookmarks.updateAvatarEntities()
2019-04-25 10:31:25 -07:00
luiscuenca
6b33f4e027
Don't call function if flow is not active and made it thread safe 2019-04-25 10:31:05 -07:00
David Kelly
c63ee8d4f6 Tiny logical error in wallet creation 2019-04-25 09:21:06 -07:00
Howard Stearns
da1597c5d1
Merge pull request #15327 from Atlante45/fix/warnings
Case 22065: Fix mac warnings
2019-04-24 20:32:29 -07:00
SamGondelman
31b3f0e8f1 possible fix for openUrl exploit 2019-04-24 16:39:31 -07:00
Shannon Romano
404be42bfb
Merge pull request #15409 from wayne-chen/fixShieldIconBehavior
Case 22290: Fixing Shield Icon Behavior in Desktop Mode
2019-04-24 16:35:02 -07:00
Shannon Romano
0051693da8
Merge pull request #15414 from wayne-chen/fixRelaunchMuteSettings
Case 22298: Persist Mute Settings Between Sessions
2019-04-24 16:34:34 -07:00
Andrew Meadows
084759a918 send update after changing entity 2019-04-24 16:32:39 -07:00
Shannon Romano
10cfa9557d
Merge pull request #15448 from wayne-chen/fixMarketplaceLoginBug-83
Case 22346: Market -- Please Login -- does not work
2019-04-24 16:13:43 -07:00
Sam Gateau
dfce7dcaa6
Merge pull request #15405 from SamGondelman/stencil2
Case 20060: Grab correct stencil masks from display plugins
2019-04-24 09:52:12 -07:00
Shannon Romano
a6ff19c4ee
Merge pull request #15377 from sethalves/remove-unwanted-view-menuitems
case 22175: remove view/Independent-Mode and view/Entity-Mode menu items
2019-04-24 09:13:59 -07:00
Wayne Chen
464e5924d6 changing method name to reflect recent change in code 2019-04-23 16:59:12 -07:00
SamGondelman
48aef3e6d9 build error 2019-04-23 10:46:53 -07:00
Wayne Chen
ad22af1379 set AudioClient mute state as catch-all 2019-04-23 09:47:15 -07:00
SamGondelman
4fc97effda combine snapshotOperator lists per sam's suggestions 2019-04-22 16:22:18 -07:00
SamGondelman
06fbc8440e Merge remote-tracking branch 'upstream/master' into stencil2 2019-04-22 13:28:30 -07:00
Clement
0f2dbd7b6a Fix mac warnings 2019-04-19 20:14:15 -07:00
Wayne Chen
55f3c3a11a allowing context change to change mute state 2019-04-19 18:28:10 -07:00
Simon Walton
5e251b1033 Don't double-free an openssl struct 2019-04-19 17:03:43 -07:00
Wayne Chen
38115b0c09 simplify PTT logic 2019-04-19 07:30:48 -07:00
Wayne Chen
da8f8e0873 real fix 2019-04-18 14:46:08 -07:00
SamGondelman
7fa81ffef3 fix warnings 2019-04-18 12:48:46 -07:00
Wayne Chen
5baf2f21d8 adding settingsLoaded bool check 2019-04-18 07:48:59 -07:00
Wayne Chen
3b1751f2c9 adding proper logic for shield icon behavior 2019-04-17 20:19:21 -07:00
Shannon Romano
6c15719618
Merge pull request #15310 from danteruiz/fix-keyboard-scaling
Case 21513: Keyboad doesn't scale to avatar after reloading content
2019-04-17 16:59:42 -07:00
SamGondelman
e7d12dc4f8 fix snapshots and preview 2019-04-17 15:43:05 -07:00
Shannon Romano
da314694b4
Merge pull request #15271 from amantley/overrideHandAnimsSquashed
Allow Hand Animations to be Overridden
2019-04-17 11:53:41 -07:00
Sam Gateau
e6c76cdb19
Merge pull request #15329 from Zvork/amc
case 22219: Improved ambient maps
2019-04-17 10:20:53 -07:00
amantley
035c8a687d fixed merge conflict 2019-04-17 10:16:39 -07:00
Shannon Romano
50f39e88d6
Merge pull request #15365 from hyperlogic/bug-fix/better-camera-in-head-check
Better head vs camera checks for avatar head cauterization
2019-04-16 15:07:46 -07:00
Shannon Romano
517710bcb8
Merge pull request #15388 from r3tk0n/running-fix
Case 22192: Adjust run speed constants.
2019-04-16 14:51:23 -07:00
amantley
ba9b539bd2 removed hand fbx files that will be used in the future for default hand overrides 2019-04-16 14:12:32 -07:00
Shannon Romano
3500a1b19e
Merge pull request #15386 from danteruiz/fix-bubble
Case 22203: Shield/bubble animation and sound plays when other users are ignored by PAL or their own shields of RC83
2019-04-15 15:15:53 -07:00
David Rowe
249df3dce4 Update Record app per Marketplace certification requirements 2019-04-16 07:53:55 +12:00
Roxanne Skelly
3949ca2638 Remove logging and bump build. 2019-04-15 12:35:36 -07:00
r3tk0n
12d7e35722 Add separate constant for desktop run. HMD run affected negatively by 3x multiplier. This will need to be cleaned up in a future release. 2019-04-15 10:56:07 -07:00
Roxanne Skelly
743d626b32 Merge branch 'master' of https://github.com/highfidelity/hifi into Case21707 2019-04-15 10:27:28 -07:00
Roxanne Skelly
8f9d8372d8 Public Key was getting corrupted. 2019-04-12 20:30:03 -07:00
Roxanne Skelly
e36a8fc6a2 Fix osx/ubuntu build error 2019-04-12 18:36:14 -07:00
danteruiz
246f11ba02 fixing bubble 2019-04-12 17:11:35 -07:00
Shannon Romano
d321ae9b79
Merge pull request #15284 from amantley/eyeRotationOverrideBug
Fixes Bug that Prevented Eye Rotation Override When Procedural Eye Movement is Disabled
2019-04-12 17:06:11 -07:00
Roxanne Skelly
3bf8fb5d95 Case21707 - Wallet doesn't work if user has unicode characters in windows username 2019-04-12 16:40:41 -07:00
Shannon Romano
a0ddadc0e7
Merge pull request #15320 from ctrlaltdavid/M21989
Case 21989: AvatarList and AvatarManager JSDoc
2019-04-12 12:27:29 -07:00
Shannon Romano
11e5f0a101
Merge pull request #15323 from ctrlaltdavid/M22052
Case 22052: Camera JSDoc
2019-04-12 12:26:39 -07:00
Seth Alves
feda884c71 remove view/Independent-Mode and view/Entity-Mode menu items and related code. Leave the modes available for scripts. 2019-04-12 09:21:48 -07:00