Thijs Wenker
0ac8c178db
fix spacing
2019-12-20 12:43:43 +01:00
Kasen IO
c34cd996df
change Metaverse API from setting
2019-12-20 11:39:05 +01:00
David Rowe
8255a50cde
Update MeshProxy and Entities.getMeshes() JSDoc
2019-12-20 13:34:21 +13:00
David Rowe
1ebc6a575e
Model API JSDoc
2019-12-20 13:33:48 +13:00
Fluffy Jenkins
83e9b891d8
Workaround for Secondary camera crash
2019-12-19 23:31:10 +00:00
David Rowe
a04e57d82d
Miscellaneous JSDoc fixes noticed in passing
2019-12-19 11:38:17 +13:00
David Rowe
ccc4be5312
Revise extended avatar blend shapes JSDoc
2019-12-18 12:54:56 +13:00
David Rowe
aa077684f5
Update Controller.Hardware.Keyboard JSDoc per new touchpad gestures
2019-12-18 12:20:05 +13:00
David Rowe
427aa851b3
Fix up links to avatar standards guide
2019-12-18 09:51:34 +13:00
David Rowe
34958ddb71
Address some JSDoc issues identified by makitsune
2019-12-18 08:01:20 +13:00
David Rowe
7cf216f114
Add warning about EventBridge not immediately availble in TabletProxy
2019-12-18 07:15:34 +13:00
David Rowe
5256f58520
Document callback function signatures for Script.addEventHandler()
2019-12-17 16:17:45 +13:00
Brad Hefta-Gaub
bdce8134fc
Merge pull request #16509 from makitsune/domain-server-ports
...
Added environment variables to change domain server ports
2019-12-16 15:15:49 -08:00
David Rowe
3aaeba76a9
Fix typos in WebSocket JSDoc
2019-12-17 09:20:18 +13:00
David Rowe
025c136561
XMLHttpRequest API JSDoc
2019-12-17 09:19:47 +13:00
Brad Hefta-Gaub
bec28e7e05
Merge pull request #16574 from ctrlaltdavid/DOC-242
...
DOC-242: WebSocket and WebSocketServer JSDoc
2019-12-15 09:25:47 -08:00
David Rowe
ea72036757
Typos
2019-12-14 12:36:36 +13:00
David Rowe
5359efead8
Add JSDoc missing for callback parameter
2019-12-14 12:33:51 +13:00
David Rowe
13abf7f016
WebSocket and WebSocketServer JSDoc
2019-12-14 11:59:18 +13:00
Brad Hefta-Gaub
bb68f92d3e
Merge pull request #16562 from ctrlaltdavid/DEV-2442
...
DEV-2442: Fix main gamepad (XBox controller) controls
2019-12-13 13:36:20 -08:00
Brad Hefta-Gaub
fb70569fc2
Merge pull request #16548 from HifiExperiments/visible
...
Case 17368: Fix wearables not disappearing with avatar
2019-12-13 13:20:15 -08:00
Brad Hefta-Gaub
1609e59c42
Merge pull request #16546 from HifiExperiments/cullFace
...
Material Entities can specify face culling method, support GLTF doubleSided property
2019-12-13 13:16:01 -08:00
Brad Hefta-Gaub
f8a9789f86
Merge pull request #16499 from HifiExperiments/proceduralMesh
...
Procedural vertex shaders
2019-12-13 13:00:01 -08:00
Brad Hefta-Gaub
2d56d7c026
Merge pull request #16551 from ctrlaltdavid/DEV-1943
...
DEV-1943: Make MyAvatar.getAvatarEntityData() return all properties
2019-12-13 10:53:24 -08:00
Brad Hefta-Gaub
4c9129268d
Merge pull request #16571 from ctrlaltdavid/DOC-243
...
DOC-243: EntityScriptServerLog JSDoc
2019-12-13 10:43:45 -08:00
Kasen IO
1f01beba70
Fixed patch issues
2019-12-13 12:29:08 -05:00
Kasen IO
9839b23061
Made Sam's graphics patches work with 86 K2.
2019-12-13 02:38:14 -05:00
HifiExperiments
0bd5e15b47
fix non-procedural material entity crash
...
Signed-off-by: Kasen IO <kasenvr@gmail.com>
2019-12-13 02:17:52 -05:00
Maki
a7851c9205
Fixed type conversions for environmental domain ports
...
Signed-off-by: Kasen IO <kasenvr@gmail.com>
2019-12-12 23:09:18 -05:00
Maki
1ef45b703c
Added environment variables to change domain server ports
...
Signed-off-by: Kasen IO <kasenvr@gmail.com>
2019-12-12 23:09:18 -05:00
HifiExperiments
204c7a7391
fix shadows!!
2019-12-12 23:04:55 -05:00
HifiExperiments
6156495345
stupid, shadows still broken
2019-12-12 23:04:47 -05:00
SamGondelman
1736252f0d
trying and failing to fix models
2019-12-12 23:04:47 -05:00
SamGondelman
398562321d
fix wearables not disappearing with avatar
2019-12-12 23:02:57 -05:00
HifiExperiments
e0a29d9367
material entities support cullFaceMode and support gltf doubleSided
2019-12-12 23:01:57 -05:00
HifiExperiments
59c67e5590
put back stepping in translucent case
2019-12-12 23:01:57 -05:00
HifiExperiments
3fe395ca32
properly implement alphaModes
2019-12-12 23:01:57 -05:00
HifiExperiments
b66fa1d57a
put back stepping in translucent case
2019-12-12 22:58:36 -05:00
HifiExperiments
d54ca43554
properly implement alphaModes
2019-12-12 22:58:36 -05:00
HifiExperiments
6e961b9f2f
procedural vertex shaders
...
Signed-off-by: Kasen IO <kasenvr@gmail.com>
2019-12-12 22:49:48 -05:00
David Rowe
3232f89a33
OverlayWindow and OverlayWebWindow JSDoc
2019-12-13 10:13:10 +13:00
HifiExperiments
5fc55d1763
Merge branch 'master' into cullFace
2019-12-11 00:49:58 -08:00
HifiExperiments
2eb0ec18fc
fix non-procedural material entity crash
2019-12-11 00:42:59 -08:00
David Rowe
65bba26dfb
EntityScriptServerLog API
2019-12-11 19:22:28 +13:00
af4c0ea0d1
Removes the environment variable requirement for procedural material shaders.
...
Signed-off-by: Marcus Llewellyn <marcus.llewellyn@gmail.com>
2019-12-10 16:52:19 -06:00
David Rowe
bbd16d7544
Fix global print function's JSDoc
2019-12-11 07:42:58 +13:00
David Rowe
5caa21e5d9
Update Script JSDoc accordingly
2019-12-11 07:42:40 +13:00
David Rowe
7d2e818ab1
console JSDoc
2019-12-11 07:41:37 +13:00
jennaingersoll
6312a7cdd8
Merge pull request #16563 from ctrlaltdavid/DOC-198
...
DOC-198: OffscreenFlags JSDoc
2019-12-09 16:01:49 -08:00
jennaingersoll
6f44373141
Merge pull request #16556 from ctrlaltdavid/DOC-235
...
DOC-235: DriveKeys JSDoc
2019-12-09 15:58:31 -08:00
David Rowe
deb60f66d0
Update API status
2019-12-10 09:20:12 +13:00
David Rowe
b7af7fe1ab
OffscreenFlags JSDoc
2019-12-10 09:14:59 +13:00
David Rowe
204215c573
Typo
2019-12-10 07:49:37 +13:00
David Rowe
3a48a97a90
AddressManager JSDoc
2019-12-10 07:34:17 +13:00
Kasen IO
3e6660b633
Updated whitelist debugs for clarity in dev log
2019-12-09 08:30:02 -05:00
Kasen IO
2de388ab3b
Fixes bug where empty "" whitespace allows all scripts.
2019-12-09 01:20:04 -05:00
Kasen IO
fe66dc82f3
scriptengine pulls from inferface.json correctly, removed extra debug, fixed QML to load to textarea correctly.
2019-12-08 23:11:21 -05:00
Kasen IO
f49e64b99f
Cleaned out extra commented code.
2019-12-08 21:12:20 -05:00
Kasen IO
2e36c40912
added QML + C++ system for whitelists
2019-12-07 21:37:23 -05:00
David Rowe
4d4e9d32de
Update JSDoc
2019-12-08 12:38:48 +13:00
David Rowe
064e97aa4c
Fix misc. JSDoc typo
2019-12-06 21:27:50 +13:00
Zach Fox
04fe2988f5
Working
2019-12-05 18:50:31 -08:00
Zach Fox
c96c684400
Initial path to fixing screenshare auth race condition
2019-12-05 15:47:43 -08:00
HifiExperiments
400b771a1a
fix shadows!!
2019-12-05 01:41:56 -08:00
Howard Stearns
11aa2e829f
Merge pull request #16540 from SimonWalton-HiFi/screenshare-zone
...
DEV-2700: Add screenshare property to zones and evaluate in avatar mixer
2019-12-02 10:17:42 -08:00
Kasen IO
edfce861a8
Merge branch 'kasen/core' into v0860-kasen-release+freshstart
2019-12-01 22:56:19 -05:00
Kasen IO
07d706d681
Removed all hardcoded whitelist rules
2019-12-01 22:55:51 -05:00
Kasen IO
0b46c53df1
Merge branch 'kasen/core' into v0860-kasen-release+freshstart
2019-12-01 19:59:59 -05:00
David Rowe
c7f82a8264
Add new MyAvatar.getAvatarEntityData() implementation for API
2019-11-28 17:10:19 +13:00
David Rowe
9144e78cb9
Rename current getAvatarEntityData() method and use internally
2019-11-28 16:30:26 +13:00
Amer
710185b517
Merge pull request #16550 from amerhifi/initInput
...
DEV-2729: Airpods starve on startup
2019-11-27 17:23:56 -08:00
David Rowe
845d388cbf
Fix AvatarEntityMap string values to be primitives, not objects
2019-11-28 13:56:33 +13:00
Amer
2602e5ddc6
Merge pull request #16542 from amerhifi/localinjectorwait
...
dev-829: waiting on local injector prep
2019-11-27 16:23:32 -08:00
amerhifi
e02725e418
input init to dummy to prevent starve and airpods thread lock
2019-11-27 15:30:47 -08:00
HifiExperiments
413bf10f79
stupid, shadows still broken
2019-11-26 22:28:06 -08:00
HifiExperiments
3dfd63d46b
merge with master
2019-11-26 20:42:44 -08:00
amer cerkic
168e85b26a
addressing comment
2019-11-26 15:27:40 -08:00
HifiExperiments
69714a89ca
material entities support cullFaceMode and support gltf doubleSided
2019-11-26 14:48:48 -08:00
amer cerkic
0de812b7b5
waiting on local injector prep
2019-11-26 11:41:41 -08:00
David Rowe
c998148589
Revise recent changes to Entities.Material JSDoc
2019-11-26 17:43:41 +13:00
David Rowe
fafb3dd30b
MaterialCache JSDoc
2019-11-26 17:43:23 +13:00
David Rowe
5eb6e9dadd
Add recently added properties to caches' JSDoc
2019-11-26 17:00:13 +13:00
Simon Walton
6b371ec388
Changes to avatar mixer to use screenshare zones
2019-11-25 18:30:53 -08:00
HifiExperiments
b4c9a3e73d
Merge remote-tracking branch 'origin/alphaModes' into cullFace
2019-11-25 14:23:50 -08:00
luiscuenca
d301378210
Merge branch 'master' into fixWheelPitch
2019-11-25 14:48:13 -07:00
Simon Walton
6e23924ed9
Add screenshare zone-property - WIP
2019-11-25 13:22:35 -08:00
luiscuenca
69a063a700
Better mouse wheel detection and attenuated touchpad X axis
2019-11-25 10:19:54 -07:00
HifiExperiments
f55c4b8b12
put back stepping in translucent case
2019-11-24 12:44:42 -08:00
Anthony Thibault
edfad97b64
Merge pull request #16517 from hyperlogic/feature/facecap-osc-plugin
...
Input plugin for streaming blendshapes from an iPhone
2019-11-23 11:49:51 -08:00
luiscuenca
2f887228cf
Fix camera pitch by mouse pitch
2019-11-22 14:51:37 -07:00
Seth Alves
ea2c6b4dfb
fix linux build
2019-11-22 11:35:23 -08:00
Shannon Romano
d76dfbe83b
Merge pull request #16525 from amerhifi/master
...
DEV-2871: signal connection check before emit of devices changed
2019-11-22 08:22:24 -08:00
HifiExperiments
5371fd613a
properly implement alphaModes
2019-11-22 00:41:32 -08:00
Bradley Austin Davis
cf09e9f45e
Merge pull request #16526 from sabrina-shanman/crash_updateMeshPart
...
Call updateGeometry before Model::createRenderItemSet
2019-11-21 20:13:58 -08:00
Anthony J. Thibault
404d1a3c93
Fix several bugs for eye tracking from input plugins to function
2019-11-21 17:57:44 -08:00
sabrina-shanman
79d470c70e
Call updateGeometry before Model::createRenderItemSet to ensure well-defined state
2019-11-21 16:12:49 -08:00
amer cerkic
87afa636a2
typo
2019-11-21 15:52:56 -08:00
amer cerkic
4f009d884f
signal connection check before emit of devices changed
2019-11-21 15:46:11 -08:00
Howard Stearns
854d84912e
Merge pull request #16511 from howard-stearns/fix-lookupurl-helper-regex
...
fix handleUrl helper regex
2019-11-21 11:38:47 -08:00
Anthony J. Thibault
9d6ce44131
Head is now computed in proper sensor space
...
Eye tracking now works.
2019-11-20 15:30:16 -08:00
Maki
96a09a894a
Fixed type conversions for environmental domain ports
2019-11-20 09:13:08 +00:00
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
Maia Hansen
6169936c2b
Merge pull request #16512 from AndrewMeadows/time-moves-forward
...
DEV-2585: fix for whiteboard poly lines getting their parentID incorrectly reverted
2019-11-19 12:34:53 -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
Maia Hansen
48cdbcf933
Merge pull request #16401 from jherico/github_actions
...
DEV-2773: GitHub actions initial work
2019-11-19 11:46:52 -08:00
luiscuenca
45aca5115d
Add missing comment
2019-11-19 12:20:54 -07:00
jennaingersoll
451ffcd1e0
Merge pull request #16492 from jennaingersoll/jsdoc-revisions
...
DOC-208: Revisions to JSDoc added by developers since July 2019
2019-11-19 11:01:18 -08:00
Howard Stearns
2cc39a2f32
fix handleUrl helper regex
2019-11-19 10:51:20 -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
Andrew Meadows
0bccc38906
remove one call to usecTimestampNow()
2019-11-19 08:52:14 -08:00
Andrew Meadows
3b8275c240
_lastEdited can only increase or be reset
2019-11-19 08:44:33 -08:00
Andrew Meadows
08263b2672
add helpful comment about mysterious code
2019-11-19 08:42:28 -08:00
Maki
cd5ea20cca
Added environment variables to change domain server ports
2019-11-19 12:35:06 +00:00
ingerjm0
d2118f0aac
DOC-208 revisions
2019-11-18 20:05:08 -08:00
Brad Davis
d4b3a9ba49
Github actions
2019-11-18 15:20:37 -08:00
luiscuenca
f1a9f52ee1
Set pinch to unzoom
2019-11-18 15:59:45 -07:00
Sabrina Shanman
518d6a530a
Merge pull request #16507 from highfidelity/master
...
Merge master into instancing
2019-11-18 13:54:33 -08:00
luiscuenca
e06e1bb377
Fix wheel touch interference with mac camera orbit
2019-11-18 14:49:35 -07:00
David Rowe
adaa061690
Replace "AvatarIsland" with "DomainName" in AddressManager JSDoc
2019-11-19 10:32:38 +13:00
Shannon Romano
f112ca4890
Merge pull request #16495 from ctrlaltdavid/DOC-209
...
DOC-209: AudioStats JSDoc
2019-11-18 11:16:40 -08:00
Sam Gateau
048626ba9a
Merge pull request #15278 from kitely/clear-more-disk-caches
...
case 21983: Clear more disk caches
2019-11-18 11:11:26 -08:00
Sam Gateau
6370059a96
Merge pull request #16483 from AndrewMeadows/debug-workload-selection
...
Add tools for debugging entity workload proxies
2019-11-18 11:02:00 -08:00
luiscuenca
1338cbd943
Fix touch event timeout on mac and allow camera orbit using the touchpad on windows
2019-11-18 11:38:12 -07:00
dante ruiz
cd6f9a774d
implement gesture pinch to camera zoom
2019-11-18 11:33:31 -07:00
Shannon Romano
8d0a022f32
Merge pull request #16500 from hyperlogic/bug-fix/whoops
...
Fix for inadvertent comment
2019-11-15 15:36:51 -08:00
Zach Fox
b64ce343bd
Merge pull request #16429 from MiladNazeri/screenshareElectronApp
...
Screenshare in Interface!
2019-11-15 15:32:51 -08:00
Anthony J. Thibault
217e17b4ac
Fix for inadvertant comment
...
This was likely breaking the avatar override feature.
2019-11-15 11:19:10 -08:00
Shannon Romano
3c271aa27a
Merge pull request #16490 from ctrlaltdavid/DEV-2742
...
DEV-2742: Fix Graphics.exportModelToOBJ() JavaScript crash
2019-11-15 09:02:08 -08:00
HifiExperiments
b73a608094
procedural vertex shaders
2019-11-15 00:22:40 -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
Andrew Meadows
ec872bfcf8
remove unused variable
2019-11-14 09:59:43 -08:00
Andrew Meadows
9dd0105ba5
only one copy of entityIDs instead of two
2019-11-14 09:59:43 -08:00
Andrew Meadows
dbeea4038d
remove unused argument
2019-11-14 09:59:43 -08:00
Andrew Meadows
b5ca93a019
remove redundant checks in 'if' clause
2019-11-14 09:59:43 -08:00
Andrew Meadows
b231dadba5
add check for local-entity when changing phys properties
2019-11-14 09:59:43 -08:00
Andrew Meadows
28f51f6204
add comments
2019-11-14 09:59:43 -08:00
Andrew Meadows
de44cdaf25
remove unnecessary check in if clause
2019-11-14 09:59:43 -08:00
Andrew Meadows
0f2d9027e1
fix indentation
2019-11-14 09:59:43 -08:00
Andrew Meadows
039f7cae13
avoid Qt container in another spot
2019-11-14 09:59:43 -08:00
Andrew Meadows
3546bab19a
use std::vector<> instead of QVector<>
2019-11-14 09:59:43 -08:00
Andrew Meadows
fb090d1388
force delete OtherAvatar entities when necessary
2019-11-14 09:59:43 -08:00
Andrew Meadows
4159bc4862
abide by domain-entity hierarchy deletion rules
2019-11-14 09:59:43 -08:00
Andrew Meadows
4e6a647718
don't restrict edit properties of myAvatarEntity
2019-11-14 09:59:43 -08:00
Andrew Meadows
9d92546a8b
revert the revert of PR-16307
2019-11-14 09:59:43 -08:00
David Rowe
ef45a6092f
Polishing
2019-11-14 16:07:00 +13:00
David Rowe
c44c7dd85e
AudioStats JSDoc
2019-11-14 15:57:51 +13:00
DouglasWilcox
b8e85aedc7
Merge branch 'master' into improve_seated_rotation
2019-11-13 13:11:30 -08:00
Sabrina Shanman
579eb04df9
Merge pull request #16491 from sabrina-shanman/instancing
...
Fix code style / remove cruft
2019-11-13 12:53:10 -08:00
sabrina-shanman
516debdcb2
Fix code style / remove cruft
2019-11-13 12:50:13 -08:00
David Rowe
1145bc8904
Fix Graphics.exportModelToOBJ() JavaScript crash
2019-11-14 08:43:51 +13:00
milad
abf592f533
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-13 10:14:14 -08:00
Zach Fox
8aea0dd951
Merge in Howard's 'screenshare presence' open PR
2019-11-13 10:11:16 -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
Brad Hefta-Gaub
1f2deed941
Merge pull request #16477 from samcake/zorro
...
DEV-2711: Fix crash when highlighting custom pipeline shapes
2019-11-13 09:50:16 -08:00
ingerjm0
417856fec4
JSDoc updates for PR16399
2019-11-12 20:45:20 -08:00
amerhifi
3939c7e6fd
adding qaudio reset on switch.
2019-11-12 17:07:43 -08:00
Anthony Thibault
7736582f3b
Merge pull request #16486 from DouglasWilcox/HMD_strafe_transition_bug
...
Fix HMD strafe locomotion animation.
2019-11-12 15:49:15 -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
Sabrina Shanman
5f99c36bb1
Merge pull request #16484 from sabrina-shanman/instancing_oven
...
(DEV-2593) Instancing: Fix model baking to work with new hfm::Shape material definition
2019-11-12 11:40:40 -08:00
DouglasWilcox
995f5f92cd
Do not use turningSpeed when setting seatedTurn vars, and iterate acceleration formula
2019-11-12 11:11:19 -08:00
Andrew Meadows
cf08a4162a
add workload job to help debug entity proxies
2019-11-12 10:35:16 -08:00
Sabrina Shanman
769a332d22
Merge pull request #16485 from highfidelity/master
...
Merge master into instancing
2019-11-12 10:07:28 -08:00
sabrina-shanman
f39121c53b
Fix build error/warning
2019-11-12 09:52:58 -08:00
sabrina-shanman
2169952613
Remove unused mesh.part.materialID
2019-11-11 17:52:16 -08:00
sabrina-shanman
9a65d78cdf
Fix model baking to work with new hfm::Shape material definition (1
...
material per mesh part)
2019-11-11 17:52:00 -08:00
Kalila R
7c1b9e79ae
Setting ModelBaker.cpp back to main.
2019-11-11 20:28:16 -05:00
Kalila R
fd7ac223b0
activitylogger still disabled but does not output to console
2019-11-11 20:08:03 -05:00
amer cerkic
35065cf4d8
Merge branch 'master' of https://github.com/highfidelity/hifi
2019-11-11 16:15:41 -08:00
Shannon Romano
5f2f647dfb
Merge pull request #16480 from kencooke/audio-hrtf-attn-improved
...
DEV-2330: Improved attenuation zones
2019-11-11 13:17:36 -08:00
DouglasWilcox
64634f51b1
Merge branch 'master' into improve_seated_rotation
2019-11-11 11:31:56 -08:00
DouglasWilcox
c36c4a17b1
first pass hookup of seated rotation with acceleration and animation response
2019-11-11 11:31:34 -08:00
amer cerkic
3a764169ba
adding new device to list if default not found
2019-11-11 11:13:44 -08:00
amer cerkic
549e181be0
adding safeguard in case device list is empty
2019-11-11 11:00:33 -08:00
Ken Cooke
ddd11305de
Improved HRTF algorithm to expose parametric occlusion/lowpass effect
2019-11-09 09:57:16 -08:00
sabrina-shanman
b7da5d0d72
Update Model::calculateTriangleSets to use hfm::Shapes
2019-11-08 13:56:49 -08:00
dooglifeSF
055d5cdf9b
Simplify boolean statements, revise several settle anims
2019-11-08 13:46:38 -08:00
Sam Gateau
8175b9486f
Fix crash when highlighting custom pipeline shapes
2019-11-08 11:18:02 -08:00
Sabrina Shanman
eebb9ad51f
Merge pull request #16475 from highfidelity/master
...
Merge master into instancing
2019-11-08 10:10:50 -08:00
sabrina-shanman
a42e09aef8
Fix unused variables/implicit type conversions
2019-11-08 10:04:34 -08:00
Sam Gateau
269289412e
Same fix for highlight effects
2019-11-08 09:11:58 -08:00
Sam Gateau
5682e8ee2f
Fixing bug with custom pipeline and deformed shape renderItems in shadow pass
2019-11-07 15:16:11 -08:00
dooglifeSF
8e11d91c03
Merge branch 'master' into rand_settles_and_by_momentum
2019-11-07 15:09:10 -08:00
Maia Hansen
7855747386
Merge pull request #16470 from samcake/zorro
...
Procedural Material crashes in shadow pass on deformed shape renderItems
2019-11-07 15:00:06 -08:00
Sam Gateau
86b62f921d
Now that avatars can potentially have their own custom pipeline, shadow pass needs to support it
2019-11-07 14:01:50 -08:00
Shannon Romano
176b463f16
Merge pull request #16458 from hyperlogic/bug-fix/anim-blend-directional-assert
...
Fix for assert in AnimBlendDirectional on startup
2019-11-07 13:11:11 -08:00
dooglifeSF
73202b9caf
Different settle transition depending on momentum
2019-11-07 09:52:26 -08:00
Shannon Romano
d30f30191f
Merge pull request #16457 from jennaingersoll/doc-193
...
DOC-193 Clarified legacy vs current camera modes
2019-11-06 10:59:32 -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
sabrina-shanman
33bb0e2b19
Change RenderableModelEntityItem::computeShapeInfo to support new HFM format
2019-11-05 14:44:23 -08:00
Anthony J. Thibault
6e7f222608
Fix for assert in AnimBlendDirectional on startup
...
Specifically, std::vector subscript out of range.
2019-11-05 14:16:10 -08:00
ingerjm0
499a0a8067
Clean up code per review
2019-11-05 14:14:46 -08:00
ingerjm0
faa4c97f8a
Revisions per review
2019-11-05 14:04:01 -08:00
amerhifi
bc41087ea9
removing lock from WASAPI initialization
2019-11-05 12:50:59 -08:00
ingerjm0
27d4bfdd01
DOC-193 #comment Documented legacy vs current camera modes, along with code samples to re-enable legacy code
2019-11-05 12:20:51 -08:00
sabrina-shanman
88b6472ced
Fix build warning
2019-11-05 10:57:55 -08:00
sabrina-shanman
da5f80c139
Use std::vector types in ShapeInfo
2019-11-05 10:57:55 -08:00
Sam Gateau
7af0940846
getting coision to work
2019-11-05 10:57:54 -08:00
sabrina-shanman
27643023a3
Make shape extent calculations use slim mesh extents, and rename task to CalculateTransformedExtentsTask
2019-11-05 10:57:54 -08:00
sabrina-shanman
c3af8b5da7
Remove unused cluster fields from hfm
2019-11-05 10:57:54 -08:00
sabrina-shanman
ba257634f2
Introduce extents for TriangleListMesh and calculate them
2019-11-05 10:57:54 -08:00
sabrina-shanman
67e05a70d4
Fix build error with _drawTransform
2019-11-05 10:56:29 -08:00
sabrina-shanman
7b14c00540
Merge branch 'master' into instancing
2019-11-05 10:22:24 -08:00
amerhifi
343807a9f5
Merge branch 'master' of https://github.com/highfidelity/hifi
2019-11-05 10:17:04 -08:00
amer cerkic
b2ab33116f
removing double calls to switch devices, handling default changes from scripting interface instead
2019-11-04 15:03:53 -08:00
Brad Hefta-Gaub
f5873e6f76
Merge pull request #16446 from samcake/zorro
...
Renaming the env variable to enable Material Procedural Shaders
2019-11-04 14:32:54 -08:00
Zach Fox
c39dbc600d
Merge pull request #16441 from zfox23/enableHashMapSignalsForESS
...
Implement DEV-2654: Allow ESS to make use of signals like `avatarRemovedEvent`
2019-11-04 11:59:15 -08:00
Sam Gateau
a4696992e8
Renaming the env variable to enable Material Proecural Shaders
2019-11-04 11:15:37 -08:00
Anthony J. Thibault
821a46697a
Update fixUpLegacyBlendshapes as well
2019-11-04 10:55:05 -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
HifiExperiments
bae2ba7bae
merge with master
2019-11-02 01:08:56 -07:00
HifiExperiments
6e5217b80d
fix build error, add environment variable
2019-11-02 01:03:34 -07:00
Zach Fox
8d07d401c3
Add a line of JSDoc
2019-11-01 14:45:07 -07:00
RebeccaStankus
b50fb47a95
Merge pull request #16438 from RebeccaStankus/macWindowSize
...
Changed default interface window size on mac
2019-11-01 13:40:18 -07:00
Rebecca Stankus
3f19bbfcac
Changed variable to not be magic number
2019-11-01 11:46:01 -07:00
Rebecca Stankus
e5fcc577f0
Changed default interface window size on mac
2019-11-01 10:47:12 -07:00
Shannon Romano
295c37aea9
Merge pull request #16434 from kencooke/audio-webrtc-warning-spam
...
DEV-2619: WebRTC spamming logs
2019-11-01 10:22:35 -07:00
Ken Cooke
3cdf25f2bc
Fix compiler warning (unused variable in Release build)
2019-11-01 07:36:35 -07:00
Sabrina Shanman
05ac16536e
Merge pull request #16436 from highfidelity/master
...
Merge master into instancing
2019-10-31 17:39:15 -07:00
Ken Cooke
30564a67ef
Only log a single "AEC not supported" warning per audio device configuration
2019-10-31 14:50:52 -07:00
sabrina-shanman
6666df6137
Fix build warnings/errors
2019-10-31 14:49:28 -07:00
sabrina-shanman
297ce9d88b
Remove debug
2019-10-31 13:47:00 -07:00
sabrina-shanman
023d73a25d
Finish TriangleListMesh generation, rename some things
2019-10-31 13:47:00 -07:00
sabrina-shanman
7d37a064f2
Fix crash
2019-10-31 13:46:53 -07:00
Sam Gateau
e9ce467eb9
Crahs because of ?
2019-10-31 13:04:11 -07:00
Sam Gateau
465e8c3e18
Prototyping the slim mesh generation
2019-10-31 12:58:15 -07:00
Sam Gateau
24e6a966a8
Keep exploring
2019-10-31 12:58:08 -07:00
Sam Gateau
927e08acdb
Explore the simple mesh pure pos triangle list idea
2019-10-31 12:57: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
amer cerkic
4b4b722875
fixed issues related to context switching and selection with hmd
2019-10-30 16:27:19 -07:00
sabrina-shanman
4ecd25c8bb
Add TODO for joint.geometricOffset
2019-10-30 14:32:36 -07:00
sabrina-shanman
ecdca05679
Do not apply geometric offset to loaded FBX. Proper fix TBD
2019-10-30 14:28:55 -07:00
sabrina-shanman
9b41fa20c6
Clean up hfm joint geometric offset definition
2019-10-30 14:08:02 -07:00
Shannon Romano
faa192a337
Merge pull request #16338 from ctrlaltdavid/DOC-126
...
DOC-126: Toolbars JSDoc
2019-10-30 13:46:16 -07:00
Shannon Romano
161de1478b
Merge pull request #16335 from ctrlaltdavid/DOC-191
...
DOC-191: Recording JSDoc
2019-10-30 13:46:04 -07:00
sabrina-shanman
0d1bd6afbf
Fix wrong transformForCluster for non-root joints with Z up axis
2019-10-30 13:32:30 -07:00
sabrina-shanman
296cd4a47b
Rename globalTransformForCluster(s) -> transformForCluster(s)
2019-10-30 12:05:50 -07:00
sabrina-shanman
c8bf1ddfea
Only recalculate globalTransformForCluster if needed
2019-10-30 12:01:25 -07:00
sabrina-shanman
61825f2e06
Remove joint.transform self-assignment
2019-10-30 11:50:10 -07:00
sabrina-shanman
ff908a36d6
Define separately globalTransformForCluster and localTransformForCluster for clarity
2019-10-30 11:49:28 -07:00
Shannon Romano
9948a181dc
Merge pull request #16392 from kitely/load-avatar-entities-after-skeleton
...
In Bookmarks, attach avatar entities after the skeleton is loaded
2019-10-30 09:29:51 -07:00
sabrina-shanman
6f5c9924c0
Merge branch 'instancing' into instancing_serializers_conservative
2019-10-30 09:17:09 -07:00
Sabrina Shanman
e8b963b59a
Merge pull request #16425 from highfidelity/master
...
Merge master into instancing
2019-10-30 09:16:04 -07:00
sabrina-shanman
fe1fe6aa83
Fix build warnings
2019-10-30 09:09:17 -07:00
sabrina-shanman
3c078eeef6
It makes more sense for joint.globalTransform to have the hfmModel.offset applied
2019-10-29 17:37:26 -07:00
sabrina-shanman
28e3fd4bc4
Refactor joint transform definition
2019-10-29 17:37:25 -07:00
sabrina-shanman
27b30a9646
Move hfm debug dump to hfm::Model
2019-10-29 16:49:55 -07:00
Brad Hefta-Gaub
206e519b5e
Merge pull request #16390 from kitely/fix-walk-speed
...
Fixed the sprint speeds of Desktop vs HMD
2019-10-29 13:04:45 -07:00
Anthony Thibault
4341da03c5
Merge pull request #16419 from luiscuenca/lookAtFixes
...
DEV-2285: Fix look at update and allow to release control
2019-10-29 12:56:22 -07:00