Commit graph

29045 commits

Author SHA1 Message Date
Revofire
47af406440 merged 0.80.0-kasen into 0.81.0-kasen, 0.81.0-kasen source ready for build.
various changes, idk, added a whitelist filter to ent script filter
2019-05-01 22:13:51 -04:00
SamGondelman
b9ba764e0f fix openDirectory
(cherry picked from commit 609e58a0ddcff0ace1d75a85fafd73bfa4a5eacd)
2019-04-25 12:24:26 -07:00
SamGondelman
5f3a37d40e possible fix for openUrl exploit
(cherry picked from commit 31b3f0e8f1)
2019-04-25 10:08:26 -07:00
Wayne Chen
90e993844a changing method name to reflect recent change in code 2019-04-23 16:50:54 -07:00
Wayne Chen
d7b12bcc3b set AudioClient mute state as catch-all 2019-04-22 19:08:15 -07:00
Wayne Chen
a9ece60888 allowing context change to change mute state 2019-04-19 18:21:31 -07:00
John Conklin II
0bf510d953
Merge pull request #15420 from wayne-chen/fixShieldIconBehavior-82
Case 22289: Fixing Shield Icon Behavior in Desktop Mode
2019-04-19 15:24:10 -07:00
Shannon Romano
57e996c615
Merge pull request #15415 from wayne-chen/fixRelaunchMuteSettings-82
Case 22263: Persist Mute Settings Between Sessions
2019-04-19 10:49:01 -07:00
Wayne Chen
474041d5d1
simplify PTT logic 2019-04-18 21:00:15 -07:00
Wayne Chen
389667ae56 adding proper logic for shield icon behavior 2019-04-18 14:54:21 -07:00
Wayne Chen
3bb8da3f29 real fix 2019-04-18 14:47:32 -07:00
Wayne Chen
ddb040eaf7 adding settingsLoaded bool check 2019-04-18 10:51:12 -07:00
Wayne Chen
7e445e40f8 change text to display 2019-04-18 08:48:39 -07:00
danteruiz
8e3b76d2e3 fixing bubble 2019-04-12 17:15:40 -07:00
John Conklin II
759d59c709
Merge pull request #15336 from r3tk0n/controller-help-update
Case 22069: Update Controller Help Screen
2019-04-05 17:31:29 -07:00
maspring
575d9673e2
Merge pull request #15338 from danteruiz/another-fading-avatar
Case 22074: Avatars ignored via PAL or bubble (shield) leave semi-permanent copies of themselves
2019-04-05 17:21:28 -07:00
Roxanne Skelly
4565bd7e77
Merge pull request #15340 from roxanneskelly/Case21890
Case 21890 - Marketplace search doesn't refresh when enter is pressed
2019-04-05 16:40:29 -07:00
r3tk0n
d6ff1caee9 Convert tabs to spaces. 2019-04-05 16:32:20 -07:00
Sam Gondelman
19b109c1f7
Merge pull request #15333 from highfidelity/revert-15266-stencil
Case 22070: Revert "Case 20060: Grab correct stencil masks from display plugins"
2019-04-05 16:23:26 -07:00
r3tk0n
9dda272acd Update gamepad with new graphic. 2019-04-05 16:22:31 -07:00
r3tk0n
6d03182ed9 Fix scaling issue. 2019-04-05 16:21:42 -07:00
David Back
e8b4b8b74c
Merge pull request #15290 from dback2/fixDeleteKeyInHMDDoesCtrlDelete
Case 20880: Fix delete key doing ctrl + delete in HMD
2019-04-05 16:06:01 -07:00
r3tk0n
e3fdbc3b3c Set bounds of image. 2019-04-05 15:44:34 -07:00
Roxanne Skelly
057ee2b01c Case 21890 - Marketplace search doesn't refresh when enter is pressed 2019-04-05 15:20:23 -07:00
danteruiz
475cf4d6f7 fix another fading avatar 2019-04-05 15:10:30 -07:00
r3tk0n
e03e78cc8c Add href element to image. 2019-04-05 15:04:35 -07:00
r3tk0n
84a67641a8 Update images. 2019-04-05 14:39:02 -07:00
Sam Gondelman
660818aded
Revert "Case 20060: Grab correct stencil masks from display plugins" 2019-04-05 11:59:46 -07:00
Wayne Chen
b10faa8109
Merge pull request #14738 from r3tk0n/project-freeloco
Case 21777: Locomotion Project
2019-04-04 16:18:32 -07:00
Wayne Chen
3f85e064b8
initialize transform outside of switch statement 2019-04-04 14:46:06 -07:00
Wayne Chen
c18b00ebec adding precheck procedure 2019-04-04 13:55:35 -07:00
Wayne Chen
819bf9212c fixing typo 2019-04-04 13:47:13 -07:00
Sam Gondelman
85bf1da0a1
Merge pull request #15266 from SamGondelman/stencil
Case 20060: Grab correct stencil masks from display plugins
2019-04-04 13:36:25 -07:00
Wayne Chen
ec4ad02192 more code feedback 2019-04-04 13:26:34 -07:00
Wayne Chen
4f738a5b42 code review feedback/formatting issues 2019-04-04 12:03:48 -07:00
r3tk0n
17e559f8e8 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-03 16:17:00 -07:00
r3tk0n
283ec97bb9 Fix desktop movement. 2019-04-03 16:09:13 -07:00
Sam Gateau
0d8169bd35
Merge pull request #15311 from danteruiz/double-avatars
Case 21415: Avatars stay behind after they disconnect
2019-04-03 16:07:35 -07:00
r3tk0n
8b670110a9 Fix omitted return in MyAvatar::scaleMotorSpeed 2019-04-03 13:06:22 -07:00
r3tk0n
874fb6b6d7 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-03 12:42:33 -07:00
r3tk0n
ac2971894b Fix sprint mode scalar. 2019-04-03 11:42:40 -07:00
Shannon Romano
f2ff5bebc7
Merge pull request #15275 from howard-stearns/ddv-all
DDV all, including domainUnlimited
2019-04-03 11:03:16 -07:00
r3tk0n
ec37ad7dc6 Address Wayne and Angus' comments on github. 2019-04-03 09:38:14 -07:00
NissimHadar
facf8a9305
Merge pull request #15287 from NissimHadar/21893-enableTheUrlCommandLineParameterOnAndroid
Case 21893: Remove disabling of --url for Android.
2019-04-03 07:50:31 -07:00
danteruiz
ff3e5bbc61 make sure to delete avatar when thier is no reason 2019-04-02 16:20:10 -07:00
Shannon Romano
cf7eeb7355
Merge pull request #15285 from danteruiz/avatar-fading
Case 21415: Avatars stay behind after they disconnect
2019-04-01 18:04:42 -07:00
danteruiz
8115ef6d36 addressing more requested changes 2019-04-01 16:46:15 -07:00
danteruiz
fcb838a71f addressing review requests 2019-04-01 15:43:04 -07:00
Shannon Romano
1bfa0397f0
Merge pull request #15048 from wayne-chen/newAudioMuteStates
Case 21899: New Audio Mute States
2019-04-01 15:27:03 -07:00
r3tk0n
4fb7bbabe1 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-01 14:52:21 -07:00