Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 05:33:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
81276 commits 25 branches 0 tags 1.1 GiB
Commit graph

30354 commits

Author SHA1 Message Date
Sam Gateau
3e3c4c2e70 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2019-09-24 18:58:29 -07:00
luiscuenca
7c4fe39918
Add point directional blending node to animation json 2019-09-24 18:24:27 -07:00
luiscuenca
ad79393e1f
Implement point at directional blend and API 2019-09-24 17:55:38 -07:00
Clement
96b58756b1 Add flag for account settings feature 2019-09-24 16:50:10 -07:00
milad
677dbe59cc fixed qml typo 2019-09-24 16:47:07 -07:00
milad
edb135776a Added selfie view and updated help 2019-09-24 16:44:34 -07:00
Shannon Romano
73c558bc51
Merge pull request #16237 from dooglifeSF/emotes_interrupt_settle 
Transition between walk/emote should be faster
 2019-09-24 15:49:31 -07:00
Shannon Romano
0c2ca7500d
Merge pull request #16241 from RebeccaStankus/removeInspect 
Undo removal of User Inspection
 2019-09-24 15:41:35 -07:00
amer cerkic
9daf670678 Merge branch 'master' into dev469 2019-09-24 15:38:07 -07:00
Anthony Thibault
6fbcc9151e
Merge pull request #16235 from luiscuenca/resetLookAtOnGoTo 
BUGZ-1553: Reset look at params when the avatar's location is set
 2019-09-24 13:20:26 -07:00
RebeccaStankus
978bcaffeb Undo removal of User Inspection 2019-09-24 11:18:16 -07:00
Shannon Romano
b491d00c00
Merge pull request #16238 from RebeccaStankus/fullSizeWindow 
Prereq work for 'Reduce User Friction'
 2019-09-24 10:58:39 -07:00
RebeccaStankus
982bdf5c98 Prereq work for 'Reduce User Friction' 2019-09-23 16:49:16 -07:00
dooglifeSF
7307bea16f speed up interpolation of point, rework point animation, add transitions for emotes to idle from settle 2019-09-23 16:45:35 -07:00
amerhifi
fbc68e7f69 removed clang format issue, removed old attempt at getting defaults to startup correctly 2019-09-23 15:07:04 -07:00
RebeccaStankus
e41632e3ec Removing connections to use inspect mode on mouse events 2019-09-23 14:42:13 -07:00
luiscuenca
10f76da3ec
Reset look at values when goToLocation or sitting 2019-09-23 11:53:47 -07:00
amer cerkic
e3db7a43a6 set default value for non set devices, typically only for first time runs 2019-09-23 11:00:51 -07:00
Sam Gateau
483a716839 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-23 10:19:45 -07:00
Shannon Romano
68c37e561a
Merge pull request #16233 from Atlante45/fix/flush-timer 
Put flush timer on right thread without parenting
 2019-09-23 09:37:05 -07:00
Sam Gateau
fd3e3aba7b Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-23 09:32:10 -07:00
Sam Gateau
3c2809b9ed Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2019-09-21 08:52:13 -07:00
Sam Gateau
4480d56433 Rendering just the overlay layer and improving the resoruceCache inspector to sort 2019-09-20 19:00:03 -07:00
Clement
1ca30b688d Put flush timer on right thread without parenting 2019-09-20 15:39:35 -07:00
dante ruiz
b478a22ed2 fix edge case 2019-09-20 15:25:10 -07:00
Shannon Romano
bd488f0196
Merge pull request #16144 from luiscuenca/addLookAtThirdCamera 
DEV-391: Keyboard Input Controls Camera Not Avatar Orientation
 2019-09-20 13:03:03 -07:00
Anthony Thibault
fecef584c9
Merge pull request #16226 from danteruiz/fix-snap-html-issue 
BUGZ-1522: Snap app on tablet is blocked when saving/canceling out of its Settings page
 2019-09-20 12:39:01 -07:00
Shannon Romano
22dffa5ce8
Merge pull request #16217 from Atlante45/fix/flush-timer 
BUGZ-489: Make sure the flush timer is not spawned too early
 2019-09-20 12:35:39 -07:00
luiscuenca
f979c4e1ab
Add more info to jdocs 2019-09-20 09:51:51 -07:00
dante ruiz
fe2a4c3600 fix fix-snap-html-issue 2019-09-19 18:20:08 -07:00
luiscuenca
365aa1bf03
Add jdoc to camera modes and fix variable namings 2019-09-19 17:30:01 -07:00
David Rowe
5a4ab1d43f Missed typo 2019-09-20 10:27:21 +12:00
David Rowe
605d272392 Merge branch 'master' into DOC-111 2019-09-20 10:25:21 +12:00
David Rowe
9d9317c50d Miscellaneous fixes and typos 2019-09-20 10:19:45 +12:00
David Rowe
34883990b4 Clarify which line3d overlay properties aren't working 2019-09-20 10:19:02 +12:00
David Rowe
42bc9356ca Add Steam to list of limited commerce versions 2019-09-20 09:23:09 +12:00
Zach Fox
97ef2c030e
Merge pull request #16223 from zfox23/simplifiedGoToIteration 
Whoops! New placeholder text color
 2019-09-19 16:40:48 -04:00
Zach Fox
10352f1cb2 New placeholder text color 2019-09-19 13:38:37 -07:00
David Rowe
19888fad03 Format findableBy and audioListenerMode property values as lists 2019-09-20 08:35:23 +12:00
luiscuenca
279e25ca70
Merge master 2019-09-19 13:21:49 -07:00
David Rowe
d5e08d19e3 Fix JSDoc for miscellaneous white space issues 2019-09-20 08:17:24 +12:00
Zach Fox
a472e723e2
Merge pull request #16222 from zfox23/simplifiedGoToIteration 
BUGZ-1529: Iteration on JumpTo Field visuals/interaction states
 2019-09-19 16:13:21 -04:00
Zach Fox
5077089518 BUGZ-1529: Iteration on JumpTo Field visuals/interaction states. NOTE - need to fix placeholder text swap 2019-09-19 11:15:53 -07:00
luiscuenca
6d98537a20
Clean up code and refactor avatar-animation.json 2019-09-19 10:45:20 -07:00
amerhifi
9cc3b7a5c7 addressing pr comments 2019-09-19 10:08:30 -07:00
Zach Fox
5e96ce8822 DEV-152: Implement 'Smooth/Snap Turn' setting in SimplifiedUI > Settings > VR 2019-09-19 09:48:11 -07:00
Sam Gateau
819c942056 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-19 09:01:19 -07:00
luiscuenca
fc223e4cb6
Reverse the up/down arrow keys if in selfie mode 2019-09-18 17:15:25 -07:00
Clement
527b27b32d Make sure the flush timer is not spawned too early 2019-09-18 17:05:05 -07:00
luiscuenca
7bc8e6b237
Solved some sitting and sound issues while looking at 2019-09-18 17:00:10 -07:00
Shannon Romano
e7001c3f1b
Merge pull request #16157 from sethalves/vive-pro-groundwork 
DEV-605: Vive pro groundwork
 2019-09-18 16:36:12 -07:00
Shannon Romano
0be972062d
Merge pull request #16207 from hyperlogic/bug-fix/sitting-bug-fixes 
Sit bug fixes
 2019-09-18 16:20:51 -07:00
Zach Fox
f92c5d0882 DEV-576: Allow users to type HiFi locations into the SimplifiedUI top bar just like GOTO 2019-09-18 14:39:11 -07:00
Zach Fox
59184edc89 DEV-521: Update Emoji window's search field to display emoji's name during hover 2019-09-18 13:37:46 -07:00
Sam Gateau
381fc5146f Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-17 18:08:09 -07:00
Sam Gateau
c0660329a3 Exposing the REsource Caches through a bit of ui, adding MaterialCache to the family 2019-09-17 18:06:08 -07:00
luiscuenca
1054e8fcde
Selfie camera and updated camera menus 2019-09-17 17:15:16 -07:00
amer cerkic
c1854d3438 fixing gnu warnings and removing debug output 2019-09-17 14:42:35 -07:00
Anthony J. Thibault
1157d59f67 Sit bug fixes 
* You should not be able to move after being seated, even if you switch seats.
* You should not be able to jump out of the chair by holding the space bar.
* Fixed small issue with the sitting to standing transition being delayed. (causing the user to look
  like there were sitting in mid-air)  This was due to a missing transition in the animation.json
 2019-09-17 13:40:43 -07:00
amer cerkic
a777757c48 fixed android build 2019-09-17 12:46:38 -07:00
Zach Fox
610e0c3d82
Merge pull request #16205 from zfox23/changeAboutCopyright 
v85: BUGZ-1485: Fix Copyright date in About dialog
 2019-09-17 14:55:11 -04:00
Zach Fox
60f4189eb3 BUGZ-1485: Fix Copyright date in About dialog 2019-09-17 11:36:12 -07:00
Seth Alves
3ece763a8e code review 2019-09-17 10:52:55 -07:00
Seth Alves
58cf51058b code review 2019-09-17 09:43:32 -07:00
Seth Alves
8875453585 remove old/unused eyetracker code 2019-09-17 09:43:32 -07:00
Seth Alves
a288c0a52d remove old/unused eyetracker code. 2019-09-17 09:43:21 -07:00
Seth Alves
5c570d28a0 remove old/unused eyetracker code 2019-09-17 09:43:20 -07:00
Seth Alves
943348ba51 input action channels for eyes and eyelids and fingers. connect eyelid input actions to blendshapes. 2019-09-17 09:43:20 -07:00
Seth Alves
b64ff70d6c add show-lookat-targets DebugDraw. remove old/unused eyetracker code. 2019-09-17 09:43:19 -07:00
amerhifi
66725f5f1b working on swapping default devices on system change 2019-09-17 07:50:22 -07:00
David Rowe
dff37a71eb Fix JSDoc markup HTML issues 2019-09-17 16:26:09 +12:00
luiscuenca
481917ae8a
Rotate avatar with camera and diagonal rotation 2019-09-16 18:26:19 -07:00
Sam Gateau
60045f4783 Replacing key combination to trigger a frame capture 2019-09-16 17:48:30 -07:00
amerhifi
e689531410 added unique identifier to device for comparison. Because a default device had a different name, but same underlying device. So comparing with device name is not necessarily the same device. Possibly fixed select issue with multiple devices same name 2019-09-16 15:31:44 -07:00
Shannon Romano
dd0b527d63
Merge pull request #16185 from huffman/fix/hifi-log-login 
BUGZ-1441: Update logo on login popup
Build failure is on Android not communicated to Docker.
 2019-09-16 13:15:58 -07:00
luiscuenca
5adf3e8c25
Expose API some parameters for live configuration 2019-09-13 14:10:11 -07:00
Shannon Romano
79d845d127
Merge pull request #16190 from danteruiz/fix-html 
BUGZ-1398: HMD Tablet Apps blocked by Web access error
 2019-09-13 12:35:29 -07:00
amerhifi
cc11bd9552 created new AudioWrapper 2019-09-13 11:24:41 -07:00
danteruiz
8491a37923 fixing WebEntities html 2019-09-13 09:57:51 -07:00
Ryan Huffman
5370e67507 Update logo on login popup 2019-09-12 14:48:21 -07:00
luiscuenca
8af22f0c04
Compute when negative deltas 2019-09-11 16:27:07 -07:00
luiscuenca
793b2917f6
Compute only when delta is not zero 2019-09-11 16:25:48 -07:00
luiscuenca
8a6cb93a84
Limit the camera pitch and use the eyes as the pivot point 2019-09-11 16:08:14 -07:00
MiladNazeri
fb9a6a3c78
Merge pull request #16175 from MiladNazeri/dev-551/hide-crash-menu-behind-enviornment-variables 
DEV-551/hide-crash-menu-behind-environment-variable
 2019-09-11 15:47:40 -07:00
Zach Fox
a5504c3780
Merge pull request #16176 from MiladNazeri/BUGZ-1456/HMD-audio-setting-shows-up-when-desktop-mode 
BUGZ-1456/HMD-audio-setting-shows-up-when-desktop-mode
 2019-09-11 15:05:44 -07:00
luiscuenca
7c7c3cd223
merge master 2019-09-11 14:07:19 -07:00
Shannon Romano
65d0bb1342
Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc 
Kasen Plugin Infrastructure v½ Codename "Modkit Mini"
 2019-09-11 13:04:01 -07:00
MiladNazeri
a9da5b8f16
Update interface/resources/qml/hifi/audio/Audio.qml 
Co-Authored-By: Zach Fox <fox@highfidelity.com>
 2019-09-11 12:45:18 -07:00
MiladNazeri
d95a803324
Update interface/resources/qml/hifi/audio/Audio.qml 
Co-Authored-By: Zach Fox <fox@highfidelity.com>
 2019-09-11 12:44:59 -07:00
milad
3cf56210b2 modified Audio.qml to handle desktop audio level meter visible 2019-09-11 12:30:24 -07:00
milad
f9c5d00efa remove source from variable name 2019-09-11 12:10:47 -07:00
luiscuenca
f0dcfa7f15
fix rotation frame 2019-09-11 12:04:23 -07:00
luiscuenca
b28154235a
Look at camera when camera in front 2019-09-11 11:43:26 -07:00
milad
5ec8b0d589 added environment variable check for crash menu 2019-09-11 11:39:19 -07:00
luiscuenca
7584fe587e
Fix warnings and initial camera orientation 2019-09-11 11:21:53 -07:00
luiscuenca
2f33e37eb6
Angles instead dot product and fix API 2019-09-10 18:10:02 -07:00
Zach Fox
50ba55a988 Protect against engine not returning a valid CPU/GPU object 2019-09-10 13:03:40 -07:00
Zach Fox
e52d65a7bc BUGZ-1451: Update links in controller reference 2019-09-10 11:31:51 -07:00
Zach Fox
eb286d992e
Merge pull request #16160 from RebeccaStankus/emojiDoubleClickSound 
Emoji app duplicates sound on opening from toolbar
 2019-09-09 11:27:26 -07:00
Shannon Romano
e1dac580b6
Merge pull request #16121 from luiscuenca/audioPosesSyncFix 
BUGZ-1234: Mitigate the effect of audio noise on talking animations
 2019-09-09 10:37:07 -07:00
RebeccaStankus
33b78bea4f Changed textField module sounds 2019-09-09 10:36:35 -07:00
Shannon Romano
ca190f9932
Merge pull request #16143 from dooglifeSF/Sitting_emote_variants 
Sitting emote variants, revisions on stand emote agree anims, point bug fix
 2019-09-09 10:12:56 -07:00
Shannon Romano
4017a4f937
Merge pull request #16156 from sethalves/wtf-audio-devices 
BUGZ-1434: use existing audio settings on startup
 2019-09-09 10:09:34 -07:00
Shannon Romano
c7db287458
Merge pull request #16146 from AndrewMeadows/ess-with-simulation 
BUGZ-1385: allow entity-script-server to move entities kinematically
 2019-09-09 07:51:28 -07:00
Seth Alves
4eb88fb396 use existing audio settings on startup 2019-09-07 15:55:31 -07:00
Matt Hardcastle
3074ff96e0
Merge pull request #16150 from MattHardcastle/add-signing-2.0-rebase 
Add signing 2.0 rebase
 2019-09-07 09:09:11 -07:00
luiscuenca
1f458d195e
Refactorting, up/down attenuation and comments 2019-09-06 17:50:06 -07:00
Andrew Meadows
227b99859d fix api for checking EntityItem grab status 2019-09-06 17:23:38 -07:00
dooglifeSF
932093bead Merge branch 'master' into Sitting_emote_variants 2019-09-06 15:06:52 -07:00
luiscuenca
3b8d3f987d
Add animation 2019-09-06 14:31:53 -07:00
luiscuenca
0e4e09acb5
Add blending 2019-09-06 14:30:10 -07:00
luiscuenca
189ddf39e2
Merge branch 'master' into addLookAtThirdCamera 2019-09-06 14:29:51 -07:00
dooglifeSF
422ad52a87 Add one more sitting emote: clap03, touch up two of the standing clap anims, adjust frame ranges 2019-09-06 13:57:33 -07:00
dante ruiz
768ac08d11 Add entitlements for Launcher and Interface 2019-09-06 11:20:16 -07:00
dante ruiz
c2e0e6a976 Change Launcher config.json location 
Launcher `config.json` can not be inside Interface's app bundle, as it
will break signing.
 2019-09-06 11:20:06 -07:00
luiscuenca
78eee5961c
Fix key mapping for new camera 2019-09-05 18:05:46 -07:00
luiscuenca
ddbd30fac9
Fix magic numbers and refactor some code 2019-09-05 17:14:35 -07:00
luiscuenca
ff8f2c5c16
Add new LookAt camera 2019-09-05 17:04:39 -07:00
dooglifeSF
b5d2675a05 Merge branch 'master' into Sitting_emote_variants 2019-09-05 16:45:24 -07:00
dooglifeSF
5061aca487 Update sitting_emote_raisehand03_all.fbx 2019-09-05 16:44:13 -07:00
dooglifeSF
9cfa4753d9 sitting emote acknowledge and dismiss added, also went through emote_agree set and pushed them per Josh feedback. Fixed point glitch stand/sit 2019-09-05 15:31:07 -07:00
Anthony J. Thibault
c35640f739 Warning fixes and small bug fix to anim stats 2019-09-05 14:54:19 -07:00
humbletim
271fac4bca Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge 2019-09-05 09:46:21 -04:00
Zach Fox
df3f7fcb72
Merge pull request #16132 from MiladNazeri/dev-486/emote-ui-toggle-fix 
Dev-486 : emote indicator should still be showing
 2019-09-04 13:11:24 -07:00
milad
5fdcf0ecaf updated setting name and changed default value to true for show tray 2019-09-04 12:59:17 -07:00
Shannon Romano
24faa4a7cb
Merge pull request #16124 from MattHardcastle/call-interface-highfidelity 
Call Interface "High Fidelity" on macOS
 2019-09-04 09:34:35 -07:00
milad
669fef763a removed logs 2019-09-03 18:11:56 -07:00
milad
44e518f5a1 working fix 2019-09-03 18:06:25 -07:00
dooglifeSF
6b3dfd6d56 sitting emote raised hand 03 wip 2019-09-03 16:53:36 -07:00
Shannon Romano
5f4b2a0080
Merge pull request #16109 from sethalves/fix-saccade-override 
apply fake eye saccades if eye joints aren't overridden
 2019-09-03 11:34:02 -07:00
Zach Fox
d88c43614c
Merge pull request #16129 from RebeccaStankus/feetPosition 
Feet position
 2019-09-03 11:04:17 -07:00
Jamil Akram
a9d8f105ae
Merge pull request #16112 from dooglifeSF/Anim_memory_reduction 
Anim memory reduced ~10mb by removing static channels
 2019-09-03 10:08:02 -07:00
RebeccaStankus
a34a533c07 Added defaults for some params 2019-09-03 10:06:17 -07:00
RebeccaStankus
37304f57ea Merge branch 'master' of github.com:highfidelity/hifi into feetposition 2019-08-30 14:20:58 -07:00
RebeccaStankus
5fadfa5275 Updated property in MyAvatar.h 2019-08-30 13:52:02 -07:00
Bradley Austin Davis
8e3b337a6e
Merge pull request #16120 from jherico/fix/bugz-1365 
BUGZ-1365: prevent server scripts from accessing local files in HTML controls
 2019-08-30 13:10:09 -07:00
Bradley Austin Davis
29424ca971
Merge pull request #16113 from jherico/fix/bugz-1363 
BUGZ-1363: crash when checking for web content restrictions
 2019-08-30 13:09:49 -07:00
Matt Hardcastle
f91ec8fbf5 Call Interface "High Fidelity" on macOS 2019-08-30 09:18:36 -07:00
Brad Davis
82a49d4641 Fix android build 2019-08-29 20:19:49 -07:00
luiscuenca
265b6f57a1
Try to mitigate the effect of background mic noise when simulating talking 2019-08-29 15:19:17 -07:00
Brad Davis
6aa967f29f fixing test code 2019-08-29 14:11:22 -07:00
Brad Davis
31340d278a Add test for local file access 2019-08-29 13:45:43 -07:00
Brad Davis
428a58710d BUGZ-1365: Ensure that by default web views can't access local content 2019-08-29 13:44:49 -07:00
Shannon Romano
3695a5e633
Merge pull request #16105 from amerhifi/bugz-186 
CASE DEV-186: HQ Launcher/Interface Icons and wording need to be standardized
 2019-08-28 15:58:10 -07:00
Shannon Romano
e07e8abc0d
Merge pull request #16106 from AndrewMeadows/less-MyAvatar-mesh-tuneling-2 
BUGZ-1325 prevent MyAvatar from pushing through mesh barrier
 2019-08-28 15:51:42 -07:00
dooglifeSF
974b18b16b Export one more that used to be hosted. I moved it to the source repo. 2019-08-28 14:16:57 -07:00
dooglifeSF
a5118d8a31 Merge branch 'master' into Anim_memory_reduction 2019-08-28 10:21:21 -07:00
dooglifeSF
577a82f750 Export animations, remove static channels. Remove unused joints. Exclude all scene data from fbx. 2019-08-28 10:10:39 -07:00
Brad Davis
954773124a BUGZ-1363: crash when checking for web content restrictions 2019-08-28 09:56:45 -07:00
Anthony Thibault
1a1e8297e6
Merge pull request #16077 from dooglifeSF/tweak_sit_pose 
Sit pose reworked and new sit emote variants added.
 2019-08-28 09:06:31 -07:00
Andrew Meadows
6be3750b38 use collision brake feedback to prevent tunneling 2019-08-27 20:28:56 -07:00
Seth Alves
1979e1dbc7 apply fake eye saccades if eye joints aren't overridden (rather than if HasProceduralEyeFaceMovement is true) 2019-08-27 16:47:01 -07:00
amerhifi
42357904cd fixed icon name spacing 2019-08-27 20:13:15 +02:00
amerhifi
335dea43df changing app name to high fidelity and changing icons to the new logo 2019-08-27 20:08:21 +02:00
Shannon Romano
3134332513
Merge pull request #16098 from hyperlogic/feature/backtrace-shutdown-flag 
Added "shutdown" crash annotation and crash menu option
 2019-08-27 10:57:07 -07:00
dooglifeSF
c6f72e0e77 Merge branch 'master' into Anim_memory_reduction 2019-08-27 09:52:16 -07:00
Anthony J. Thibault
e98cdab294 Moved CrashHelper.h include to the appropriate place. 2019-08-26 17:05:08 -07:00
Bradley Austin Davis
07ee9e901f
Merge pull request #16099 from jherico/fix/wake_crash 
BUGZ-1264: Support platform independent sleep/wake notifications
 2019-08-26 16:20:50 -07:00
Brad Davis
e1bf3f2540 PR feedback 2019-08-26 11:51:33 -07:00
Zach Fox
83ef260941
Merge pull request #16093 from zfox23/emoteTweaks 
BUGZ-1346: Tons of changes to Emote/Emoji system
 2019-08-26 10:15:03 -07:00
Zach Fox
497edf6068 Add a comment 2019-08-26 09:03:10 -07:00
Brad Davis
dfd78a2662 Support platform independent sleep/wake notifications 2019-08-24 13:16:48 -07:00
Anthony J. Thibault
d410cb4fda Added "shutdown" crash annotation and crash menu option 2019-08-24 11:12:28 -07:00
dooglife@gmail.com
01b912210a json tuning to minimize the double-blend reduced animation effect, and to address some Joshua feedback 2019-08-23 15:06:31 -07:00
dooglife@gmail.com
e8492beb4a Merge branch 'master' into tweak_sit_pose 2019-08-23 14:21:09 -07:00
Zach Fox
dfcf70b9b5 Tons of Emote/Emoji changes 2019-08-23 14:14:53 -07:00
RebeccaStankus
f6a32b9318 Fix for PTT not working comments 2019-08-23 13:46:46 -07:00
RebeccaStankus
f109edbd48 Fix for PTT not working comments 2019-08-23 13:45:32 -07:00
RebeccaStankus
63038d12c2 Fix for PTT not working comments 2019-08-23 13:43:15 -07:00
RebeccaStankus
85ee61af9d Fix for PTT not working 2019-08-23 13:35:58 -07:00
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
dooglife@gmail.com
fed14ac588 Merge branch 'master' into tweak_sit_pose 2019-08-23 09:34:45 -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
dooglife@gmail.com
01e98e194a animation tuning pass 2019-08-22 16:48:41 -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
dooglife@gmail.com
75dd4d8da9 json tuning, adding cheer/disbelief anim block-ins, BUG: these are tposing here so do not merge - this is a test 2019-08-22 11:50:22 -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
dooglife@gmail.com
ec06a02fdf Merge branch 'master' of https://github.com/highfidelity/hifi into tweak_sit_pose 2019-08-21 08:46:59 -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
dooglifeSF
8d05d9e5d4 fix the worst of the mismatched emote poses for the eval mtg 2019-08-20 11:57:20 -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
dooglifeSF
8a3b93b913 add 3 sits with different hand placements for eval - also 2 new sit emotes 2019-08-20 10:35:56 -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