Commit graph

28713 commits

Author SHA1 Message Date
Howard Stearns
416cde4c1f fix uses of updated_item_id that got lost 2019-03-06 11:36:08 -08:00
Howard Stearns
f5afc2033f work through stocking vs update issues, and cleanup 2019-03-06 11:35:36 -08:00
Thijs Wenker
a84a43320c added spacing between lines 2019-03-06 19:15:01 +01:00
luiscuenca
dfb434ea09 Fix warning and refactoring 2019-03-06 09:25:49 -07:00
Thijs Wenker
59200103af Not for sale explanation 2019-03-06 07:06:48 +01:00
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
Shannon Romano
45099a5db6
Merge pull request #15076 from SamGondelman/laserWidth
Case 21514: Lasers scale with avatar
2019-03-04 11:26:08 -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
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