luiscuenca
|
76609197e2
|
Read flow data from the fst file
|
2019-03-05 18:50:53 -07:00 |
|
Shannon Romano
|
4f3d593d90
|
Merge pull request #15072 from SamGondelman/clear
Case 11775: Don't clear my avatar entities on domain switch
|
2019-03-05 15:42:51 -08:00 |
|
danteruiz
|
1941e53cc3
|
track oculus controllers while in oculus home
|
2019-03-05 15:32:18 -08:00 |
|
Roxanne Skelly
|
3ef02085ff
|
Merge commit '041a561dbcaa7280fd2c14ba2051b2add756ca6f'
|
2019-03-05 15:07:49 -08:00 |
|
danteruiz
|
e6a63a9a69
|
add keyboard for html content
|
2019-03-05 14:24:38 -08:00 |
|
Sam Gondelman
|
94cc5b83ac
|
Merge pull request #15088 from SamGondelman/create
Case 21541: Fix mouse on create in HMD
|
2019-03-05 13:07:49 -08:00 |
|
Shannon Romano
|
3eff5d269f
|
Merge pull request #15008 from ctrlaltdavid/M21128-a
Case 21128: AccountServices, HifiAbout, and WalletScriptingInterface JSDoc review
|
2019-03-05 11:58:37 -08:00 |
|
amantley
|
8e9618d740
|
added a lower run animation to stop hovering when running
|
2019-03-05 11:44:53 -08:00 |
|
Wayne Chen
|
2020b757a3
|
adding mic glyph
|
2019-03-05 10:58:26 -08:00 |
|
Wayne Chen
|
f1cf11de85
|
moving gain slider to audio settings
|
2019-03-05 10:53:55 -08:00 |
|
Wayne Chen
|
a00d6ec9f6
|
removing debug statement
|
2019-03-04 19:42:30 -08:00 |
|
Wayne Chen
|
0f2792930a
|
adding switches and buttons to testing audio
|
2019-03-04 19:28:12 -08:00 |
|
SamGondelman
|
f2c248c0a2
|
disable href and entity script events when in edit mode
|
2019-03-04 17:10:20 -08:00 |
|
Wayne Chen
|
a68aaaa7a4
|
adding timer and ui color changes
|
2019-03-04 16:06:50 -08:00 |
|
SamGondelman
|
12f5a735d9
|
simplifying mouse events and fix mouse on create
|
2019-03-04 14:50:09 -08:00 |
|
Wayne Chen
|
4187104b17
|
culling mute state
|
2019-03-04 14:12:09 -08:00 |
|
Seth Alves
|
9614216006
|
don't disable server echo when audio qml page is closed
|
2019-03-04 13:47:55 -08:00 |
|
Seth Alves
|
d5e8cba1ee
|
make server-audio-loopback button work in HMDs
|
2019-03-04 13:47:55 -08:00 |
|
Seth Alves
|
6ee236e783
|
added a button to enable server loopback of audio
|
2019-03-04 13:47:55 -08:00 |
|
Seth Alves
|
3ecd86caee
|
add a way to disble muted warning from audio panel.
fix positioning of warning. hide warning when removing timer.
|
2019-03-04 13:47:55 -08:00 |
|
Seth Alves
|
d54d0280c2
|
rework audioMuteOverlay.js
|
2019-03-04 13:47:54 -08:00 |
|
Oren Hurvitz
|
7780db813d
|
Save the "Mute Microphone" setting
|
2019-03-04 13:47:54 -08:00 |
|
Wayne Chen
|
7860db68eb
|
culling hearing oneself and testing sound
|
2019-03-04 13:33:16 -08:00 |
|
Shannon Romano
|
45099a5db6
|
Merge pull request #15076 from SamGondelman/laserWidth
Case 21514: Lasers scale with avatar
|
2019-03-04 11:26:08 -08:00 |
|
Seth Alves
|
0523a0d06d
|
don't disable server echo when audio qml page is closed
|
2019-03-04 11:08:07 -08:00 |
|
Seth Alves
|
9ff99c7213
|
make server-audio-loopback button work in HMDs
|
2019-03-04 11:08:07 -08:00 |
|
Seth Alves
|
6f40079621
|
added a button to enable server loopback of audio
|
2019-03-04 11:08:07 -08:00 |
|
Seth Alves
|
38256df0f2
|
add a way to disble muted warning from audio panel.
fix positioning of warning. hide warning when removing timer.
|
2019-03-04 11:08:06 -08:00 |
|
Seth Alves
|
3f52361753
|
rework audioMuteOverlay.js
|
2019-03-04 11:08:06 -08:00 |
|
Oren Hurvitz
|
18325ef5e3
|
Save the "Mute Microphone" setting
|
2019-03-04 11:08:06 -08:00 |
|
danteruiz
|
a026933819
|
keyboard handle scaling
|
2019-03-04 10:56:14 -08:00 |
|
Shannon Romano
|
6d297d91f6
|
Merge pull request #15073 from danteruiz/fix-tablet-button-rotation
Case 21512: Very difficult to use the close button on the tablet (0.81.0)
|
2019-03-04 10:49:16 -08:00 |
|
Shannon Romano
|
d56b460d11
|
Merge pull request #15030 from wayne-chen/clockOnTablet
Case 21456, Case 21463: Clock On Tablet (81.0/master)
|
2019-03-04 10:45:34 -08:00 |
|
SamGondelman
|
da1ffc15e3
|
lasers scale with avatar
|
2019-03-01 15:42:45 -08:00 |
|
danteruiz
|
8e600adf1e
|
making requested changes
|
2019-03-01 15:30:11 -08:00 |
|
Sam Gateau
|
cc9a3e2541
|
Merge pull request #15052 from amerhifi/quest-demo
case 21485: removing quest-demo specific changes
|
2019-03-01 15:03:44 -08:00 |
|
danteruiz
|
618a1d5b83
|
fix tablet button and gizmos rotation
|
2019-03-01 14:31:12 -08:00 |
|
SamGondelman
|
3e6061e435
|
try to not clear my avatar entities on domain switch
|
2019-03-01 13:45:00 -08:00 |
|
Shannon Romano
|
20d65ab183
|
Merge pull request #15064 from danteruiz/another-login-fix
Case 21451: HMD Login Encouragement Screen is not Usable
|
2019-03-01 12:57:17 -08:00 |
|
Shannon Romano
|
5db5fca81e
|
Merge pull request #15066 from SamGondelman/2d
Case 19188: Potential 2D overlay + Tablet threading fixes
|
2019-03-01 12:56:23 -08:00 |
|
amer cerkic
|
6ebc57994b
|
Merge branch 'master' into quest-demo
|
2019-03-01 10:23:41 -08:00 |
|
Shannon Romano
|
1084e79a2e
|
Merge pull request #15019 from AndrewMeadows/fix-crash-after-avatar-upload
Case 21422: fix crash for nullptr deref when looking at recently uploaded avatar in inventory
|
2019-03-01 09:35:01 -08:00 |
|
Shannon Romano
|
d68f82eb7d
|
Merge pull request #15060 from AndrewMeadows/avoid-mem-leaked-entities
Case 21494: Avoid mem leaked entities
|
2019-03-01 09:34:20 -08:00 |
|
Shannon Romano
|
00ca3bc933
|
Merge pull request #15058 from SamGondelman/reload
Case 21490: Fix lasers and keyboard on reload
|
2019-03-01 09:31:56 -08:00 |
|
danteruiz
|
7bcf727a83
|
review changes
|
2019-02-28 18:11:51 -08:00 |
|
danteruiz
|
9fe0309ae6
|
another login fix
|
2019-02-28 17:11:48 -08:00 |
|
SamGondelman
|
b26b02fed6
|
potential 2d overlay threading fixes
|
2019-02-28 17:02:08 -08:00 |
|
Andrew Meadows
|
7d9efe4c09
|
avoid mem-leak for serverless domains
|
2019-02-28 14:20:11 -08:00 |
|
amerhifi
|
35dc13e06a
|
Merge branch 'master' into quest-demo
|
2019-02-28 14:06:47 -08:00 |
|
SamGondelman
|
15064f0097
|
fix lasers and keyboard on reload
|
2019-02-28 14:04:22 -08:00 |
|
SamGondelman
|
a8e6d01279
|
fix context overlay
|
2019-02-28 11:33:09 -08:00 |
|
amer cerkic
|
faedc61c37
|
removing quest-demo specific changes
|
2019-02-28 10:54:30 -08:00 |
|
amer cerkic
|
a425becc8a
|
clean up of debugging
|
2019-02-27 15:35:33 -08:00 |
|
Shannon Romano
|
1a83ab2dab
|
Merge pull request #15038 from danteruiz/fix-login-screen
Case 21451: HMD Login Encouragement Screen is not Usable
|
2019-02-27 14:41:41 -08:00 |
|
David Rowe
|
d73ff2e855
|
Revise current MyAvatar API JSDoc
|
2019-02-28 10:40:10 +13:00 |
|
amer cerkic
|
92cfa49bfb
|
adding and testing command line parameter passing to application
|
2019-02-27 11:42:22 -08:00 |
|
SamGondelman
|
bf9e5b9550
|
comment out another log
|
2019-02-27 10:25:34 -08:00 |
|
danteruiz
|
2fd94c6bbc
|
fixing login dialog
|
2019-02-27 10:08:38 -08:00 |
|
Wayne Chen
|
028cce5394
|
change short username to 14 characters, displaying as normal text
|
2019-02-26 12:26:50 -08:00 |
|
Shannon Romano
|
2aa622b855
|
Merge pull request #15014 from sethalves/fix-grab-earthquake
case 21411: don't allow others' grabs to move locked or ungrabbable things
|
2019-02-26 09:03:44 -08:00 |
|
nimisha20
|
ba3895efdd
|
Update AccountServicesScriptingInterface.h
Minor copy-edit
|
2019-02-25 22:56:36 -08:00 |
|
nimisha20
|
736a050e68
|
Update AccountServicesScriptingInterface.h
|
2019-02-25 22:55:56 -08:00 |
|
nimisha20
|
4825ecdbf3
|
Update AccountServicesScriptingInterface.h
|
2019-02-25 22:44:16 -08:00 |
|
Wayne Chen
|
650b34c463
|
adding clock
|
2019-02-25 18:00:56 -08:00 |
|
Shannon Romano
|
7fe3bb387e
|
Merge pull request #15012 from SamGondelman/nametag
Case 21397: Trying to fix overlay rotation
|
2019-02-25 16:52:01 -08:00 |
|
Andrew Meadows
|
6e13203fec
|
avoid nullptr deref
|
2019-02-25 13:52:46 -08:00 |
|
SamGondelman
|
e102ad073e
|
allow flying in HMD if you would otherwise fall forever
|
2019-02-25 11:49:38 -08:00 |
|
Roxanne Skelly
|
292ac88c96
|
Update with new standalone-optimized icon
|
2019-02-25 11:36:45 -08:00 |
|
Seth Alves
|
db821487d9
|
don't allow others' grabs to move locked or ungrabbable things
|
2019-02-25 11:27:10 -08:00 |
|
Thijs Wenker
|
79d0a0a0a8
|
avatar doctor project status
|
2019-02-25 19:28:38 +01:00 |
|
Roxanne Skelly
|
2dffd14fa7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
|
2019-02-25 10:20:52 -08:00 |
|
SamGondelman
|
8058ad884e
|
trying to fix overlay rotation
|
2019-02-25 09:53:33 -08:00 |
|
nimisha20
|
e20f13f0ae
|
Update AccountServicesScriptingInterface.h
Adding ctrlaltdavid's changes
|
2019-02-25 09:28:56 -08:00 |
|
nimisha20
|
2bcee4e454
|
Update AccountServicesScriptingInterface.cpp
Changes according to ctrlaltdavid's comments.
|
2019-02-25 08:54:47 -08:00 |
|
David Rowe
|
4e9d162172
|
AccountServices, HifiAbout, and WalletScriptingInterface JSDoc review
|
2019-02-24 13:23:20 +13:00 |
|
Sam Gateau
|
4f0911bd29
|
Merge pull request #15003 from SamGondelman/nametag
Case 21397: Fix nametag rotation
|
2019-02-23 09:00:12 -08:00 |
|
SamGondelman
|
37720e9daa
|
fix nametag rotation
|
2019-02-22 16:53:03 -08:00 |
|
Shannon Romano
|
5f99158c25
|
Merge pull request #14977 from SamGondelman/rot
Case 21354: Add "modelScale" property to fix pal
|
2019-02-22 16:36:17 -08:00 |
|
Sam Gateau
|
860b3a35e4
|
Merge pull request #14992 from hyperlogic/quest-demo-with-avatar-ik-optimizations
Quest demo with avatar ik optimizations
|
2019-02-22 16:32:24 -08:00 |
|
Anthony Thibault
|
1213084fc6
|
Merge pull request #14984 from kencooke/master
Case 21384: Avatar mouth blendshapes are not working correctly (master)
|
2019-02-22 16:29:07 -08:00 |
|
Roxanne Skelly
|
0636579822
|
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
|
2019-02-22 15:43:42 -08:00 |
|
Dante Ruiz
|
eedd54d0b1
|
Merge branch 'quest-demo' of github.com:highfidelity/hifi into quest-demo
|
2019-02-22 15:02:01 -08:00 |
|
Dante Ruiz
|
a87e49bb23
|
start in quest dev
|
2019-02-22 15:01:30 -08:00 |
|
Shannon Romano
|
a63f3e76c8
|
Merge pull request #14972 from SamGondelman/billboard
Case 21341: Fix billboard mode in secondary camera
|
2019-02-22 13:01:09 -08:00 |
|
amantley
|
87d98e5b85
|
These are the squashed commits for the ik optimization for the Quest
Implmented using a new AnimSplineIK node in the anim graph
(cherry picked from commit 4fe03ba238659fee7763991f2499a315482b351f)
|
2019-02-22 11:21:36 -08:00 |
|
Sam Gateau
|
1d5a4116b9
|
Merge pull request #14986 from amerhifi/quest-demo
case 21374 : Away mode on Quest when device is paused
|
2019-02-22 09:54:57 -08:00 |
|
amer cerkic
|
9c833f7e64
|
clean up
|
2019-02-22 09:21:51 -08:00 |
|
amer cerkic
|
f04fdb2187
|
added esc key event to fire for the away animation when cycling pause/resume. Reverted change on surface destroy that nullified the surface. Forgot to remove that during testin. Removed comment in away.js with syntax error. Setting cpu/gpu levels back to 1/1 after vr mode is released. Noticed that OS stays in same cpu/gpu level after app closes. Hoping this will help reduce battery drain for user
|
2019-02-22 09:11:24 -08:00 |
|
luiscuenca
|
3072ca43de
|
Detailed picking if avatar is not null
|
2019-02-22 09:24:38 -07:00 |
|
Ken Cooke
|
c1786edc24
|
Emulate the old behavior of _lastInputLoudness
|
2019-02-21 18:45:17 -08:00 |
|
Anthony Thibault
|
8785f733db
|
Merge pull request #14817 from amantley/animSplineIK
AnimSplineIK node added to inverse kinematics
|
2019-02-21 17:13:41 -08:00 |
|
Anthony Thibault
|
e54754c4ce
|
Merge pull request #14926 from luiscuenca/flowCpp
Cpp implementation of the Flow script
|
2019-02-21 17:10:05 -08:00 |
|
Sam Gateau
|
ddc42585d8
|
Cleanup syntax
|
2019-02-21 16:41:50 -08:00 |
|
Sam Gateau
|
94fc60f285
|
Bad idea to include global here
|
2019-02-21 16:34:50 -08:00 |
|
amer cerkic
|
9097d9c57c
|
working on pause -> away mode. Even doesn't seem to be firing. Also found a spot where I left commented out code from lifecycle testing.
|
2019-02-21 16:33:25 -08:00 |
|
amantley
|
3bf5c44f98
|
fixed build warnings
|
2019-02-21 16:24:46 -08:00 |
|
amantley
|
5cf8a963cd
|
make spine2 rotation damping only happen in optimized code. the regular code is already damped
|
2019-02-21 15:41:16 -08:00 |
|
Sam Gateau
|
fe33aadd69
|
Assigning the default world detail and max render rate target in vr quest
|
2019-02-21 14:58:06 -08:00 |
|
amantley
|
c9db426ce4
|
Merge remote-tracking branch 'upstream/master' into animSplineIK
|
2019-02-21 14:36:13 -08:00 |
|
amantley
|
6323f49f26
|
changed the define variable to HIFI_USE_OPTIMIZED_IK
|
2019-02-21 14:36:05 -08:00 |
|
SamGondelman
|
544f54e69a
|
fix model scale
|
2019-02-21 14:10:36 -08:00 |
|
Roxanne Skelly
|
258e80237e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
|
2019-02-21 11:54:47 -08:00 |
|
amantley
|
afed0b5442
|
review changes
|
2019-02-21 11:08:29 -08:00 |
|
Shannon Romano
|
f9e5ee0185
|
Merge pull request #14970 from danteruiz/quest-no-keyboard
Case 21335: Use old tablet keyboard for quest
|
2019-02-21 10:34:53 -08:00 |
|
SamGondelman
|
4fdf556d5d
|
fix billboard mode in secondary camera
|
2019-02-21 10:29:21 -08:00 |
|
Angus Antley
|
b6bc467f4b
|
added HIFI_USE_Q_OS_ANDROID to cmake lists and to MySkeletonModel
|
2019-02-21 06:42:55 -08:00 |
|
amantley
|
f8a74efdc2
|
fixed build errors from jenkins
|
2019-02-20 17:59:45 -08:00 |
|
amantley
|
27bfe2f0fe
|
changed name of pre processor variable
|
2019-02-20 15:14:12 -08:00 |
|
Roxanne Skelly
|
8c058f147e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
|
2019-02-20 14:24:47 -08:00 |
|
Roxanne Skelly
|
dca166f821
|
Stand-alone Optimized Tagging - Add tagging for GOTO User Stories
|
2019-02-20 14:23:54 -08:00 |
|
Dante Ruiz
|
bf8c671cd6
|
keyboard setting
|
2019-02-20 13:38:20 -08:00 |
|
John Conklin II
|
87556059d3
|
Merge pull request #13901 from Cristo86/android_handshake
case 20058: Android - Handshake implementation
|
2019-02-20 13:33:52 -08:00 |
|
Brad Davis
|
79369a0c83
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-20 10:40:49 -08:00 |
|
Shannon Romano
|
0b7bdb185e
|
Merge pull request #14949 from SamGondelman/wearables
Case 21300, Case 21301: Group cull all entity descendants of avatars
|
2019-02-20 10:29:40 -08:00 |
|
John Conklin II
|
97c7b01005
|
Merge pull request #14965 from danteruiz/stylus-pick-perf
Case 21255: PickManager performance is slow when keyboard mallets are enabled
|
2019-02-20 10:11:33 -08:00 |
|
Brad Davis
|
817c24dd0b
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-20 09:51:03 -08:00 |
|
Brad Davis
|
122a246d2d
|
Fix typo
|
2019-02-19 17:30:47 -08:00 |
|
Shannon Romano
|
07d084d086
|
Merge pull request #14937 from SamGondelman/pal
Case 21259: Pal textures don't change
|
2019-02-19 17:14:15 -08:00 |
|
Brad Davis
|
518e480a8b
|
Fix plugin activation
|
2019-02-19 17:00:50 -08:00 |
|
SamGondelman
|
6765268998
|
Merge remote-tracking branch 'upstream/master' into wearables
|
2019-02-19 16:52:00 -08:00 |
|
luiscuenca
|
04e57d0dd1
|
No Rig pointer on Flow class, solve network animations and fixed bug
|
2019-02-19 17:45:46 -07:00 |
|
danteruiz
|
6bdf51a460
|
limit number of include items for mallets
|
2019-02-19 16:25:38 -08:00 |
|
danteruiz
|
d1c46e1cdc
|
fixing tablet pointer issues
|
2019-02-19 14:48:17 -08:00 |
|
Dante Ruiz
|
6189aff6b3
|
Merge pull request #14933 from danteruiz/pick-manager-perf
Case 21271: Remove unnessary picks for quest
|
2019-02-19 14:20:56 -08:00 |
|
Brad Davis
|
d60dcb99d2
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-19 12:37:30 -08:00 |
|
Roxanne Skelly
|
d957b38f10
|
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
|
2019-02-19 12:34:10 -08:00 |
|
SamGondelman
|
2986ca20c5
|
Merge remote-tracking branch 'upstream/master' into pal
|
2019-02-19 11:31:40 -08:00 |
|
John Conklin II
|
d7a5c0bb4f
|
Merge pull request #14947 from SamGondelman/overlayClick
Case 21291, Case 21292, Case 21293: Working on overlay bugs
|
2019-02-19 11:01:19 -08:00 |
|
John Conklin II
|
1348baecc7
|
Merge pull request #14935 from SamGondelman/matEntity
Case 20920: Move Material Entity logic to render thread
|
2019-02-19 10:59:51 -08:00 |
|
John Conklin II
|
0f8c36156b
|
Merge pull request #14952 from SamGondelman/textColor
Case 21305: Fix text overlay color property
|
2019-02-19 10:58:32 -08:00 |
|
Howard Stearns
|
d7d6ff53ca
|
Merge pull request #14765 from howard-stearns/artist-stocking-inventory
Case 20657: artist stocking inventory
|
2019-02-19 10:46:01 -08:00 |
|
danteruiz
|
4bbae1230d
|
making requested chantges
|
2019-02-19 10:07:36 -08:00 |
|
SamGondelman
|
927e824610
|
fix missing color for text overlays
|
2019-02-18 16:14:07 -08:00 |
|
David Rowe
|
f58a5db0b0
|
Reorganize JSDoc inheritance for MyAvatar and Avatar
|
2019-02-19 09:47:51 +13:00 |
|
Angus Antley
|
748368bfda
|
mid tweak on the wrist and position coeffs
|
2019-02-17 23:32:52 -08:00 |
|
David Rowe
|
50a1e07ed2
|
Stub missing MyAvatar, Avatar, and Agent functions and properties JSDoc
|
2019-02-18 18:32:49 +13:00 |
|
SamGondelman
|
06ac2b291b
|
attachments and wearables cull with avatar parent
|
2019-02-17 17:52:10 -08:00 |
|
SamGondelman
|
1163cbea70
|
improving web surface interaction and tablet hiding
|
2019-02-16 22:03:55 -08:00 |
|
SamGondelman
|
85421cd6ee
|
speed up stylus picks
|
2019-02-16 21:16:46 -08:00 |
|
SamGondelman
|
71653f95d7
|
working on overlay bugs
|
2019-02-16 20:08:36 -08:00 |
|
Angus Antley
|
70764bc3c4
|
Merge remote-tracking branch 'upstream/master' into animSplineIK
|
2019-02-15 19:24:30 -08:00 |
|
amantley
|
d78f253d24
|
code to generate pole vector from theta
|
2019-02-15 17:43:53 -08:00 |
|
Howard Stearns
|
e9b323a807
|
fix HFC symbol location at checkout, and the display of unavailable items
|
2019-02-15 16:56:31 -08:00 |
|
danteruiz
|
b00746c096
|
Trim picks in use during quest:
|
2019-02-15 16:24:17 -08:00 |
|
SamGondelman
|
0f33d696d2
|
trying to fix pal colors
|
2019-02-15 16:12:36 -08:00 |
|
John Conklin II
|
4520236873
|
Merge pull request #14917 from thoys/feat/avatarTools/avatarDoctor
Case 21012: Avatar Doctor
|
2019-02-15 15:43:18 -08:00 |
|
Howard Stearns
|
f16eb1c029
|
Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory
|
2019-02-15 15:15:13 -08:00 |
|
amantley
|
36093926d0
|
added fake android defines for running the new ik on pc
|
2019-02-15 15:00:39 -08:00 |
|
Thijs Wenker
|
e900d3784b
|
fixes
|
2019-02-15 23:58:42 +01:00 |
|
SamGondelman
|
3df231f1e0
|
it's working!
|
2019-02-15 14:43:22 -08:00 |
|
John Conklin II
|
09d8221582
|
Merge pull request #14834 from gcalero/connection_failure_dialog
Case 20936: Set message dialog text width so wrap mode takes effect
|
2019-02-15 14:16:02 -08:00 |
|
Brad Davis
|
578bc4fc89
|
Suppress logspam with missing Controller in QML
|
2019-02-15 14:15:24 -08:00 |
|
ingerjm0
|
c8791841de
|
Merge pull request #14918 from ctrlaltdavid/M21128
Case 21128: AccountServices, HifiAbout, and WalletScriptingInterface JSDoc
|
2019-02-15 14:15:13 -08:00 |
|
Brad Davis
|
78be935e1a
|
Consolidating differences from master
|
2019-02-15 14:12:37 -08:00 |
|
Brad Davis
|
4409e59682
|
Add per-android-app preprocessor macros
|
2019-02-15 14:11:26 -08:00 |
|
Roxanne Skelly
|
a82385200e
|
Merge pull request #14906 from roxanneskelly/QmlMarketplace
Qml marketplace - multiple improvements/bugfixes
|
2019-02-15 14:04:47 -08:00 |
|
John Conklin II
|
b9356e22d8
|
Merge pull request #14927 from huffman/fix/hide-asset-browser
Case 16349: Fix asset browser being hidden in incorrect way on server switch
|
2019-02-15 13:32:27 -08:00 |
|
SamGondelman
|
c92b82e744
|
merge with master
|
2019-02-15 12:43:30 -08:00 |
|
Roxanne Skelly
|
2c4f485079
|
QmlMarketplace invert arrow direction on sort.
|
2019-02-15 12:31:01 -08:00 |
|
Thijs Wenker
|
74ce98a075
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarDoctor
|
2019-02-15 20:57:20 +01:00 |
|
Thijs Wenker
|
556a55ff16
|
Better scale and texture checks
|
2019-02-15 20:55:27 +01:00 |
|
SamGondelman
|
87ab255115
|
finish moving materials to rendering
|
2019-02-15 11:49:20 -08:00 |
|
Brad Davis
|
a5f84ab51a
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-15 11:37:13 -08:00 |
|
Roxanne Skelly
|
fb524f8900
|
Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace
|
2019-02-15 11:35:06 -08:00 |
|
Sam Gondelman
|
9aa99f24f0
|
Merge pull request #14905 from SamGondelman/materialMapping
Case 20242: FST materialMapping supports our material JSON format
|
2019-02-15 11:21:51 -08:00 |
|
Roxanne Skelly
|
be98fb1ac7
|
Standalone Tags - checkpoint
|
2019-02-15 11:21:40 -08:00 |
|
SamGondelman
|
25b31cfc72
|
merge with master
|
2019-02-15 11:08:24 -08:00 |
|
Howard Stearns
|
490ef3542e
|
update for marketplace-in-qml, and make specific to username
|
2019-02-15 10:58:09 -08:00 |
|
amantley
|
0fcaa695ba
|
Merge remote-tracking branch 'upstream/master' into animArmIK
|
2019-02-15 10:35:33 -08:00 |
|
amantley
|
d6dfaacf6f
|
adding ifdef for android os
|
2019-02-15 10:35:25 -08:00 |
|
Brad Davis
|
0b171ffe13
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-15 10:31:04 -08:00 |
|
Howard Stearns
|
8a6f2b221b
|
Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory
|
2019-02-15 09:47:18 -08:00 |
|
Anthony Thibault
|
702f1c8e74
|
Merge pull request #14925 from hyperlogic/bug-fix/revert-anim-pose-optimization
Revert anim pose optimization
|
2019-02-15 09:42:27 -08:00 |
|
Howard Stearns
|
30c0dda9ed
|
Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory
|
2019-02-15 09:27:48 -08:00 |
|
Simon Walton
|
748747da2d
|
Merge pull request #14864 from SimonWalton-HiFi/pal-sort-loudness-persist
Case 19724: If sorting PAL by loudness re-sort upon loudness updates
|
2019-02-15 09:24:34 -08:00 |
|
luiscuenca
|
c966f71cb1
|
More fixes
|
2019-02-15 10:17:37 -07:00 |
|
luiscuenca
|
98c321c718
|
Fix warnings
|
2019-02-15 09:40:49 -07:00 |
|
amantley
|
425413419a
|
fixed merge conflict in avatar.h
|
2019-02-15 08:26:54 -08:00 |
|
Angus Antley
|
382a03929e
|
changed back to regular 2 bone Ik for arms in json and cleaned up rig.cpp and polevector constraint
|
2019-02-15 07:06:43 -08:00 |
|
Ryan Huffman
|
ab5c4a927b
|
Fix asset browser being hidden in incorrect way on server switch
|
2019-02-14 22:18:42 -08:00 |
|
luiscuenca
|
624a53449f
|
Merge branch 'master' into flowCpp
# Solved Conflicts:
# interface/src/avatar/MyAvatar.cpp
|
2019-02-14 18:55:43 -07:00 |
|
luiscuenca
|
88eae0f2ec
|
Remove test functions
|
2019-02-14 18:49:49 -07:00 |
|
Shannon Romano
|
f267043953
|
Merge pull request #14838 from SamGondelman/billboardMode
Case 20962: Billboard mode improvements
|
2019-02-14 17:44:48 -08:00 |
|
Shannon Romano
|
3b5b077a3e
|
Merge pull request #14887 from AndrewMeadows/shape-garbage-collector
Case 21066: restore shape caching in ShapeManager
|
2019-02-14 17:33:33 -08:00 |
|
luiscuenca
|
3e66bce112
|
set useFlow function
|
2019-02-14 18:30:37 -07:00 |
|
Anthony Thibault
|
a3407b96b0
|
Merge branch 'master' into bug-fix/revert-anim-pose-optimization
|
2019-02-14 16:56:17 -08:00 |
|
Sam Gateau
|
6168001ad4
|
Merge pull request #14909 from AndrewMeadows/update-collision-group-after-grab-80
Case 21159: fixes for more grab bugs
|
2019-02-14 16:52:03 -08:00 |
|
Anthony Thibault
|
39b4eaac34
|
Revert "AnimPose operator* optimizations"
This reverts commit 569bef50fd.
|
2019-02-14 16:13:00 -08:00 |
|
Bradley Austin Davis
|
d45d87031d
|
Merge pull request #14782 from SamGondelman/NOverlaysFinal
Case 20723, Case 20334: Internally, replace all overlays with local entities
|
2019-02-14 13:49:47 -08:00 |
|
SamGondelman
|
bed2732d34
|
start moving materials to rendering only
|
2019-02-14 12:59:16 -08:00 |
|
Brad Davis
|
292602afd7
|
Resolving more master differences
|
2019-02-14 12:55:28 -08:00 |
|
Brad Davis
|
0f4d1f073b
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-14 12:49:56 -08:00 |
|
Sam Gateau
|
969c62d0df
|
Merge pull request #14907 from danteruiz/fix-qml-crash-on-mac
Case 21157: Fix Desktop.qml crash on local mac build
|
2019-02-14 12:15:50 -08:00 |
|
Sam Gateau
|
384d4fb959
|
Merge pull request #14809 from highfidelity/commandLineAndroid
case 19113: Recreated changes due to CLA issue in previous pr. Adding args to int…
|
2019-02-14 12:10:08 -08:00 |
|
David Rowe
|
6a00834147
|
Merge branch 'master' into M21128
# Conflicts:
# interface/src/AboutUtil.h
|
2019-02-15 08:06:41 +13:00 |
|
David Rowe
|
d717e803dd
|
WalletScriptingInterface API JSDoc
|
2019-02-15 08:00:53 +13:00 |
|
David Rowe
|
cc083afec6
|
HifiAbout API JSDoc
|
2019-02-15 08:00:36 +13:00 |
|
David Rowe
|
2a338124ae
|
AccountServices API JSDoc
|
2019-02-15 08:00:19 +13:00 |
|
Roxanne Skelly
|
ab1a691dc9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
|
2019-02-14 10:22:07 -08:00 |
|
Thijs Wenker
|
3026fd625a
|
Avatar Doctor
|
2019-02-14 18:52:50 +01:00 |
|
Roxanne Skelly
|
20d7e00ea8
|
Standalone Tags - Checkpoint
|
2019-02-14 08:48:37 -08:00 |
|
SamGondelman
|
13ece79476
|
merge with master
|
2019-02-13 16:30:22 -08:00 |
|
SamGondelman
|
3f8bfc5475
|
CR and fix deadlock
|
2019-02-13 16:19:39 -08:00 |
|
danteruiz
|
562e159ab4
|
the proper fix for browser qml issues
|
2019-02-13 10:45:07 -08:00 |
|
Shannon Romano
|
8a07e2b31a
|
Merge pull request #14895 from ctrlaltdavid/M21132
Case 21132: Add "Avatar Script" classification to relevant JSDoc APIs
|
2019-02-13 10:35:00 -08:00 |
|
Andrew Meadows
|
c79e3e5a6d
|
add some trace contexts for easier debugging
|
2019-02-13 10:02:58 -08:00 |
|
Andrew Meadows
|
152edd477c
|
change trace context to rendering
|
2019-02-13 10:00:51 -08:00 |
|
Shannon Romano
|
07a92aea95
|
Merge pull request #14894 from AndrewMeadows/update-collision-group-after-grab
Case 21093: recompute collision group/mask when Grab ends
|
2019-02-12 17:31:43 -08:00 |
|
danteruiz
|
a111aa1724
|
fix blocks app
|
2019-02-12 16:45:45 -08:00 |
|
Andrew Meadows
|
8bdac589b8
|
use RingBuffer for gradual garbage collection
|
2019-02-12 15:37:09 -08:00 |
|
Brad Davis
|
4dd853ddbc
|
Cleanup from master
|
2019-02-12 15:14:50 -08:00 |
|
Shannon Romano
|
10e5e9e0c3
|
Merge pull request #14900 from MarkBrosche/avatarAppKeyboardFix
Fixed MS21059: Avatar App Keyboard Raise in Desktop
|
2019-02-12 15:02:28 -08:00 |
|
Brad Davis
|
db121957d2
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-12 15:00:03 -08:00 |
|
Andrew Meadows
|
ed8481ead9
|
fix grab bugs
|
2019-02-12 14:04:56 -08:00 |
|
Shannon Romano
|
7e643fcc19
|
Merge pull request #14893 from SimonWalton-HiFi/inventory-confirmation-message
Adjust Inventory's send-to-trash confirm message
|
2019-02-12 14:04:10 -08:00 |
|
luiscuenca
|
954cac907d
|
Other avatars after update and mod timer when active
|
2019-02-12 15:02:56 -07:00 |
|
Dante Ruiz
|
5e9b63b352
|
fix-qml-crash-on-mac
|
2019-02-12 13:56:56 -08:00 |
|
Shannon Romano
|
e8c70cc782
|
Merge pull request #14897 from danteruiz/fix-soft-entity
Case 21142: Wearer and observer disagree on whether a worn item is correctly placed
|
2019-02-12 13:56:47 -08:00 |
|
Roxanne Skelly
|
a82221d2a5
|
Case 21118 - descending sorts don't work in new (qml) marketplace
|
2019-02-12 13:20:47 -08:00 |
|
Andrew Meadows
|
3ea6241cc9
|
send update for AvatarEntity on deleteGrab
|
2019-02-12 12:50:47 -08:00 |
|
Sam Gateau
|
a10cf9b620
|
Merge pull request #14883 from amerhifi/feature/quest
case:21032 Fixing Lifecycle of the android app
|
2019-02-12 12:32:38 -08:00 |
|
danteruiz
|
fdfb9196d3
|
comments explaining horrible code
|
2019-02-12 11:45:08 -08:00 |
|
Brad Davis
|
a6f23f48d6
|
Merge branch 'feature/quest_custom_plugins' into feature/quest
|
2019-02-12 09:53:12 -08:00 |
|
Mark
|
9d81ace243
|
Fixed MS21059: Avatar App Keyboard Raise in Desktop
|
2019-02-12 09:45:51 -08:00 |
|
luiscuenca
|
942e9ccdfd
|
Hand collisions working
|
2019-02-11 18:21:00 -07:00 |
|
danteruiz
|
a7e28f7a66
|
fix spatially nestable parent overwrite
|
2019-02-11 17:04:07 -08:00 |
|
Simon Walton
|
73296aa986
|
Change update rate to 1 Hz
|
2019-02-11 16:59:18 -08:00 |
|
danteruiz
|
50dd865bdc
|
fix spatially nestable parent overwrite
|
2019-02-11 16:48:34 -08:00 |
|
SamGondelman
|
77a8ddb3f0
|
Merge remote-tracking branch 'upstream/master' into materialMapping
|
2019-02-11 16:35:05 -08:00 |
|
Cristian Luis Duarte
|
009f24dda1
|
Android - Make minWidth of message dialog wider so error messages like protocol version error fits in two lines
|
2019-02-11 21:28:31 -03:00 |
|
Andrew Meadows
|
fab3e5e3fd
|
remember hash of AvatarEntityItemData
|
2019-02-11 16:13:56 -08:00 |
|
Brad Davis
|
e534270f9a
|
Merge remote-tracking branch 'upstream/master' into feature/quest_custom_plugins
|
2019-02-11 15:41:32 -08:00 |
|
SamGondelman
|
96f32a9f72
|
fix keyboard focus thing
|
2019-02-11 15:17:32 -08:00 |
|
SamGondelman
|
f53ccf7363
|
fix create, working on mini tablet
|
2019-02-11 14:54:53 -08:00 |
|
Cristian Luis Duarte
|
37b5f11489
|
Merge remote-tracking branch 'origin/master' into connection_failure_dialog
|
2019-02-11 19:53:11 -03:00 |
|
David Rowe
|
5428bb19dc
|
Add "Avatar Script" JSDoc API classification
|
2019-02-12 11:49:49 +13:00 |
|
Simon Walton
|
4f2223ced3
|
Change max update to 10 Hz
|
2019-02-11 14:17:55 -08:00 |
|
Roxanne Skelly
|
4f8de7ed0b
|
Case 21123, Case - marketplace license display has weird crud in it (new qml version)
|
2019-02-11 12:48:04 -08:00 |
|
Roxanne Skelly
|
a0199c5884
|
Case 21119, 21120
Case 21119 - text filter doesn't change as you type in new (qml) marketplace
Case 21120 - text filter doesn't clear in new (qml) marketplace
|
2019-02-11 12:27:02 -08:00 |
|
Simon Walton
|
44c163b7cc
|
Tweak inventory-delete message to be more accurate
|
2019-02-11 10:30:51 -08:00 |
|
SamGondelman
|
d988de4a17
|
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
|
2019-02-11 10:27:12 -08:00 |
|
Brad Hefta-Gaub
|
a23f436a9f
|
Merge pull request #14880 from kencooke/audio-meter-improvements
Case 21091: Improved audio metering
|
2019-02-08 19:08:31 -08:00 |
|
amantley
|
822ec1c529
|
working on the wrist tweak, dampened the spine twist
|
2019-02-08 17:53:23 -08:00 |
|
Roxanne Skelly
|
74f8615fb7
|
Merge pull request #14876 from roxanneskelly/QmlMarketplace
Case 20653: QmlMarketplace - disable links if 3dhtml surfaces are not available
|
2019-02-08 15:04:35 -08:00 |
|
Sabrina Shanman
|
baf72eaae0
|
Merge pull request #14802 from sabrina-shanman/hfm_prep_joints
Case 20887: Move FST joint property handling to the model preparation step
|
2019-02-08 15:02:23 -08:00 |
|
John Conklin II
|
f9b86725fd
|
Merge pull request #14816 from SamGondelman/avatar
Case 20924: Cleaning up Avatar findRayIntersection
|
2019-02-08 14:40:45 -08:00 |
|
Roxanne Skelly
|
93665fa501
|
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
|
2019-02-08 14:21:29 -08:00 |
|
Dante Ruiz
|
3a263dfff5
|
Merge pull request #14877 from danteruiz/remove-missed-webengine-references
Case 21079: move missed QtWebEngine references to +webengine directory
|
2019-02-08 14:17:34 -08:00 |
|
amerhifi
|
e8a35c63c7
|
moved asset loading to the permissions screen, added the onNotifyAppLoaded signal connect function as well as binding to the qtread with the ui thread.
|
2019-02-08 13:45:53 -08:00 |
|
Anthony Thibault
|
d012d07519
|
Merge pull request #14865 from hyperlogic/feature/anim-optimizations
Animation System Optimizations
|
2019-02-08 12:44:10 -08:00 |
|