Shannon Romano
af46a180ab
Merge pull request #16091 from luiscuenca/reactionsRefCountFix
...
BUGZ-1265: Don't allow reactions refcount go bellow 0
2019-08-23 10:57:56 -07:00
Shannon Romano
86518d222d
Merge pull request #16089 from RebeccaStankus/MuteIssues
...
Push To Talk Bugs 1207/1208
2019-08-23 10:42:16 -07:00
luiscuenca
19d85ba824
MyAvatar.endReaction return false when no reaction has been trigger previously
2019-08-23 09:07:27 -07:00
luiscuenca
da9163616a
Don't allow reactions ref count got bellow 0
2019-08-23 08:46:59 -07:00
Andy Howell
f5767168ed
Merge pull request #16035 from MiladNazeri/emojiAppAdd
...
Using my superpowers to get this in the build.
2019-08-22 16:10:22 -07:00
RebeccaStankus
6e96b800b6
Engine handles turning PTT off if unmuting
2019-08-22 13:22:45 -07:00
Zach Fox
7c4a0545c4
BUGZ-1327: Fix PTT icon when PTTing and clipping
2019-08-22 12:51:34 -07:00
Zach Fox
177590614e
Fix emote bar always visible on MacOS; small logic cleanup
2019-08-22 11:44:09 -07:00
Zach Fox
330b8ceb91
Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd
2019-08-22 10:24:00 -07:00
Andrew Meadows
7cf0899d59
more correct safeLanding trigger
2019-08-20 17:33:29 -07:00
Andrew Meadows
32400a6baf
improved isStuck detection and MyAvatar::safeLanding() trigger
2019-08-20 17:33:29 -07:00
Andrew Meadows
c8c704eb57
revert last change
2019-08-20 17:33:29 -07:00
Andrew Meadows
6d7565a568
CharacterController don't fight MyaAvatar::safeLanding()
2019-08-20 17:33:29 -07:00
Ryan Huffman
de476d0569
Merge pull request #16075 from huffman/fix/mouse-look-stuck-on-macos
...
BUGZ-374: Fix Mac getting stuck in mouse look
2019-08-20 16:25:02 -07:00
Zach Fox
70b3f44f8c
Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd
2019-08-20 14:04:35 -07:00
RebeccaStankus
cc22386f06
CR feedback changes
2019-08-20 13:29:02 -07:00
Zach Fox
780a081d16
Remove unused TabletAddressDialog internal property, fixing BUGZ-1294
2019-08-20 12:05:00 -07:00
Zach Fox
41d992a307
Merge pull request #16078 from zfox23/helpSupport1
...
DEV-412: Implement Support tab in Help app
2019-08-20 11:57:44 -07:00
Zach Fox
bb97b4f866
Fix BUGZ-1303: Make 'View All Controls' go to knowledge base
2019-08-20 11:17:05 -07:00
Anthony Thibault
2b74e2a7fa
Merge pull request #16066 from hyperlogic/bug-fix/sit-bug-fixes
...
Avatar sitting bug fixes
2019-08-20 11:09:25 -07:00
Zach Fox
0cc28c58ae
DEV-415: Implement Support tab in Help app
2019-08-20 10:54:58 -07:00
Zach Fox
010b4b8312
Merge pull request #16076 from zfox23/removeAboutFromSettings
...
Remove 'About' tab from Settings
2019-08-20 10:46:42 -07:00
RebeccaStankus
e48e733343
Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd
2019-08-20 09:01:18 -07:00
Shannon Romano
1569c4049f
Merge pull request #16069 from SimonWalton-HiFi/nonverified-avatar-more-robust
...
BUGZ-1247: Better handling of other-avatar verify-failed appearance
2019-08-19 17:32:27 -07:00
Zach Fox
78edfb9af9
Remove 'About' tab from Settings
2019-08-19 17:22:38 -07:00
Zach Fox
083470e4fe
Ensure that geometryChanged is emitted after docked widget is resized
2019-08-19 16:48:40 -07:00
Ryan Huffman
8097ecef11
Fix cmd-leftclick not working correctly on Mac OS
...
On Mac OS, Cmd+LeftClick is treated as a RightClick (more specifically, it seems to
be Cmd+RightClick without the modifier being dropped). Starting in Qt 5.12, only
on Mac, the MouseButtonRelease event for these mouse presses are sent to the top
level QWidgetWindow, but are not propagated further. The change here gets around
this problem by capturing these pseudo-RightClicks, and re-emitting them as
"pure" RightClicks.
2019-08-19 15:53:20 -07:00
Zach Fox
b40d5658e3
Moved a timer from JS to QML; progress circle on Emote Indicator
2019-08-19 15:12:48 -07:00
Jamil Akram
a3919af747
Merge pull request #16062 from dooglifeSF/animation_json_tuning
...
Tuning pass on anim-graph, using the new blend modes and engine features
2019-08-19 14:02:37 -07:00
Zach Fox
14a04dfb1a
Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd
2019-08-19 13:52:35 -07:00
Zach Fox
072261f551
Merge pull request #16074 from zfox23/helpQuickFixes
...
BUGZ-1295: Fix typo in Help > Controls > Turn Right
2019-08-19 13:15:10 -07:00
Zach Fox
36dffb7dc8
Merge pull request #16073 from zfox23/micIconFix
...
Fix some engine bugs that fix muted state in all UIs including simplifiedUI
2019-08-19 13:09:43 -07:00
Zach Fox
35a2cb7f27
BUGZ-1295: Fix typo in Help > Controls > Turn Right
2019-08-19 13:08:42 -07:00
Zach Fox
ca2cdfc533
Fix some engine bugs that fix muted state in all UIs including simplifiedUI
2019-08-19 11:13:11 -07:00
Zach Fox
42705c2fea
Combine conditional statements
2019-08-19 11:04:54 -07:00
Zach Fox
2b86947d4a
Mipmap images; better padding
2019-08-19 10:32:08 -07:00
Simon Walton
150b4e45d4
More robust handling of the avatar verify-failed property
2019-08-16 17:30:28 -07:00
Zach Fox
3de9f44bf3
It's working
2019-08-16 16:00:30 -07:00
Zach Fox
4c006c50aa
Controls almost done
2019-08-16 15:53:30 -07:00
Zach Fox
30d552919a
Merge branch 'master' of github.com:highfidelity/hifi into helpApp1
2019-08-16 14:06:58 -07:00
Zach Fox
c13697803d
Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd
2019-08-16 12:14:44 -07:00
Anthony J. Thibault
381f7c6bc4
Avatar sitting bug fixes
...
* Added seatedToIdle transition, to make transition quicker to better match the capsule physics.
* Made switching into and out of instantly set animVar for the animation graph, previously it was delayed by 100 ms.
* Created "isNotSeated" anim var for exiting the seated state.
* MyAvatar::beginSit & MyAvatar::endSit no longer calls goToPosition, instead MyAvatar::slamPosition is called.
* MyAvatar::slamPosition will cause the AvatarTransit class to NOT play the teleport anticipation/reaction animation.
Note: This does not prevent other clients from interpolating the position when entering the seat, but it prevents the teleport reaction animation from playing.
* Disable leg IK in HMD mode while seated.
2019-08-16 10:57:03 -07:00
Simon Walton
85da916a3b
Merge pull request #16061 from SimonWalton-HiFi/entities-scriptengine-takedown
...
BUGZ-984: Wait for client entity-scripts to unload when shutting down
2019-08-16 10:12:38 -07:00
Zach Fox
92c5ca2d75
Merge branch 'emojiAppAdd' of github.com:MiladNazeri/hifi into emojiAppAdd
2019-08-16 09:58:44 -07:00
RebeccaStankus
c64da85344
Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd
2019-08-16 09:11:03 -07:00
Zach Fox
a053f9ed9e
Impelement settingChanged; clean up some emoteIndicatorVisible code
2019-08-15 17:00:27 -07:00
Zach Fox
0338b0258c
Add Search to Emoji window and clean up some code
2019-08-15 12:21:29 -07:00
Zach Fox
143c3e966c
Big optimizations to Emoji window
2019-08-15 10:58:13 -07:00
Brad Hefta-Gaub
b0b406adda
Merge pull request #16015 from HifiExperiments/renderUpdate
...
BUGZ-902: Drastically reduce locking and branching necessary for render updates
2019-08-15 09:35:17 -07:00
dooglifeSF
2f3f6be693
Tuning pass on anim-graph, using the new blend modes and engine features.
2019-08-14 15:18:19 -07:00
