amantley
36093926d0
added fake android defines for running the new ik on pc
2019-02-15 15:00:39 -08:00
Andrew Meadows
7446fa9e7e
allow mesh shapes to use MOTION_TYPE_KINEMATIC
2019-02-15 15:00:09 -08:00
sabrina-shanman
bb123cfe3b
Fix GLTF materials
2019-02-15 14:51:29 -08:00
SamGondelman
3df231f1e0
it's working!
2019-02-15 14:43:22 -08:00
Brad Davis
51884155ee
Support Android app-specific extensions in shaders
2019-02-15 14:16:58 -08:00
Brad Davis
78be935e1a
Consolidating differences from master
2019-02-15 14:12:37 -08:00
amantley
3f9b761e42
updating the android only if defs
2019-02-15 14:05:42 -08:00
Andrew Meadows
7872da6b97
Merge pull request #14915 from samcake/brown
...
Case 21190: Introducing msaa to forward renderer
2019-02-15 13:48:33 -08:00
SamGondelman
c92b82e744
merge with master
2019-02-15 12:43:30 -08:00
SamGondelman
87ab255115
finish moving materials to rendering
2019-02-15 11:49:20 -08:00
Sam Gateau
6edf7e7907
Merge pull request #14931 from jherico/fix/vive_crash
...
Case 21230: Fix crash in vive and interleaved stereo plugins
2019-02-15 11:41:03 -08:00
Brad Davis
a5f84ab51a
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-02-15 11:37:13 -08:00
luiscuenca
b670f72e84
fix warning on linux
2019-02-15 12:35:17 -07:00
John Conklin II
5f0db88a20
Merge pull request #14914 from raveenajain/gltf_tangents
...
Case 21165: tangent attribute
2019-02-15 11:24:21 -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
amantley
7119bc5972
reverted the scale optimization in animspline.cpp
2019-02-15 10:54:02 -08:00
Brad Davis
5483971855
Fix crash in vive and interleaved stereo plugins
2019-02-15 10:46:08 -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
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
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
07af2c525e
tweaked ulnar radial limit and extend limit
2019-02-15 07:31:28 -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
Angus Antley
f8554d10a8
starting cleanup
2019-02-14 23:45:45 -08:00
Sam Gateau
13b5390243
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2019-02-14 21:01:44 -08:00
amantley
40196dcb40
wrist action works in rig now
2019-02-14 18:17:31 -08:00
amantley
5c26bbec5c
moving the theta calculation to rig
2019-02-14 18:06:20 -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
Sam Gateau
34db48d3a3
Merging and resolving conflict
2019-02-14 17:03:44 -08: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
amer cerkic
72200618d9
cleanup of my debugging items
2019-02-14 16:38:15 -08:00
amer cerkic
7037e14d09
merging from upstream
2019-02-14 16:31:04 -08:00
Anthony Thibault
39b4eaac34
Revert "AnimPose operator* optimizations"
...
This reverts commit 569bef50fd
2019-02-14 16:13:00 -08:00
Anthony Thibault
f0e163b4df
Revert "AnimPose::inverse() optimization"
...
This reverts commit 5c7e81584c
2019-02-14 16:10:26 -08:00
Sam Gateau
fc1d3df613
Merge branch 'brown' of github.com:samcake/hifi into brown
2019-02-14 15:44:26 -08:00
Sam Gateau
522a9ed7c1
Keeping only the minimum for quest
2019-02-14 15:43:36 -08:00
Sam Gateau
98a5ec84a9
Adjusting the HUD operator render job to shave an extra framebuffer
2019-02-14 15:35:02 -08:00
amer cerkic
8d522d9ce7
fixed issues with pause/resume and start/stop. still issues with input after resume
2019-02-14 14:48:56 -08:00
raveenajain
01def37efd
spacing
2019-02-14 14:22:43 -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
raveenajain
e825be566d
Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_tangents
2019-02-14 11:45:53 -08:00
SamGondelman
dd0d7f0118
merge with master
2019-02-14 09:57:13 -08:00
Angus Antley
1924018d2c
added code to convert theta to a projected pole vector
2019-02-14 07:15:58 -08:00
Sam Gateau
8fdf0fb80c
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2019-02-13 22:33:48 -08:00
Angus Antley
aa0c52abd7
fixed wrap around 180 degrees
2019-02-13 18:33:01 -08:00
Andrew Meadows
efe2767f3f
Merge pull request #14913 from SamGondelman/pal
...
Case 21147, Case 20944: Fix setTextures (pal, etc.)
2019-02-13 17:50:08 -08:00
Sam Gateau
bd3a732cdc
Introducing msaa to forward renderer
2019-02-13 17:38:59 -08:00
amantley
fc978f0ee7
fixed twist angle bug. need to fix wrap around 180 to -180 behaviour
2019-02-13 17:31:48 -08:00
Andrew Meadows
72b5fa1968
Merge pull request #14857 from Atlante45/fix/ess-parenting
...
Case 15420: Fix ESS sometimes not getting the parents/children of entities with scripts.
2019-02-13 17:26:57 -08:00
amantley
c6da7cc41d
everything looks pretty good now but need to move the code to rig and need to get rig of wrap around problem with the twist decomp
2019-02-13 17:12:28 -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
raveenajain
a967d7a1bc
tangent attribute
2019-02-13 15:59:55 -08:00
SamGondelman
9e002c59d4
fix pal
2019-02-13 15:24:55 -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
ba91bab224
remove cruft
2019-02-13 10:05:32 -08:00
Shannon Romano
1330b108d6
Merge pull request #14890 from sabrina-shanman/gltf_mat-support
...
(case 20980) Add support for Roughness/Metallic in GLTF models
2019-02-13 08:16:00 -08:00
luiscuenca
05d50f32ba
time budget
2019-02-13 08:16:22 -07:00
luiscuenca
bebbbc643b
add deltaTime to simulation
2019-02-13 06:27:49 -07:00
amantley
9baed717f9
integrated flex, ulnar and twist behaviour to pole vector theta computation
2019-02-12 17:55:12 -08:00
sabrina-shanman
08ef9b6f84
Remove unused duplicate ColorChannel enum
2019-02-12 16:44:37 -08:00
Sam Gateau
a4b4f201c1
Merge pull request #14910 from danteruiz/feature/quest
...
Quest re-enable IK.
2019-02-12 16:41:31 -08:00
sabrina-shanman
b2e3b87ef4
Add two missing CMake includes
2019-02-12 16:24:13 -08:00
Anthony Thibault
5db764f5df
Merge pull request #14908 from hyperlogic/bugfix/bug-eyes
...
Revert "Pack all non-instanced traits"
2019-02-12 16:23:19 -08:00
sabrina-shanman
b2af6d1374
Have only one ColorChannel enum as header in image library
2019-02-12 16:14:41 -08:00
Dante Ruiz
3103ae6ca7
reenable ik
2019-02-12 16:09:47 -08:00
Andrew Meadows
d4c52e4b1c
fix implicit cast warning for Visual Studio
2019-02-12 15:37:09 -08:00
Andrew Meadows
8bdac589b8
use RingBuffer for gradual garbage collection
2019-02-12 15:37:09 -08:00
Andrew Meadows
c9b142531b
add more tracing details in PrePhysics
2019-02-12 15:37:09 -08:00
Andrew Meadows
a3567dea3a
clean HashKey API, reduce dependency tree
2019-02-12 15:37:09 -08:00
Andrew Meadows
17ab0cb92e
more robust ShapeManager garbage collector
2019-02-12 15:37:09 -08:00
Brad Davis
4dd853ddbc
Cleanup from master
2019-02-12 15:14:50 -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
luiscuenca
954cac907d
Other avatars after update and mod timer when active
2019-02-12 15:02:56 -07:00
Shannon Romano
ee83c69d3e
Merge pull request #14899 from samcake/brownBis
...
Case 21146: Adding support for MSAA textures and framebuffer to gpu lib and backends.
2019-02-12 13:54:09 -08:00
Anthony Thibault
eee41bc41e
Revert "Pack all non-instanced traits"
...
This reverts commit 5b7d7b8833
2019-02-12 13:46:21 -08:00
Andrew Meadows
9f9f512c59
undoing markDirty() overhead because _flags is atomic
2019-02-12 13:22:22 -08:00
sabrina-shanman
1b2cb94b0c
Fix not changing input to processImage in TextureBaker.cpp
2019-02-12 13:21:21 -08:00
John Conklin II
1761df7ccd
Merge pull request #14875 from jherico/feature/quest_custom_plugins
...
Case 20882: Support custom display / input plugin lists and small tweaks
2019-02-12 12:52:07 -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
SamGondelman
fdbcf4b2ea
cleanup and expose mapped materials to getScriptableModel
2019-02-12 12:03:35 -08:00
sabrina-shanman
2b355e9d52
Re-name ColorChannelMapping to ColorChannel and put versions in two specific libraries rather than shared
2019-02-12 11:56:44 -08:00
SamGondelman
f75a3e1a72
it's working!
2019-02-12 11:41:47 -08:00
Brad Davis
a6f23f48d6
Merge branch 'feature/quest_custom_plugins' into feature/quest
2019-02-12 09:53:12 -08:00
SamGondelman
189ccfde4a
clement's comments from PR14858
2019-02-12 09:51:11 -08:00
SamGondelman
d2ecc21f0b
Merge remote-tracking branch 'upstream/master' into materialMapping
2019-02-12 09:46:40 -08:00
SamGondelman
61346437da
working on material mapping
2019-02-12 09:22:31 -08:00
Angus Antley
7bb353742a
more tweaks to get the wrist action right
2019-02-12 07:40:18 -08:00
Sam Gateau
0c2c581c64
Add the gles backend MS texture ad framebuffer support
2019-02-11 22:52:35 -08:00
Sam Gateau
afb6c838eb
REverting all the changes from the brown branch not used
2019-02-11 20:13:37 -08:00
Sam Gateau
9ad783135c
Bringing back brownBis to just msaa support
2019-02-11 19:42:05 -08:00
Sam Gateau
8a4f7fe2b6
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2019-02-11 18:57:33 -08:00
amantley
bb29e382f0
tweaking the hand pose correction on the pole vector
2019-02-11 18:05:29 -08:00
sabrina-shanman
2c5446dfb5
Merge branch 'master' into gltf_mat-support
2019-02-11 17:46:23 -08:00
Jeff Clinton
123c2301da
Merge pull request #14858 from SamGondelman/fst
...
Case 21046: Fix Subsurface Scattering and ResourceCache "extra" bug
2019-02-11 17:40:44 -08:00
luiscuenca
942e9ccdfd
Hand collisions working
2019-02-11 18:21:00 -07:00
SamGondelman
77a8ddb3f0
Merge remote-tracking branch 'upstream/master' into materialMapping
2019-02-11 16:35:05 -08:00
sabrina-shanman
e16e968e98
Merge branch 'fst' of github.com:SamGondelman/hifi into gltf_mat-support
2019-02-11 16:23:15 -08:00
Brad Davis
b896e2577b
Fix QML file selectors
2019-02-11 16:17:06 -08:00
Andrew Meadows
fab3e5e3fd
remember hash of AvatarEntityItemData
2019-02-11 16:13:56 -08:00
SamGondelman
d96b0534ab
fix resource texture crash
2019-02-11 16:12:13 -08:00
SamGondelman
4202685a4b
Merge remote-tracking branch 'upstream/master' into fst
2019-02-11 16:07:36 -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
f53ccf7363
fix create, working on mini tablet
2019-02-11 14:54:53 -08:00
David Rowe
8e0ff9b4de
Fix up some "Client Entity" JSDoc API classifications
2019-02-12 11:50:09 +13:00
David Rowe
5428bb19dc
Add "Avatar Script" JSDoc API classification
2019-02-12 11:49:49 +13:00
Andrew Meadows
ff746c3141
flag collision group/mask dirty after grab
2019-02-11 12:19:33 -08:00
SamGondelman
d988de4a17
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-11 10:27:12 -08:00
raveenajain
cfc13de39d
Merge branch 'master' of https://github.com/highfidelity/hifi into glb_files
2019-02-11 10:25:46 -08:00
SamGondelman
4f03157f39
working on fst material mapping
2019-02-11 10:20:55 -08:00
amerhifi
e6366eaf02
consolidated the OculusAcitivity into OCulusMobilieAcitivity to reduce amount of back and forth between super and base as well as remove reduntant calls to native. Moved setcontentView on the native callback becuase it was blocking QtActivity from finishing its initialization
2019-02-11 09:46:06 -08:00
sabrina-shanman
0fda6bd3e0
Merge 'samuel/fst' into gltf_mat-support
2019-02-11 09:28:29 -08:00
sabrina-shanman
5840f272ed
Store mapped single channel texture with alpha of 255 just to be safe
2019-02-11 09:07:45 -08:00
sabrina-shanman
f7d7136b3e
Do not have hash specialization just for ColorChannelMapping
2019-02-11 09:06:26 -08:00
sabrina-shanman
0f291612c3
Fix invalid processImage calls in TextureBaker.cpp
2019-02-11 09:04:41 -08:00
Angus Antley
f125e90449
worked on the swing twist decomp to get the angles of the wrist for elbow adjustments
2019-02-11 07:41:41 -08:00
SamGondelman
20841a0eea
fix skybox loading I think and pull in sabrina's ktx caching fix
2019-02-09 16:42:34 -08:00
Ken Cooke
7236d63da0
Fix tabs
2019-02-09 12:16:26 -08:00
Ken Cooke
6f5514b5e3
Remove dead code
2019-02-09 10:57:06 -08:00
Ken Cooke
68480f6760
Replace glm::packSnorm3x10_1x2() with fast SIMD implementation
2019-02-09 10:49:18 -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
sabrina-shanman
23806ed67d
Add support for GLTF roughness/metallic
2019-02-08 18:54:40 -08:00
amantley
822ec1c529
working on the wrist tweak, dampened the spine twist
2019-02-08 17:53:23 -08:00
raveenajain
709f784fea
:}
2019-02-08 16:51:18 -08:00
raveenajain
43a1c78402
Merge branch 'master' into glb_files
2019-02-08 15:59:01 -08:00
Anthony Thibault
88bb2c9bda
Merge pull request #14884 from hyperlogic/bug-fix/pack-all-traits-in-client-traits-handler
...
Pack all non-instanced avatar traits
2019-02-08 15:40:50 -08:00
Shannon Romano
bd33855820
Merge pull request #14786 from raveenajain/gltf_update
...
Case 20866: gltf color attribute
2019-02-08 15:27:41 -08:00
Shannon Romano
48db974aec
Merge pull request #14843 from raveenajain/gltf_embedded
...
Case 20937: gltf embedded data
2019-02-08 15:27:07 -08:00
Anthony Thibault
e6cdfe3377
Merge pull request #14827 from luiscuenca/FixShapeInfoAssertion
...
Case 14722: Fix assertion when trying to create multisphere shapeInfo with empty data (80.0/master)
2019-02-08 15:10:44 -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
Cristian Duarte
514c552a4d
Android - Remove block that disabled AnimInverseKinematics::overlay method
2019-02-08 19:53:59 -03:00
John Conklin II
95aadeafb0
Merge pull request #14868 from SamGondelman/color
...
Case 21070: Fix black albedo coloring
2019-02-08 14:42:19 -08:00
John Conklin II
ab8ef2db08
Merge pull request #14862 from SamGondelman/backface
...
Case 21047: Render backfaces of triangles on Procedural Entities
2019-02-08 14:41:10 -08:00
John Conklin II
78f0a3feaa
Merge pull request #14739 from SamGondelman/animations
...
Case 20398: Fix animation URL change
2019-02-08 14:40:24 -08:00
Roxanne Skelly
93665fa501
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-02-08 14:21:29 -08:00
John Conklin II
851b968501
Merge pull request #14737 from SamGondelman/zone
...
Case 19291: Fix zone bugs
2019-02-08 14:07:26 -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
Sam Gateau
f9e827afa5
Merge branch 'master' of github.com:highfidelity/hifi into brown
2019-02-08 12:04:59 -08:00
Shannon Romano
a78b83c1dd
Merge pull request #14874 from sabrina-shanman/bug_no-normal-textures
...
(case 21076) Fix missing normal textures on models (RC80)
2019-02-08 11:19:22 -08:00
SamGondelman
f7a487a020
move materialcache et al to material-networking library
2019-02-08 10:28:07 -08:00
Anthony Thibault
5b7d7b8833
Pack all non-instanced traits
...
Previously this code only would pack the skeletonModelURL trait. Which is technically not a bug, because there it is the only non-instanced trait.
But, we plan to add new traits in the future. So, lets fix this now.
2019-02-08 08:53:43 -08:00
Roxanne Skelly
e6b2c890d0
Case21085 - Changing domains with scripting APIs not working
...
AccountManager was earlier changed to support QUrlQuery for
query strings in it's 'send.' Unfortunately, QUrlQuery isn't
a scriptable property type so using AM was failing from scripts
2019-02-07 22:21:05 -08:00
Sam Gateau
48d671c6c3
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2019-02-07 18:54:19 -08:00
amantley
9eceb1d0bd
implemented the code for the heuristic elbows including code from the paper authors. to do: dampen the twist of the spine
...
caused by the hand azimuth and put in the constraints for the wrists on
the pole vector theta computation.
2019-02-07 17:46:18 -08:00
Ken Cooke
d014dc2d14
Add audio meter ballistics for less display jitter (10ms attack, 300ms release)
2019-02-07 15:35:20 -08:00
Ken Cooke
2617febbcd
Replace ad-hoc audio meter with meter calibrated in dBFS
2019-02-07 15:31:13 -08:00
Brad Davis
d3301803d3
Support custom display / input plugin lists and small tweaks
2019-02-07 15:15:26 -08:00
raveenajain
446176d3a5
update to parse glb files
2019-02-07 15:08:04 -08:00
Shannon Romano
9e862ba55b
Merge pull request #14872 from sabrina-shanman/RC79_bug_no-normal-textures
...
(case 21072) Fix missing normal textures on models
2019-02-07 14:51:07 -08:00
Jeff Clinton
54109deab9
Merge pull request #14825 from SamGondelman/fall
...
Case 20829: Always fall when flying is not allowed
2019-02-07 14:39:46 -08:00
SamGondelman
c217f8d80f
remove overlay picks from stats qml
2019-02-07 14:25:07 -08:00
John Conklin II
dda310c0b9
Merge pull request #14835 from SamGondelman/textures
...
Case 20944: Fix Model textures property
2019-02-07 14:19:01 -08:00
SamGondelman
e601f6c59f
move material mapping to hfm prep step
2019-02-07 14:10:09 -08:00
Brad Davis
070fb25b80
Cleaning up differnces from master
2019-02-07 13:33:28 -08:00
luiscuenca
02646fb8a9
Working flow as rig param
2019-02-07 14:09:53 -07:00
SamGondelman
3addcb630c
Merge remote-tracking branch 'sabrina/hfm_prep_joints' into materialMapping
2019-02-07 11:45:59 -08:00
sabrina-shanman
466c226193
Do not use continues in logic checking if we should calculate mesh tangents
2019-02-07 11:39:51 -08:00
sabrina-shanman
0e9e4b3332
Fix normal textures not being visible
2019-02-07 11:39:49 -08:00
Anthony Thibault
f8608464fa
warning fixes
2019-02-07 11:33:44 -08:00
sabrina-shanman
ef529ed309
Do not use continues in logic checking if we should calculate mesh tangents
2019-02-07 11:27:08 -08:00
sabrina-shanman
985f6dcb75
Fix normal textures not being visible
2019-02-07 11:22:33 -08:00
amantley
4d9d597b4f
tweaked the weights for the arms and negated the theta for the left arm
2019-02-07 11:14:33 -08:00
SamGondelman
e0cb37af4b
fix black albedo coloring
...
(cherry picked from commit 7fe0e5909e
2019-02-07 10:47:32 -08:00
danteruiz
95d30e5cbf
Merge branch 'master' of github.com:highfidelity/hifi into feature/quest
2019-02-07 10:41:44 -08:00
SamGondelman
7fe0e5909e
fix black albedo coloring
2019-02-07 10:14:10 -08:00
SamGondelman
e74ff18bef
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-07 09:49:27 -08:00
SamGondelman
25ca52d892
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-07 09:48:13 -08:00
Cristian Duarte
babb972d89
Merge remote-tracking branch 'hifi/master' into android_handshake
2019-02-07 14:44:22 -03:00
Sam Gateau
632d6e8a73
Merge pull request #14863 from danteruiz/android-apps-directories
...
Case 20877: Support CMake time configuration of QmlFileSelectors
2019-02-07 09:30:49 -08:00
amantley
e2c9058f0a
first try at the new elbow code
2019-02-06 18:29:33 -08:00
Ken Cooke
ba00f95f72
Expose clipping status to audio scripting interface
2019-02-06 18:23:50 -08:00
Sam Gateau
4648c47af8
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2019-02-06 18:13:26 -08:00
Sam Gateau
29573aaa83
fix the half resoolution problem
2019-02-06 16:41:23 -08:00
Ken Cooke
918e2fc7ab
Proper detection of digital clipping on the unprocessed audio input.
...
Triggered when 3+ consecutive samples > -0.1 dBFS.
2019-02-06 16:08:30 -08:00
Shannon Romano
6fd480e51d
Merge pull request #14795 from AndrewMeadows/myAvatar-vs-backfacing-triangles-2
...
case 17773: reduce likelihood MyAvatar will get stuck in mesh geometry when flying around
2019-02-06 15:52:31 -08:00
Jeff Clinton
2c666aed5e
Merge pull request #14821 from SamGondelman/owningAvatarID
...
Case 20932: Fix getEntityProperties
2019-02-06 14:43:31 -08:00
Sam Gateau
db30857b87
Merge branch 'master' of github.com:highfidelity/hifi into brown
2019-02-06 13:21:34 -08:00
Brad Davis
8b70f1771e
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-02-06 13:16:22 -08:00
Sam Gateau
9ff9117a34
Merge pull request #14811 from jherico/feature/quest_frame_player
...
Case 20884: Quest frame player and Oculus libraries
2019-02-06 13:15:39 -08:00
Brad Davis
b40595b14f
Fix merge issue
2019-02-06 13:06:04 -08:00
Sam Gateau
8ec9c8502d
Merge branch 'master' of github.com:highfidelity/hifi into brown
2019-02-06 12:09:38 -08:00
Shannon Romano
6a91b54261
Merge pull request #14856 from AndrewMeadows/fix-crash-on-early-shutdown-redux
...
case 21042: fix interface crash on early shutdown, 0.80.0 redux
2019-02-06 11:53:49 -08:00
Shannon Romano
30a6f25b69
Merge pull request #14851 from AndrewMeadows/myAvatar-unmovable-until-floor
...
case 20048: don't allow MyAvatar to move until physics enabled
2019-02-06 11:52:42 -08:00
SamGondelman
9193704173
trying to get hashes working
2019-02-06 11:47:38 -08:00
danteruiz
d0fecac0d8
+android -> +android_interface
2019-02-06 11:37:52 -08:00
Shannon Romano
61459d5756
Merge pull request #14775 from roxanneskelly/QmlMarketplace
...
Qml marketplace
2019-02-06 11:20:49 -08:00
Shannon Romano
26927aaec6
Merge pull request #14847 from AndrewMeadows/trust-the-packet
...
Case 20959: fix crash for incorrect parsing of AvatarEntity data
2019-02-06 11:15:13 -08:00
SamGondelman
4c9fb168c7
enable backface culling on procedurals
2019-02-06 10:55:36 -08:00
Brad Davis
91e18f569b
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-02-06 10:15:36 -08:00
Dante Ruiz
6c9d15d9a9
remove used variable
2019-02-06 09:58:02 -08:00
Dante Ruiz
aa645af744
fix quest controllers
2019-02-06 09:19:36 -08:00
Sam Gateau
d8f6583047
Merge branch 'master' of github.com:highfidelity/hifi into brown
2019-02-06 09:01:38 -08:00
John Conklin II
3ee412faf7
Merge pull request #14854 from danteruiz/quest-default
...
Case 21037: Allow the script engine to use FileSeclector when loading scriopts
2019-02-06 07:21:03 -08:00
Sam Gateau
35491bf5b0
Multisampling works in 4.1
2019-02-06 00:05:17 -08:00
Anthony Thibault
5c7e81584c
AnimPose::inverse() optimization
2019-02-05 18:23:58 -08:00
Anthony Thibault
87498b3dd2
Avoid dynamic_cast in getAnimInverseKinematicsNode
2019-02-05 18:15:05 -08:00
Anthony Thibault
708309fa63
CubicHermiteSplineWithArcLength optimization
2019-02-05 18:11:30 -08:00
Anthony Thibault
a959d69554
Make AnimSkeleton::getParentIndex() more cache coherent
2019-02-05 18:10:32 -08:00
Sam Gateau
893bbe3a37
Merge branch 'master' of github.com:highfidelity/hifi into brown
2019-02-05 18:02:09 -08:00
Sam Gateau
b1b6533295
Restore clear
2019-02-05 18:01:41 -08:00
SamGondelman
3ee448a89a
fix scattering and working on resource cache bug
2019-02-05 17:32:15 -08:00
amantley
9ad20b8129
adding the animcontext to the commit
2019-02-05 17:22:00 -08:00
amantley
07a4f49c58
adding the armik nodes into the json
2019-02-05 17:21:39 -08:00
Andrew Meadows
16ef30ced0
don't flushRepeatedMessages() in LogHandler dtor
2019-02-05 17:14:25 -08:00
Clement
8b32a62e2f
Simplify filter check
2019-02-05 17:03:19 -08:00
Clement
5945823606
Honor full scene resends
2019-02-05 17:03:19 -08:00
Andrew Meadows
c8a0d61fd1
don't flushRepeatedMessages() in LogHandler dtor
2019-02-05 17:00:18 -08:00
Ken Cooke
f9afe6fe43
Detect loudness and clipping on the raw audio input
2019-02-05 16:39:03 -08:00
amantley
3e553f015c
added the arm ik files to the repo, this is for the shoulder and elbow extensions
2019-02-05 15:54:37 -08:00
Anthony Thibault
d8644a2745
Simplify isEqual computation for vectors used in Rig
2019-02-05 15:06:29 -08:00
John Conklin II
ae6672533c
Merge pull request #14788 from jherico/feature/quest_gpu_timers
...
Case 20876: Quest: Support gpu timing on systems with disjoint timer extension
2019-02-05 14:49:40 -08:00
John Conklin II
ec0bdba7fb
Merge pull request #14814 from sethalves/fix-edit-in-releaseGrab
...
case 20919: Fix edit in release grab
2019-02-05 14:48:59 -08:00
Anthony Thibault
569bef50fd
AnimPose operator* optimizations
2019-02-05 14:48:05 -08:00
danteruiz
30bd9774b2
script engine to load platform specific files
2019-02-05 13:11:54 -08:00
Jeff Clinton
35608c35de
Merge pull request #14808 from danteruiz/webengine-fileselector
...
Case 20879: Migrate webEngine referencing QML into +webengine folder
2019-02-05 12:57:38 -08:00
Ken Cooke
cfaa841746
Add output silence-detection to the noise gate processing
2019-02-05 12:34:42 -08:00
Sam Gateau
59d53bd716
Merge branch 'master' of github.com:highfidelity/hifi into brown
2019-02-05 12:20:39 -08:00
raveenajain
253e3554af
feedback
2019-02-05 10:18:34 -08:00
amantley
af38a40b85
Merge remote-tracking branch 'origin/animSplineIK' into animSplineIK
2019-02-05 09:43:11 -08:00
raveenajain
21fa1878cb
spaces
2019-02-05 09:28:47 -08:00
raveenajain
d109c0fb1b
feedback changes
2019-02-05 09:23:10 -08:00
Shannon Romano
6555e6e8ef
Merge pull request #14849 from SamGondelman/owningAvatarID79
...
Case 21011: Fix getEntityProperties (79)
2019-02-05 09:20:15 -08:00
Brad Hefta-Gaub
936837c886
Merge pull request #14823 from Atlante45/fix/scripts-load-fail-master
...
[master] Fix reload mechanic for entity server scripts
2019-02-05 09:19:56 -08:00
Andrew Meadows
5a4960b300
add crash::doAssert() for debug purposes
2019-02-05 09:00:48 -08:00
Sam Gateau
4089f8c5b0
Adding Color filter to the tone mapper
2019-02-04 23:45:35 -08:00
Sam Gateau
99251bdd6d
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2019-02-04 19:16:14 -08:00
raveenajain
9fe42a0549
Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_embedded
2019-02-04 16:49:23 -08:00
Roxanne Skelly
78aa1783a0
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-02-04 15:04:55 -08:00
amantley
031dd5639b
fixed pole vector over writing with the old json
2019-02-04 14:46:52 -08:00
amantley
78d6e42fc8
made the ik enable/disable work for the old animIK node json
2019-02-04 13:42:19 -08:00
amantley
a04e6d55ff
enabled/disable ik now works for the new animspline json
2019-02-04 13:31:36 -08:00
Jamil Akram
bab411e001
Merge pull request #14822 from hyperlogic/bug-fix/anim-tests-work-again
...
Make Animation Unit Tests Pass Again
2019-02-04 12:45:12 -08:00
SamGondelman
31cf623252
fix keyboard focus
2019-02-04 12:44:04 -08:00
SamGondelman
17cafe7cce
fix getEntityProperties
...
(cherry picked from commit 6e61c02d04
2019-02-04 10:41:10 -08:00
luiscuenca
cf8f9fa1b6
Threads created correctly
2019-02-04 11:28:42 -07:00
Andrew Meadows
5f3e3309b8
0.79.0: trust the data in the packet, Luke
2019-02-04 09:47:04 -08:00
Andrew Meadows
1d7265f668
trust the data in the packet, Luke
2019-02-04 09:45:06 -08:00
Sam Gateau
d0a044120a
Adding the sub samples control
2019-02-03 21:31:19 -08:00
SamGondelman
4b406bf41c
fix getEntityObject and tablet highlighting (Overlays.findOverlays)
2019-02-01 16:23:06 -08:00
Shannon Romano
ffd47f3bb7
Merge pull request #14824 from Atlante45/fix/scripts-load-fail-79
...
[79.0] Fix reload mechanic for entity server scripts
2019-02-01 15:51:27 -08:00
SamGondelman
391cca787f
fix keyboard textures and text display
2019-02-01 15:33:53 -08:00
SamGondelman
b80d2a9b06
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-01 13:33:04 -08:00
SamGondelman
50bfe84aa7
fix keyboard intersection, laser alpha
2019-02-01 12:11:00 -08:00
raveenajain
d1d8832e7a
read in embedded data
2019-02-01 11:27:43 -08:00
Angus Antley
a2ef7edf10
cleaned up some warnings
2019-01-31 20:43:13 -08:00
Angus Antley
dd99f93d1a
fixed missplaced static const
2019-01-31 19:52:17 -08:00
amantley
25c5a2f41a
fixed mac/linux build error
2019-01-31 17:23:56 -08:00
Sam Gateau
8671e7c499
Merge branch 'master' of github.com:highfidelity/hifi into brown
2019-01-31 17:11:35 -08:00
Sam Gateau
84db9f4729
testing the water...
2019-01-31 16:18:47 -08:00
John Conklin II
3a39e1bc02
Merge pull request #14826 from luiscuenca/FixAssert79
...
[RC79] Fix assertion when trying to create multisphere shapeInfo with empty data.
2019-01-31 16:02:59 -08:00
SamGondelman
0955512a80
add billboard mode to web entities and fix picking/culling
2019-01-31 15:45:10 -08:00
sabrina-shanman
3d1edf4d9e
Make small code improvements to PrepareJointsTask
2019-01-31 15:00:50 -08:00
raveenajain
f73296182c
Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_embedded
2019-01-31 14:19:58 -08:00
amantley
61b019d176
added new constructor for cubichermitespline that takes quat and vec3. this means we don't need computeSplineFromTipAndBase to be declared in multiple files
2019-01-31 14:13:51 -08:00
Shannon Romano
8a68a481f7
Merge pull request #14832 from danteruiz/the-spot79
...
Case 20941: Goto the spot on first launch (79.0)
2019-01-31 13:50:40 -08:00
raveenajain
997660d430
review changes
2019-01-31 13:50:17 -08:00
raveenajain
216e9bd4cb
Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_update
2019-01-31 13:47:38 -08:00
raveenajain
ae09aec5d9
embedded model geometry
2019-01-31 13:36:53 -08:00
SamGondelman
ee1552661c
fix textures
2019-01-31 12:04:46 -08:00
Dante Ruiz
9082a3f4e5
to the spot on first launch
2019-01-31 10:58:20 -08:00
Dante Ruiz
778ddad9ac
to the spot on first launch
2019-01-31 10:52:48 -08:00
amantley
ffd374e7d4
whitespace
2019-01-31 10:05:08 -08:00
amantley
f68ee4e7ce
merged with master
2019-01-31 09:56:46 -08:00
luiscuenca
5438bddc84
Fix assertion on shapeInfo when creating multisphere with empty data
2019-01-31 09:43:30 -07:00
luiscuenca
e2f82eb949
Fix assertion on shapeInfo
2019-01-31 09:35:42 -07:00
SamGondelman
2d0c1184e4
only domain zone entities control flying and ghosting
2019-01-30 18:27:17 -08:00
amantley
d547d5b854
changed the json reader to take an array not a string for the flex targets
2019-01-30 18:16:02 -08:00
SamGondelman
5553752d81
fall when flying not allowed
2019-01-30 18:04:44 -08:00
Sam Gateau
196748c4f9
Merge branch 'master' of github.com:highfidelity/hifi into brown
2019-01-30 18:04:39 -08:00
Clement
283dabc622
Fix reload mechanic for entity server scripts
2019-01-30 17:29:28 -08:00
Clement
b09a939066
Fix reload mechanic for entity server scripts
2019-01-30 17:28:47 -08:00
Anthony Thibault
2c40b120ca
Make Animation Tests Pass Again
2019-01-30 17:26:52 -08:00
SamGondelman
6e61c02d04
fix getEntityProperties
2019-01-30 17:17:39 -08:00
Howard Stearns
75c1bdbf0d
Merge pull request #14812 from SimonWalton-HiFi/avatar-data-packet-overrun
...
80.0/master: Fix small miscalculation in space requirements for serialized avatar-data
2019-01-30 17:00:12 -08:00
amantley
d174fb1b5c
removed print statements
2019-01-30 16:59:12 -08:00
Brad Davis
67cf08e8ae
Quest frame player
2019-01-30 16:23:22 -08:00
Brad Davis
b1eb0b0a46
GPU tweaks
2019-01-30 16:23:21 -08:00
Brad Davis
5d1277e1bb
GL helpers cleanup
2019-01-30 16:23:21 -08:00
Brad Davis
8a1a55189a
CMake cleanup and modernization
2019-01-30 16:23:14 -08:00
amantley
5054b54626
removed armIK.cpp and armIK.h, they are for the next changes
2019-01-30 16:20:50 -08:00
Brad Davis
c46d73128b
Merge branch 'feature/quest_frame_player' into feature/quest
2019-01-30 16:16:51 -08:00
amantley
7a1c1252ff
cleanup
2019-01-30 16:09:10 -08:00
Simon Walton
c7e9f79200
Include the new scale float in min remaining size calculation
2019-01-30 14:48:37 -08:00
Seth Alves
f33e5ba5ae
cleanup
2019-01-30 14:47:38 -08:00
amantley
2e1a4545c6
cache the spine2 spline default offset and ratio
2019-01-30 14:47:03 -08:00
Bradley Austin Davis
c2dca9d0e8
Fix entities cmakelists.txt
2019-01-30 14:45:06 -08:00
Seth Alves
3ab2db96b6
deactivate grab action when grab is released
2019-01-30 14:43:11 -08:00
Seth Alves
0846eb8ec6
attempt to allow position edits in releaseGrab entity-method
2019-01-30 14:43:11 -08:00
Dante Ruiz
93a91cdba2
webengine fileselector
2019-01-30 13:57:49 -08:00
Simon Walton
08b21109c1
Include the new scale float in min remaining size calculation
2019-01-30 13:55:12 -08:00
Brad Davis
a310eec41e
Support relative paths in serialized frames
2019-01-30 13:15:23 -08:00
Brad Davis
6cea0d9012
Quest frame player
2019-01-30 13:15:23 -08:00
Brad Davis
f490a6c231
GPU tweaks
2019-01-30 13:15:23 -08:00
Brad Davis
1dfdf220c0
GL helpers cleanup
2019-01-30 13:15:23 -08:00
Brad Davis
20eec33b8b
CMake cleanup and modernization
2019-01-30 13:15:23 -08:00
Brad Davis
2f92e10142
Support using prefering mobile compressed textures on desktop
2019-01-30 13:15:22 -08:00
SamGondelman
93e32f1bd5
fix skybox depth testing
2019-01-30 12:25:48 -08:00
Gabriel Calero
6a665835e7
Merge remote-tracking branch 'upstream/master' into android_handshake
2019-01-30 17:06:41 -03:00
SamGondelman
57ee9786af
fix picks vs. local entities
2019-01-30 11:42:05 -08:00
SamGondelman
834e44dd3a
make polyline's with faceCamera not depend on normal
2019-01-30 11:02:24 -08:00
Brad Davis
10a7403d44
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-01-30 10:19:46 -08:00
Brad Davis
f146c9fe77
Quest frame player work
2019-01-30 10:17:57 -08:00
Sam Gateau
b47ecc9890
Merge branch 'master' of github.com:highfidelity/hifi into brown
2019-01-30 09:17:02 -08:00
Jeff Clinton
3b84580e88
Merge pull request #14794 from SamGondelman/colors
...
Case 20888: Fix color space
2019-01-30 09:09:07 -08:00
Sam Gateau
d418fa282a
Merge pull request #14801 from SamGondelman/transparent
...
Case 20867: Fix translucent textures not getting reset
2019-01-30 08:54:48 -08:00
Angus Antley
e36877a861
added the interp for the possibility of extra flex coeffs
2019-01-29 22:02:32 -08:00
amantley
fb0ad7768c
removed clear map
2019-01-29 17:31:20 -08:00
amantley
e2a729b68b
got the spline working in myskeleton model, need to clean up
2019-01-29 17:25:25 -08:00
SamGondelman
56096708d3
one more try
2019-01-29 15:26:49 -08:00
SamGondelman
e41f5617e9
fix color space
2019-01-29 14:52:57 -08:00
Brad Davis
60912b7c76
Updated controller API
2019-01-29 14:23:12 -08:00
Brad Davis
0d34030135
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-01-29 14:13:11 -08:00
Antonina Savinova
5d49a3f6df
Merge pull request #14732 from kencooke/audio-distattn-improvements
...
Bug fixes and improvements to audio distance attenuation
2019-01-29 14:02:29 -08:00
Shannon Romano
72d3eb9d33
Merge pull request #14797 from kencooke/audio-injector-stereo-distattn-bugfix2
...
case 20805: RC78.1 to master: Fix the distance attenuation of stereo local injectors
2019-01-29 13:12:51 -08:00
SamGondelman
5be6a31b6c
possible fix for transparency
2019-01-29 12:20:46 -08:00
sabrina-shanman
203e8e2455
Realize joint properties isFree and freeLineage are unused, so tear them out
2019-01-29 11:55:35 -08:00
Ken Cooke
b0f8afa772
CR: don't expose "position" when not set
2019-01-29 11:21:17 -08:00
Ken Cooke
fa08e42da6
Restore legacy attenuation behavior for system sounds and scripts that do not set position.
...
JS detects when "position" was not set by the script.
C++ explicitly sets .positionSet=false when not set (for system sounds).
Local rendering uses a direct mix (no attenuation/HRTF) when not set.
2019-01-29 11:21:02 -08:00
Andrew Meadows
e372cb668a
enable CCD for MyAvatar's RigidBody
2019-01-29 11:11:54 -08:00
Andrew Meadows
fb5ef95a5b
disable bf triangle collisions for flying MyAvatar
2019-01-29 11:00:18 -08:00
Jeff Clinton
536a76a791
Merge pull request #14787 from wayne-chen/oculusLoginFeature
...
MS20874: Only initialize plugin if started through Oculus Store
2019-01-29 10:57:03 -08:00
sabrina-shanman
eace901278
Fix not calculating joint freeLineage list properly
2019-01-29 10:29:12 -08:00
Jamil Akram
f4ead69549
Merge pull request #14722 from luiscuenca/multiSphereAvatar04
...
Multi-sphere avatar detailed collisions
2019-01-29 10:10:04 -08:00
Angus Antley
3994311583
starting the move of the initial head base spline to myskeletonmodel
2019-01-29 08:54:35 -08:00
SamGondelman
7fa676a846
don't render text parts if alpha == 0
2019-01-29 08:25:17 -08:00
SamGondelman
a8dbe5e761
working on build errors
2019-01-28 21:10:24 -08:00
SamGondelman
6ad0b3412a
showKeyboardFocusHighlight + fixes
2019-01-28 20:43:47 -08:00
Sam Gateau
3ab66fde5e
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2019-01-28 19:22:33 -08:00
SamGondelman
7b88efa42c
trying to fix web surfaces??
2019-01-28 18:29:09 -08:00
SamGondelman
0d1e4bed66
merge with master
2019-01-28 18:13:05 -08:00
Sam Gondelman
faeb5b36dc
Merge pull request #14764 from SamGondelman/NOverlays12
...
Case 20722: Ring Gizmo Entities to replace Circle Overlays
2019-01-28 18:09:23 -08:00
Sam Gateau
e39a6b5a7d
Merging with master
2019-01-28 17:58:17 -08:00
amantley
1919cc3b1a
disable mid joint when not valid. more work on this tomorrow
2019-01-28 17:49:46 -08:00
sabrina-shanman
3e7a80ac4c
Move FST joint name and rig processing to the model preparation step
2019-01-28 17:49:29 -08:00
luiscuenca
70d0ebfbec
Optimization
2019-01-28 18:39:16 -07:00
