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
Olivier Prat
57de55c5ce
Fixed crash in lasterpointer
2019-04-04 10:15:38 +02:00
David Rowe
1bc38cab28
Camera JSDoc polish
2019-04-04 18:03:14 +13: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
David Rowe
2a17ad3da5
AvatarList and AvatarManager JSDoc
2019-04-04 10:11:54 +13: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
danteruiz
5f5e7d5f4e
a better fix
2019-04-03 10:45:40 -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
danteruiz
d88a13fc80
fix keybaord scaling
2019-04-02 13:28:41 -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
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
Shannon Romano
04eac57950
Merge pull request #15300 from jherico/fix/web_camera_master
...
Case 21993: Globally disallow use of the camera or microphone by hosted web content
2019-04-01 14:05:22 -07:00
Wayne Chen
abe5748e60
Merge branch 'master' into newAudioMuteStates
2019-04-01 12:24:46 -07:00
Wayne Chen
afdf95c894
remove unused slotted function
2019-04-01 12:20:55 -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
Seth Alves
58605161e8
cooperate, rather than fight with, Linux window managers
2019-03-31 11:17:11 -07:00
Brad Davis
58abfb44c4
Globally disallow use of the camera or microphone by hosted web content
2019-03-31 11:14:29 -07: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
danteruiz
db17f094da
adding entities to fade out list;
2019-03-29 15:23:16 -07:00
Shannon Romano
c4925ddfa0
Merge pull request #15259 from SimonWalton-HiFi/avatar-hero-zone-improvements
...
Avatar hero zone improvements
2019-03-29 10:49:06 -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
Thijs Wenker
687409b756
ignore case for .fbx file extension in AvatarDoctor
2019-03-29 01:46:57 +01:00
Angus Antley
ab1fb0f376
added js doc info for overrideHandAnimation() and restoreHandAnimation in MyAvatar.h
2019-03-28 17:45:23 -07:00
David Back
1e4a6a7cd8
fix delete key doing ctrl + delete in hmd
2019-03-28 16:46:26 -07:00
danteruiz
b9d04c6ebb
adding entity to a faded list
2019-03-28 16:42:29 -07: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
NissimHadar
171aebd6aa
Remove disabling of --url for Android.
2019-03-28 13:04:16 -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
danteruiz
04d9858f02
fixing remaining issues
2019-03-28 11:43:53 -07:00
Wayne Chen
8627a92f29
adding functions to update variables
2019-03-28 11:29:34 -07:00
Angus Antley
d963ec3005
can now override the eye rotation when procedural eye movement is turned off
2019-03-28 11:27:26 -07:00
Anthony Thibault
65507cfe11
Merge pull request #15180 from luiscuenca/flowCppFixes
...
Fix Flow touch and scale issues
2019-03-28 11:11:08 -07:00
Oren Hurvitz
32406b8399
Fixed Safe Landing interaction with Local entities.
...
Local entities are collisionless, so they shouldn't affect Safe Landing since it specifies that it only wants
to find COLLIDABLE entities. However, due to the requirement to support legacy behavior, picks for COLLIDABLE
entities *do* intersect Local entities. In order to prevent this, we have to explicitly request only intersections
with Domain or Avatar entities.
For more information about this, see this Pull Request:
https://github.com/highfidelity/hifi/pull/15282
2019-03-28 18:54:14 +01: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
Oren Hurvitz
7a8b7c095b
Fixed a race condition related to the keyboard when starting Interface.
...
These two things need to happen in the following order:
1. Initialize the input plugins (including the keyboard)
2. Start the scripts
That's because the scripts try to use the keyboard (e.g., in edit.js), and if it's not ready yet
then they fail, and then Interface doesn't work right (e.g., the Create button doesn't work).
In order to ensure that these things happen in the correct order, we must make sure that
resumeAfterLoginDialogActionTaken() (which starts the scripts) is called only after everything
else in the Interface constructor has finished. Usually this happens correctly, but occasionally
resumeAfterLoginDialogActionTaken() is called too soon. This commit makes sure that even in that
case, we'll postpone calling resumeAfterLoginDialogActionTaken() until the Interface constructor
has finished.
2019-03-28 13:36:41 +02:00
Oren Hurvitz
49165056c9
Fixed a race condition that sometimes caused the main menus not to appear.
...
When Interface starts, it first calls pauseUntilLoginDetermined(), and later resumeAfterLoginDialogActionTaken().
But on rare occasions these functions are called in the reverse order, and this caused Interface to remain
in the "paused" state. Now we check for this case, and abort pauseUntilLoginDetermined() if it happens.
This has only happened to me when running Interface immediately after rebuilding it (in Release mode).
2019-03-28 11:44:12 +02:00
Oren Hurvitz
8e201f4801
Fixed race condition during initialization of the Desktop.
...
The Application constructor must setup event handlers for events emitted when the Desktop is
constructed *before* calling initializeUi(). Otherwise, sometimes these event handlers won't
be called.
When this problem happened (usually on slow machines), Interface would start but neither the
Desktop nor the Login Screen would appear.
2019-03-28 11:44:12 +02:00
danteruiz
d9b522d10c
remove error file
2019-03-27 16:43:03 -07:00
danteruiz
40d424a01d
avatar fading
2019-03-27 16:42:34 -07:00
Wayne Chen
f3708ba27b
Merge branch 'master' into newAudioMuteStates
2019-03-27 15:49:39 -07:00
Howard Stearns
3da66dacc9
Merge branch 'master' of github.com:highfidelity/hifi into ddv-all
2019-03-27 15:08:03 -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
Sam Gondelman
2005293b3f
Merge pull request #15269 from sethalves/audio-loopback-button-is-local
...
case 21932: the test-audio button causes a local audio-loopback rather than a server one
2019-03-27 10:54:57 -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
Sam Gondelman
0a28090aa4
Merge pull request #15213 from MiladNazeri/Fix/avatarDominantHandChanged
...
Updated engine code to not emit if dominant hand isn't actually changed
2019-03-27 10:53:00 -07:00
Andrew Meadows
fb7daa185d
improved physics for grabbed AvatarEntities
2019-03-27 10:12:59 -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
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
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
howard-stearns
bf1982564c
pass id around instead of relying on latest ivar value in a singleton
2019-03-26 19:26:38 -07:00
Howard Stearns
57da21cec2
more about challenges use entity id as id, not cert id
2019-03-26 17:12:28 -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
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
Howard Stearns
c9b79b24e3
track nonces by entity id instead of by cert
2019-03-26 15:23:13 -07:00
Howard Stearns
4dfd0fbda3
challenge ownership packet has an id that gets reflected back. It doesn't have to be a cert.
2019-03-26 15:02:13 -07:00
Brad Davis
413091fed3
Trace application notification handler events if longer than 2 ms
2019-03-26 13:50:46 -07:00
SamGondelman
4ed7c09016
grab correct stencil masks from display plugins
2019-03-26 13:42:18 -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
Ken Cooke
c15813b442
Cleanup
2019-03-26 09:38:50 -07:00
Ken Cooke
155bd39da6
Quantize and limit the local injector gains to match the network protocol
2019-03-26 09:38:50 -07:00
Ken Cooke
37429a07b8
Add local injector gains to the Audio scripting interface
2019-03-26 09:38:50 -07:00
Ken Cooke
a2d261d20c
Move the new audio volume API from Users scripting interface to Audio scripting interface
2019-03-26 09:38:07 -07:00
Wayne Chen
060932ad4b
fixing typo
2019-03-26 09:13:10 -07:00
Wayne Chen
c54e8f5569
showing ptt text always + hmd mode switch fix
2019-03-25 17:32:03 -07:00
Howard Stearns
02129e0543
no-op refactor in prep for multiple entities per cert
2019-03-25 16:14:48 -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