Zach Fox
|
f799f96fba
|
simplifiedUI UIT switch
|
2019-05-13 13:04:12 -07:00 |
|
Zach Fox
|
feb5021372
|
UIT RadioButton
|
2019-05-13 11:07:39 -07:00 |
|
Zach Fox
|
112e13383b
|
Dock it!
|
2019-05-10 12:03:29 -07:00 |
|
Zach Fox
|
314c04ab96
|
Simplified UI v1
|
2019-05-10 10:49:25 -07:00 |
|
Wayne Chen
|
845ad38106
|
Merge pull request #15503 from wayne-chen/useThresholdMutedWarning
Case 22447: The "MUTED" indicator (which warns when talking while muted) constantly flickers
|
2019-05-06 13:55:59 -07:00 |
|
Saracen
|
43ddf7ca23
|
Unify cube and sphere edit menu entries into one.
|
2019-05-02 22:40:11 +01:00 |
|
Wayne Chen
|
d31ed9ac22
|
adding timer for muted warning
|
2019-05-02 12:23:58 -07:00 |
|
Simon Walton
|
60389017a4
|
Merge from master, including avatar protocol change
Tony had added HandController version-type.
|
2019-04-26 18:51:41 -07:00 |
|
Simon Walton
|
1fe8f4332f
|
Fixes to banner; swap out avatar on client; reviewer comments; other WIP
|
2019-04-26 18:45:48 -07:00 |
|
Sam Gateau
|
c647bbcb16
|
Merge pull request #15400 from danteruiz/throttle-refresh-rate
Case 22253: Refresh Rate Controller
|
2019-04-26 12:04:39 -07:00 |
|
danteruiz
|
b60e35040e
|
another round of CR
|
2019-04-26 10:08:06 -07:00 |
|
Anthony Thibault
|
93b03a588f
|
Merge pull request #15445 from amantley/AnimRandomSwitchSquash
AnimRandomSwitch class for random idle implementation
|
2019-04-26 10:06:37 -07:00 |
|
Angus Antley
|
395a4cc9c4
|
added final animations and json to the resource
|
2019-04-25 19:14:31 -07:00 |
|
Shannon Romano
|
d0108301a0
|
Merge pull request #15410 from wayne-chen/fixMuteWarningSwitchText
Case 22297: Fix Mute Warning Switch Text
|
2019-04-25 17:11:45 -07:00 |
|
danteruiz
|
9e1671a1bf
|
making requested changes
|
2019-04-25 16:02:12 -07:00 |
|
Angus Antley
|
27ed468946
|
made changes requested
|
2019-04-25 14:42:41 -07:00 |
|
Simon Walton
|
f3efee56c0
|
Merge remote-tracking branch 'upstream/master' into avatar-verification
|
2019-04-25 13:40:27 -07:00 |
|
Sam Gondelman
|
ef64de7c04
|
Merge branch 'master' into openurl
|
2019-04-25 13:21:27 -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 |
|
Angus Antley
|
baca58360e
|
updated json and talk_righthand anim
|
2019-04-25 09:50:12 -07:00 |
|
Angus Antley
|
ea173b8d61
|
more time for talk ease in and updated json random choice times
|
2019-04-24 21:29:55 -07:00 |
|
Simon Walton
|
de97af5c02
|
Minimal working version for avatar's client
Also merge of Wayne's proof-of-concept
|
2019-04-24 17:42:51 -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 |
|
Dante Ruiz
|
0bdc37859d
|
Refresh Rate Controller
|
2019-04-24 16:16:08 -07:00 |
|
Angus Antley
|
eb0506ee12
|
updated json
|
2019-04-24 14:58:30 -07:00 |
|
Angus Antley
|
45f4cb2018
|
added animation files and updated ease in function in rig
|
2019-04-24 14:56:38 -07:00 |
|
amantley
|
7f3101eefb
|
working on the ease in function for the talk idle
|
2019-04-23 18:13:15 -07:00 |
|
Wayne Chen
|
464e5924d6
|
changing method name to reflect recent change in code
|
2019-04-23 16:59:12 -07:00 |
|
amantley
|
70d8200bdc
|
added on done for movement7 to json
|
2019-04-23 10:40:37 -07:00 |
|
Angus Antley
|
1291ee5ebc
|
added new animations to the resource
|
2019-04-23 07:43:31 -07:00 |
|
Wayne Chen
|
3b1751f2c9
|
adding proper logic for shield icon behavior
|
2019-04-17 20:19:21 -07:00 |
|
Wayne Chen
|
7d38cd9290
|
change text to display
|
2019-04-17 17:25:02 -07:00 |
|
amantley
|
035c8a687d
|
fixed merge conflict
|
2019-04-17 10:16:39 -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 |
|
David Rowe
|
249df3dce4
|
Update Record app per Marketplace certification requirements
|
2019-04-16 07:53:55 +12: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 |
|
r3tk0n
|
d6ff1caee9
|
Convert tabs to spaces.
|
2019-04-05 16:32:20 -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 |
|
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 |
|
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 |
|
Wayne Chen
|
4f738a5b42
|
code review feedback/formatting issues
|
2019-04-04 12:03:48 -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
|
ec37ad7dc6
|
Address Wayne and Angus' comments on github.
|
2019-04-03 09:38:14 -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 |
|
Wayne Chen
|
a9802570d7
|
Merge pull request #15305 from wayne-chen/repositionPeopleAppAudioQml
Case 22003: Reuse Blank Space from Volume Slider
|
2019-04-01 14:23:27 -07:00 |
|
Wayne Chen
|
abe5748e60
|
Merge branch 'master' into newAudioMuteStates
|
2019-04-01 12:24:46 -07:00 |
|
Wayne Chen
|
eba1f271ef
|
Merge pull request #15253 from wayne-chen/fixPTTMacAudio-master
Case 21892: Mac Audio Push To Talk fix
|
2019-04-01 12:19:10 -07:00 |
|
Wayne Chen
|
0a8d195f6f
|
adding top padding for my name card
|
2019-04-01 11:32:52 -07:00 |
|
Wayne Chen
|
0d83e622ff
|
Revert "Attempt to add acceleration curve." (#23)
This reverts commit 9ea476ea89.
|
2019-04-01 13:47:49 -04:00 |
|
Wayne Chen
|
c4cccc6ef7
|
fix opacity for containing mouse only
|
2019-03-29 17:04:44 -07:00 |
|
Shannon Romano
|
dbecf1f611
|
Merge pull request #15292 from thoys/fix/avatarTools/fbxCasing
Case 20625: On avatar project creation, the .fbx filter for selecting an FBX is case-sensitive.
|
2019-03-29 17:04:37 -07:00 |
|
Wayne Chen
|
426ffe5a14
|
Fixing typo
|
2019-03-29 15:38:42 -07:00 |
|
Wayne Chen
|
2622408792
|
warn when muted only affects hmd
|
2019-03-29 10:45:40 -07:00 |
|
Shannon Romano
|
a83b90cdc6
|
Merge pull request #15044 from sethalves/lock-wearables
case 21149: add a button to Avatar panel to lock or unlock wearables; allow others to grab unlocked wearables
|
2019-03-29 10:41:21 -07:00 |
|
Wayne Chen
|
248f9ba375
|
adding mute overlay back into HMD and have warn when muted disable in desktop
|
2019-03-29 10:32:13 -07:00 |
|
Angus Antley
|
55b42946a4
|
cleaned up ugly brace style in json
|
2019-03-28 19:07:01 -07:00 |
|
Thijs Wenker
|
7e21a3f372
|
disable case sensitivity in file browsers (allow .fbx .fBx .FBX instead of only .fbx)
|
2019-03-29 01:48:57 +01:00 |
|
Wayne Chen
|
3241d2f960
|
don't allow clicking on push to talk in MicBarApplication
|
2019-03-28 16:24:37 -07:00 |
|
Wayne Chen
|
f2b0e47c39
|
changing opacity
|
2019-03-28 16:19:35 -07:00 |
|
Roxanne Skelly
|
73cf51182e
|
Merge pull request #15262 from roxanneskelly/Case20832
Case20832- Inventory app Login and Cancel buttons do not respond if user logs out while Inventory is open.
|
2019-03-28 12:01:24 -07:00 |
|
Wayne Chen
|
8627a92f29
|
adding functions to update variables
|
2019-03-28 11:29:34 -07:00 |
|
Wayne Chen
|
c3e5c49f69
|
update muted in AudioScriptingInterface
|
2019-03-28 10:40:39 -07:00 |
|
Wayne Chen
|
9349514ff7
|
make audio screen inputs/outputs unflickable
|
2019-03-28 10:35:28 -07:00 |
|
Wayne Chen
|
f3708ba27b
|
Merge branch 'master' into newAudioMuteStates
|
2019-03-27 15:49:39 -07:00 |
|
Ken Cooke
|
abb0a166b1
|
Merge pull request #15260 from kencooke/audio-mixer-volume-control
Case 21902: System-wide independent volume controls
|
2019-03-27 13:19:30 -07:00 |
|
Angus Antley
|
d71c6c28de
|
added the new hand anims to the resource, and added hand reset to initAnimGraph
|
2019-03-27 12:00:50 -07:00 |
|
Seth Alves
|
e085a00256
|
cause 'save' button to unghost if an attachment is adjusted via grab while the adjust-wearables page is open
|
2019-03-27 10:12:58 -07:00 |
|
Seth Alves
|
d25d290394
|
refer to ungrabbable wearables as 'frozen' rather than locked, because locked is such an overloaded term
|
2019-03-27 10:12:58 -07:00 |
|
Seth Alves
|
29af3b1612
|
add a button to Avatar panel to lock or unlock wearables.
allow grabbing / adjusting others' wearables if they are unlocked.
|
2019-03-27 10:12:57 -07:00 |
|
Angus Antley
|
02d9331603
|
This changes the avatar-animation json so that we have override
animations for the right and left hand, similar to how we have whole
body override animations.
|
2019-03-26 23:27:54 -07:00 |
|
Seth Alves
|
16f842b2ac
|
missed one
|
2019-03-26 16:07:18 -07:00 |
|
Seth Alves
|
7d21222232
|
the test-audio button causes a local audio-loopback rather than a server one
|
2019-03-26 16:03:56 -07:00 |
|
Wayne Chen
|
c0b71150ea
|
removing an extra button
|
2019-03-26 10:58:04 -07:00 |
|
Wayne Chen
|
e44cdb0d7b
|
Merge branch 'audio-mixer-volume-control' into addNewAudioControls
|
2019-03-26 10:39:29 -07:00 |
|
Wayne Chen
|
a2d754cebd
|
fixing audio screen with master
|
2019-03-26 10:26:29 -07:00 |
|
Ken Cooke
|
7b56bef838
|
Prototype an updated Audio tab with 3 independent volume controls
|
2019-03-26 09:41:58 -07:00 |
|
Wayne Chen
|
c54e8f5569
|
showing ptt text always + hmd mode switch fix
|
2019-03-25 17:32:03 -07:00 |
|
Wayne Chen
|
6aebd000d6
|
changing api to match verbiage of overall code
|
2019-03-25 15:41:03 -07:00 |
|
Wayne Chen
|
49ce30d536
|
adding changes to design + truly separating muted/ptt
|
2019-03-25 15:35:05 -07:00 |
|
Thijs Wenker
|
0173c87695
|
Fix clashing hyperlinks in AvatarPackager project page
|
2019-03-25 22:48:30 +01:00 |
|
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 |
|
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 |
|
Wayne Chen
|
9a8c5e5a54
|
Merge branch 'master' into newAudioMuteStates
|
2019-03-25 13:33:24 -07: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 |
|
Wayne Chen
|
59a420b160
|
adding signals + slots to when muted + display mode changes
|
2019-03-25 12:24:13 -07:00 |
|
Wayne Chen
|
f551d49f4f
|
adding signal for updating push to talk variables
|
2019-03-25 11:32:08 -07:00 |
|
Wayne Chen
|
7f5d9cbd40
|
adding push to talk fix for loadData
|
2019-03-25 11:32:08 -07:00 |
|
Wayne Chen
|
4658e34b4b
|
update indent spacing
|
2019-03-25 11:29:27 -07:00 |
|
Wayne Chen
|
1952ad4be6
|
Merge branch 'master' into audio-mixer-volume-control
|
2019-03-25 11:28:14 -07:00 |
|
r3tk0n
|
3ac42e69e3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
|
2019-03-25 11:27:31 -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 |
|
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 |
|