Brad Hefta-Gaub
3b9c997317
Merge pull request #16505 from luiscuenca/zoomAndOrbitCamUsingTouchPad
...
Touchpad improvements: pinch to zoom camera, two finger swipe to look around, bug fixes
2019-11-19 13:30:45 -08:00
Anthony J. Thibault
befbdcef48
Upgraded OSC plugin with changes from ARKit blendshape work.
2019-11-19 13:13:56 -08:00
Brad Hefta-Gaub
63b21af562
Merge pull request #16506 from ctrlaltdavid/DEV-2764
...
DEV-2764, DEV-2113: Remove Avatar app links to AvatarIsland and BodyMart
2019-11-19 12:05:10 -08:00
Brad Hefta-Gaub
69af66195c
Merge pull request #15334 from SaracenOne/screen_name_at_signup_push
...
case 22189: Add display name field to the log in screen.
2019-11-19 12:02:31 -08:00
Brad Hefta-Gaub
0f428f0afb
Merge pull request #16498 from DouglasWilcox/improve_seated_rotation
...
Improve seated rotation
2019-11-19 10:22:08 -08:00
David Rowe
60d2845953
Remove further related dead code
2019-11-19 10:31:54 +13:00
David Rowe
748999b8d6
Remove reference to BodyMart in Avatar app
2019-11-19 09:59:59 +13:00
David Rowe
a912e97f1e
Remove reference to AvatarIsland in Avatar app
2019-11-19 09:53:58 +13:00
dante ruiz
cd6f9a774d
implement gesture pinch to camera zoom
2019-11-18 11:33:31 -07:00
DouglasWilcox
ddbb8d70ed
Speed up acceleration and blends slightly per Joshua, add kicks to turn anim.
2019-11-15 17:04:51 -08:00
DouglasWilcox
d9065affad
comment explaining seatedrot deceleration section, and transition-> turn works
2019-11-14 17:18:43 -08:00
DouglasWilcox
fb289704e2
iterate the turns, and make turning accessible from fidgets
2019-11-14 16:07:51 -08:00
Zach Fox
e21ee20ff8
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-14 15:18:07 -08:00
DouglasWilcox
37010648be
Abandon exponential acceleration and use constant acceleration. Hook up turn->sit transitions.
2019-11-14 13:12:01 -08:00
milad
abf592f533
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-13 10:14:14 -08:00
DouglasWilcox
a3de25618a
Handle HMD in input vars and remove/fix json transitions in/out of HMD strafe states.
...
(cherry picked from commit f9f28fc286
2019-11-13 09:52:56 -08:00
Anthony J. Thibault
b92badbe76
Updated avatar-animation-optimized-ik.json from latest avatar-animation.json
2019-11-13 08:23:27 -08:00
Anthony J. Thibault
b4c4d81bd1
Merge branch 'master' into bug-fix/android-t-pose
2019-11-13 08:21:19 -08:00
Anthony J. Thibault
365b132c30
Bugfix for t-pose avatar when moving
...
The android specific optimized IK animation graph was out of date, it was referencing
animations that have been deleted, hence the t-pose. This PR updates and renames the
android/optimized ik animation graph to the latest.
2019-11-12 15:33:41 -08:00
DouglasWilcox
f9f28fc286
Handle HMD in input vars and remove/fix json transitions in/out of HMD strafe states.
2019-11-12 14:15:19 -08:00
milad
ae35ec0975
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-11 16:42:55 -08:00
dooglifeSF
055d5cdf9b
Simplify boolean statements, revise several settle anims
2019-11-08 13:46:38 -08:00
dooglifeSF
02045a9fdf
add random versions of full sized settle
2019-11-08 11:57:06 -08:00
dooglifeSF
8e11d91c03
Merge branch 'master' into rand_settles_and_by_momentum
2019-11-07 15:09:10 -08:00
dooglifeSF
73202b9caf
Different settle transition depending on momentum
2019-11-07 09:52:26 -08:00
milad
dd1795e9b6
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-07 09:33:47 -08:00
Shannon Romano
4484ef095c
Merge pull request #16464 from DouglasWilcox/seated_fidgets_less_fidgety
...
Reduce fidgety motions in seated fidgets
2019-11-07 09:09:05 -08:00
milad
4b06e429d2
Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp
2019-11-06 17:43:38 -08:00
Zach Fox
c8464786e7
Steps closer...
2019-11-06 17:16:21 -08:00
dooglifeSF
15b935b491
remove jitter and bounce from several seated idles and fidgets, also reduce look-around cone
2019-11-06 13:08:42 -08:00
Zach Fox
ca8a61f085
DEV-2701: Remove the home icon from the profile app
2019-11-06 11:11:57 -08:00
Shannon Romano
668061e154
Merge pull request #16445 from hyperlogic/bug-fix/remove-last-legacy-blendshapes
...
Remove LipsUpperOpen and LipsLowerOpen, the last of the legacy blendshapes
2019-11-06 10:35:53 -08:00
Zach Fox
683c3f1300
An experiment with the top bar. Will you notice?
2019-11-05 09:33:11 -08:00
Anthony J. Thibault
101ec9d753
Remove LipsUpperOpen and LipsLowerOpen, the last of the legacy faceshift blendshapes
...
These blendshapes are not present in ARKit and are not used by any of our procedural
face animations (talking, blinking etc). This change should have been part of #16400 but
was accidently left out.
2019-11-04 09:49:24 -08:00
Anthony J. Thibault
4b34311a0a
Hooked up seated version of aim offset animation
2019-10-31 16:23:29 -07:00
Anthony Thibault
f99bb3ec77
Merge pull request #16400 from hyperlogic/feature/arkit-blendshapes
...
Extended avatar blendshape support for ARKit compatiblity
2019-10-31 12:33:50 -07:00
Maia Hansen
de5570ced8
Merge pull request #16421 from amerhifi/dev-2571new
...
case DEV-2771: Audio client shutdown lock
2019-10-31 09:50:56 -07:00
amerhifi
ddfbb55e19
fixed old ui filtering of audio devices
2019-10-29 15:36:43 -07:00
Rebecca Stankus
b8d6a2cf0b
Added extra attempt to parent interactive window content on creation
2019-10-29 11:20:14 -07:00
Zach Fox
bda1e3f696
Merge pull request #16398 from RebeccaStankus/grayEmoteWindow
...
Gray emote window
2019-10-28 11:37:17 -07:00
Amer
42234b119f
Merge pull request #16381 from amerhifi/amer-dev471-re
...
case Dev 471: HMD default audio behavior
2019-10-24 16:23:14 -07:00
Shannon Romano
15f27e53cb
Merge pull request #16372 from ctrlaltdavid/DEV-2055
...
DEV-2055: Sanitize LODManager.setWorldQualityDetail() parameter value
2019-10-24 15:20:34 -07:00
Rebecca Stankus
9a8fda2705
Feedback changes
2019-10-24 12:07:34 -07:00
Rebecca Stankus
f8102be74d
Added a timeout to update the content holder parent after interactive window has finished loading
2019-10-24 12:07:25 -07:00
Rebecca Stankus
8e8c157567
Debugging stuff
2019-10-24 12:07:20 -07:00
Rebecca Stankus
83a6155592
Added tons of logging to debug interactive window
2019-10-24 12:06:49 -07:00
Anthony J. Thibault
d43d12dfa7
Merge branch 'master' into feature/arkit-blendshapes
2019-10-23 21:45:10 -07:00
Zach Fox
a6bcbe4c66
DEV-2463: Put FTUE users in an empty serverless domain instead of the tutorial
2019-10-23 14:32:03 -07:00
Zach Fox
df782edcd9
DEV-2541: Update 'Jump To' top bar expanded text
2019-10-23 11:14:22 -07:00
dooglifeSF
b8a607dcf0
remove unused slow speed sidesteps
2019-10-22 11:53:59 -07:00
David Rowe
378c47d16c
Replace world detail quality float with enum
2019-10-22 19:18:11 +13:00
amerhifi
68681fdb2e
Merge branch 'master' into amer-dev471-re
2019-10-21 21:04:24 -07:00
Anthony J. Thibault
03f88f696d
Renamed LipsTogether to MouthClose and bug fixes.
2019-10-21 19:37:57 -07:00
dooglifeSF
b914bb60fe
Change strafeleft<->straferight transitions to isMoving vars and remove the sidesteps from the blendranges
2019-10-21 14:15:31 -07:00
amerhifi
c7e1fdaeac
adding hmd audio device info to deviceslist
...
changing locations
one more
merge
working on the threading issue
changing offices, working on qml
simple qml filtering
fixed spacing problem when item is removed
2019-10-18 15:29:10 -07:00
luiscuenca
33ea63c708
Fix warnings and update controls
2019-10-17 15:06:12 -07:00
luiscuenca
63c2b41929
Restate legacy first person camera mode
2019-10-17 13:26:42 -07:00
Anthony J. Thibault
389f5a1d33
ARKit Blendshape hookup work
2019-10-16 10:36:39 -07:00
Anthony J. Thibault
6efd74a339
WIP adding blendshapes to input system
2019-10-16 10:36:38 -07:00
Shannon Romano
71ef645781
Merge pull request #16351 from dooglifeSF/transition-locomotion-to-idle-based-on-input-and-speed
...
Fix sliding when stopping from run.
2019-10-16 09:03:00 -07:00
Zach Fox
1527bf2e11
Merge pull request #16294 from RebeccaStankus/friction
...
First Time User Experience Project
2019-10-15 14:56:25 -07:00
dooglifeSF
a043f0a17e
Create isNotInputSlow var for stategraph switch when no input and speed less than 1.5 m/s
2019-10-15 14:51:42 -07:00
Sabrina Shanman
b8df1c180f
Merge pull request #16343 from jherico/fix/DEV-2375
...
DEV-2375: ensure web entities stop playing audio
2019-10-14 13:04:57 -07:00
Zach Fox
341abb8185
Merge branch 'master' of github.com:highfidelity/hifi into friction
2019-10-14 12:36:35 -07:00
Brad Davis
6c35387b8d
also fix DEV-2083
2019-10-14 10:56:23 -07:00
Brad Davis
95b5c8a905
DEV-2375: ensure web entities stop playing audio
2019-10-14 10:46:32 -07:00
Zach Fox
c8b975b2f1
Merge pull request #16342 from zfox23/newInvalidatedLanguage
...
DEV-2334: New 'Item Invalidated' language in Inventory
2019-10-14 13:28:33 -04:00
Zach Fox
b45156b44c
Merge pull request #16337 from RebeccaStankus/locationText
...
Added blank placeholder text on focus to text field
2019-10-14 12:35:29 -04:00
Zach Fox
7bd550e37b
DEV-2334: New 'Item Invalidated' language in Inventory
2019-10-14 09:30:44 -07:00
Rebecca Stankus
21503137d4
Added blank placeholder text on focus to text field
2019-10-11 14:42:39 -07:00
dooglifeSF
96510429ba
Fix stand talking pops
2019-10-11 10:44:50 -07:00
dooglifeSF
df11977b39
remove all transitions from seated except idle via isNotSeated
2019-10-11 09:54:10 -07:00
Zach Fox
2220234d68
Removed yellow
2019-10-09 14:33:28 -07:00
Zach Fox
bed1192d70
A bunch of fixes, plus added a debug mode Settings switch
2019-10-09 14:18:36 -07:00
Zach Fox
5871e6b83a
Host avatars remotely
2019-10-08 17:39:57 -04:00
Zach Fox
17478af32d
Remove debug code
2019-10-08 17:31:35 -04:00
Zach Fox
42bf2bf30e
All windows 'done' except for final tweaks; debug mode still ON
2019-10-08 13:17:04 -04:00
Zach Fox
a23bee19e8
Controls screen done
2019-10-07 19:52:22 -04:00
Zach Fox
643dd21f86
Merge branch 'master' of github.com:highfidelity/hifi into frictionIteration
2019-10-07 13:22:08 -04:00
dooglifeSF
387f0a3f10
add isInput* and isNotInput vars for use in json, and edit json to use them
2019-10-04 15:28:35 -07:00
RebeccaStankus
2f2b7b0306
Ready for CR Thank you Zach
2019-10-03 17:30:47 -07:00
Zach Fox
b23aecf6c5
Merge branch 'friction' of github.com:RebeccaStankus/hifi into friction
2019-10-03 10:12:58 -07:00
Zach Fox
33b8942ffd
Changes to Avatar/Profile App complete
2019-10-03 09:41:30 -07:00
dooglifeSF
ebd0b06475
animation revisions after checking them in a standup group
2019-10-02 17:18:36 -07:00
RebeccaStankus
47841d9bcd
Merge branch 'friction' of github.com:RebeccaStankus/hifi into friction
2019-10-02 12:42:53 -07:00
RebeccaStankus
dc15b55aa5
Merge branch 'master' of github.com:highfidelity/hifi into friction
2019-10-02 12:05:34 -07:00
Zach Fox
50b06a40d7
Improved random avatar selection logic, plus local avatars
2019-10-01 17:22:24 -07:00
dooglifeSF
86e67afe34
Merge branch 'master' into sit_variants_and_fidgets
2019-10-01 16:52:17 -07:00
dooglifeSF
0ab4075c3b
sit idles and idle fidgets with json edits
2019-10-01 16:51:10 -07:00
RebeccaStankus
d2e62749c7
Ready for Zach to add default avatar changes
2019-10-01 16:36:06 -07:00
luiscuenca
09f0222285
Restore previous control keys for free camera
2019-10-01 14:18:46 -07:00
Shannon Romano
38574cd66b
Merge pull request #16245 from luiscuenca/implementPointAt
...
DEV-442: Implement directional blending node for point reaction
2019-10-01 11:46:30 -07:00
RebeccaStankus
3167dc9a35
Merge branch 'master' of github.com:highfidelity/hifi into friction
2019-10-01 09:59:14 -07:00
RebeccaStankus
0dfb234089
Finished UI, ready for CR
2019-10-01 09:58:44 -07:00
Anthony Thibault
7ee5b8e229
Merge pull request #16252 from dooglifeSF/emotes_revisions_per_feedback
...
Emotes revisions per feedback
2019-09-30 15:46:50 -07:00
dooglifeSF
5cfa1cb5ba
Merge branch 'master' of https://github.com/highfidelity/hifi into sit_variants_and_fidgets
2019-09-30 09:38:45 -07:00
RebeccaStankus
68f52584cf
Merge branch 'master' of github.com:highfidelity/hifi into friction
2019-09-30 09:19:15 -07:00
David Rowe
cd6d9b57c4
Fix Blocks script displaying a blank page
2019-09-28 11:30:56 +12:00
RebeccaStankus
de4e8b9cc4
Merge branch 'master' of github.com:highfidelity/hifi into friction
2019-09-27 09:16:26 -07:00
RebeccaStankus
f4ecd3dcd8
Working on initial/second launch
2019-09-27 09:15:39 -07:00
