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
luiscuenca
ea23a82f33
Make mouse pitch less sensitive
2019-09-26 15:14:47 -07:00
luiscuenca
1b064a0ebe
Fix Q key on first person cam. Let camera control flying Y axis
2019-09-26 14:29:01 -07:00
dooglifeSF
0fa7220750
tilt head down slightly to minimize crazy eyes
2019-09-25 15:27:11 -07:00
dooglifeSF
a8fa3a136c
emote revisions, json tuning
2019-09-25 14:47:07 -07:00
luiscuenca
0aab2ed07f
Disable head look at when pointing
2019-09-25 12:37:24 -07:00
milad
aba6a28d54
updated camera modes
2019-09-25 11:05:32 -07:00
milad
39d96b76a6
fixed help text
2019-09-25 08:41:38 -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
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
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
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
dante ruiz
fe2a4c3600
fix fix-snap-html-issue
2019-09-19 18:20:08 -07: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
luiscuenca
279e25ca70
Merge master
2019-09-19 13:21:49 -07: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
Zach Fox
5e96ce8822
DEV-152: Implement 'Smooth/Snap Turn' setting in SimplifiedUI > Settings > VR
2019-09-19 09:48:11 -07:00
luiscuenca
fc223e4cb6
Reverse the up/down arrow keys if in selfie mode
2019-09-18 17:15:25 -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
luiscuenca
1054e8fcde
Selfie camera and updated camera menus
2019-09-17 17:15:16 -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
Zach Fox
60f4189eb3
BUGZ-1485: Fix Copyright date in About dialog
2019-09-17 11:36:12 -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
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
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
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
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
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
RebeccaStankus
33b78bea4f
Changed textField module sounds
2019-09-09 10:36:35 -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
luiscuenca
78eee5961c
Fix key mapping for new camera
2019-09-05 18:05:46 -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
humbletim
271fac4bca
Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge
2019-09-05 09:46:21 -04:00
milad
5fdcf0ecaf
updated setting name and changed default value to true for show tray
2019-09-04 12:59:17 -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
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
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
Brad Davis
31340d278a
Add test for local file access
2019-08-29 13:45:43 -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
577a82f750
Export animations, remove static channels. Remove unused joints. Exclude all scene data from fbx.
2019-08-28 10:10:39 -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
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
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
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
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
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
Zach Fox
78edfb9af9
Remove 'About' tab from Settings
2019-08-19 17:22:38 -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
35a2cb7f27
BUGZ-1295: Fix typo in Help > Controls > Turn Right
2019-08-19 13:08:42 -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
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
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
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
