Roxanne Skelly
|
2dffd14fa7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
|
2019-02-25 10:20:52 -08:00 |
|
Shannon Romano
|
dc6bdfae8a
|
Merge pull request #14995 from SamGondelman/parentCrash
Case 21391: Fix parent loop crash
|
2019-02-25 10:01:37 -08:00 |
|
John Conklin II
|
6af2b25767
|
Merge pull request #14980 from AndrewMeadows/dont-clear-space
Case 21309: don't corrupt workload system
|
2019-02-25 09:52:15 -08:00 |
|
Clement
|
50035a1983
|
Delete old nodes with identical socket
|
2019-02-25 09:48:21 -08:00 |
|
Sam Gateau
|
b563f21037
|
Fix comments
|
2019-02-25 09:32:27 -08:00 |
|
Sam Gateau
|
df6d8f3be0
|
FIxing the gamma correction for Quest, intoducing simple gpu lib conversion shaders
|
2019-02-24 21:31:28 -08:00 |
|
Sam Gateau
|
4ee2b43229
|
FIxing the gamma correction for Quest, intoducing simple gpu lib conversion shaders
|
2019-02-24 20:49:51 -08:00 |
|
Sam Gateau
|
26ad42b965
|
FIxing the gamma correction for Quest, intoducing simple gpu lib conversion shaders
|
2019-02-24 19:07:56 -08:00 |
|
Sam Gateau
|
f4a79a1e92
|
Mege with master the culling scale
|
2019-02-24 15:08:23 -08:00 |
|
Sam Gateau
|
ff5e9ee5d3
|
Merge pull request #14999 from amerhifi/quest-demo
case 21395: Adjust culling matrix
|
2019-02-24 14:51:13 -08:00 |
|
Sam Gateau
|
d6b2dba352
|
Merge branch 'quest-demo' of github.com:highfidelity/hifi into quest-demo
|
2019-02-23 09:57:23 -08:00 |
|
Clement
|
d040803391
|
Delete old nodes with identical socket
|
2019-02-22 18:38:31 -08:00 |
|
Simon Walton
|
16bc667b95
|
Looks like serialization order must be same a flag enum order!?
Also resuscitate EntityItem debug dumps.
|
2019-02-22 18:17:30 -08:00 |
|
Sam Gateau
|
dab0df1113
|
Trying to fix the damn gamma
|
2019-02-22 18:03:23 -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 |
|
Sam Gondelman
|
30b6b7f21b
|
let's try that again
|
2019-02-22 16:30:36 -08:00 |
|
amer cerkic
|
5c1e5e0c46
|
cleanup
|
2019-02-22 16:30:17 -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 |
|
amer cerkic
|
5bf994626c
|
scaling culling projection matrix by 1.5 to help reduce teh ugly effect of stuff getting cut off too early
|
2019-02-22 16:28:36 -08:00 |
|
Roxanne Skelly
|
0636579822
|
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
|
2019-02-22 15:43:42 -08:00 |
|
SamGondelman
|
081e62a647
|
fix parent loop crash
|
2019-02-22 14:26:15 -08:00 |
|
SamGondelman
|
dbc3ae3793
|
hmmm not working
|
2019-02-22 14:18:59 -08:00 |
|
SamGondelman
|
a31b09b204
|
handle models with no materials
|
2019-02-22 13:17:13 -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 |
|
SamGondelman
|
6d6cd42adb
|
fix bound scaling
|
2019-02-22 12:00:00 -08:00 |
|
amantley
|
9b73c83ebc
|
removed merge markers
(cherry picked from commit 4286142daac70269de155c99c9bbdb1f951eaff6)
|
2019-02-22 11:55:14 -08:00 |
|
Sam Gateau
|
a49ec95638
|
Merge pull request #14988 from danteruiz/quest-demo
Case 21199: Fix borken shaders for forward rendering (quest)
|
2019-02-22 11:46:03 -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 |
|
Dante Ruiz
|
109eb62886
|
requested changes
|
2019-02-22 11:09:40 -08:00 |
|
danteruiz
|
aa8563f3fe
|
fix quest ui elements
|
2019-02-22 10:40:32 -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
|
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 |
|
Ken Cooke
|
c1786edc24
|
Emulate the old behavior of _lastInputLoudness
|
2019-02-21 18:45:17 -08:00 |
|
Andrew Meadows
|
be2d4272da
|
remove the other unnecessary _space->clear()
|
2019-02-21 18:11:16 -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 |
|
Brad Davis
|
ae6a73c710
|
Automatically go to quest-dev domain on startup
|
2019-02-21 16:42:47 -08:00 |
|
Andrew Meadows
|
982c4c2bc4
|
do not Space::clear() in clearNonLocalEntities()
|
2019-02-21 16:33:31 -08:00 |
|
luiscuenca
|
dcbf57ee0b
|
Fix linux warning and HMD breaks flow
|
2019-02-21 16:41:24 -07: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 |
|
amantley
|
50bc8d3646
|
added protected function to cubic hermite spline
|
2019-02-21 13:32:28 -08:00 |
|
amantley
|
0bdc527ce7
|
turned off pole vector when hand behind back
|
2019-02-21 13:14:51 -08:00 |
|
amantley
|
de10aebbb5
|
removed white space
|
2019-02-21 11:44:18 -08:00 |
|
amantley
|
64ec28ef44
|
added back missing unity meta files
|
2019-02-21 11:37:14 -08:00 |
|
amantley
|
afed0b5442
|
review changes
|
2019-02-21 11:08:29 -08:00 |
|
luiscuenca
|
ec4d069011
|
Allow threads with only one joint, remove dummy joints and unused constants
|
2019-02-21 12:00:19 -07:00 |
|
SamGondelman
|
4fdf556d5d
|
fix billboard mode in secondary camera
|
2019-02-21 10:29:21 -08:00 |
|
amantley
|
33fd64c68c
|
direction on compare in positional theta function
|
2019-02-21 09:00:23 -08:00 |
|
amantley
|
f8a74efdc2
|
fixed build errors from jenkins
|
2019-02-20 17:59:45 -08:00 |
|
amantley
|
97da20781e
|
removed whitespace
|
2019-02-20 15:19:36 -08:00 |
|
amantley
|
27bfe2f0fe
|
changed name of pre processor variable
|
2019-02-20 15:14:12 -08:00 |
|
amantley
|
95b3fbdc35
|
removed ulnar coeff, too jumpy
|
2019-02-20 15:02: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 |
|
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 |
|
David Kelly
|
2202b69575
|
Guard against accidentally calling wrong api/v1/places endpoint
spaces
|
2019-02-20 13:09:29 -07: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 |
|
luiscuenca
|
bea7680864
|
Fix shared_ptr not part of std error
|
2019-02-20 10:57:11 -07:00 |
|
Brad Davis
|
817c24dd0b
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-20 09:51:03 -08:00 |
|
luiscuenca
|
fa44687de6
|
fix errors and remove debug draw
|
2019-02-20 09:22:39 -07:00 |
|
Angus Antley
|
7639eac3ad
|
cleaning up theta functions
|
2019-02-20 07:18:14 -08:00 |
|
Angus Antley
|
1e73422b80
|
added the wrist and position coeffs back in, 1.0 works
|
2019-02-20 06:25:44 -08:00 |
|
amantley
|
951380db15
|
tweaked the constraints, to do: start conditions and possibly using base rotation on shoulder to determine hand offset
|
2019-02-19 17:53:59 -08:00 |
|
SamGondelman
|
c8ffb130a3
|
only update sub items on change
|
2019-02-19 17:38:47 -08:00 |
|
Simon Walton
|
8033e93eda
|
Add avatar-priority boolean to zone entities
RC-79 version
|
2019-02-19 17:38:37 -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 |
|
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 |
|
amer cerkic
|
bf69e6d672
|
fixing compile errors
|
2019-02-19 16:03:02 -08:00 |
|
SamGondelman
|
44e70db4cd
|
WE DID IT FOLKS
|
2019-02-19 15:02:36 -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 |
|
John Conklin II
|
051ab61b66
|
Merge pull request #14951 from SamGondelman/ssao
Case 20993: Fix AO
|
2019-02-19 11:19:03 -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 |
|
danteruiz
|
4bbae1230d
|
making requested chantges
|
2019-02-19 10:07:36 -08:00 |
|
Angus Antley
|
f2301e7dac
|
fixed relative wrist correction problem
|
2019-02-19 07:35:13 -08:00 |
|
SamGondelman
|
27f05db825
|
fix ao
|
2019-02-18 01:12:00 -08:00 |
|
Angus Antley
|
748368bfda
|
mid tweak on the wrist and position coeffs
|
2019-02-17 23:32:52 -08:00 |
|
SamGondelman
|
06ac2b291b
|
attachments and wearables cull with avatar parent
|
2019-02-17 17:52:10 -08:00 |
|
SamGondelman
|
935d827421
|
try to cull wearables with avatars
|
2019-02-17 02:10:25 -08:00 |
|
Angus Antley
|
e1dfd7d288
|
cleanup white space
|
2019-02-16 23:40:16 -08:00 |
|
SamGondelman
|
1163cbea70
|
improving web surface interaction and tablet hiding
|
2019-02-16 22:03:55 -08:00 |
|
SamGondelman
|
71653f95d7
|
working on overlay bugs
|
2019-02-16 20:08:36 -08:00 |
|
Sam Gondelman
|
c8ab7ac37f
|
fix bad copy
|
2019-02-16 18:08:05 -08:00 |
|
Angus Antley
|
0982c37c5e
|
took out the theta animvar and just use theta converted to pole vector
|
2019-02-16 14:50:47 -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 |
|
SamGondelman
|
d50904dd4a
|
fix avatar deadlock
|
2019-02-15 17:08:24 -08:00 |
|
Andrew Meadows
|
2fdc9bce77
|
remove velocity restrictions on SHAPE_TYPE_STATIC_MESH
|
2019-02-15 16:59:18 -08:00 |
|
SamGondelman
|
3e3bd2ffd8
|
fix transform properties not changing
|
2019-02-15 16:57:29 -08:00 |
|
Andrew Meadows
|
304f993391
|
remove enforcement of MOTION_TYPE_STATIC for mesh shapes
|
2019-02-15 16:50:45 -08:00 |
|
SamGondelman
|
6bf1545285
|
fix build error
|
2019-02-15 16:44:28 -08:00 |
|
Brad Davis
|
bfda7d73c1
|
Fix frame player
|
2019-02-15 16:39:36 -08:00 |
|
danteruiz
|
b00746c096
|
Trim picks in use during quest:
|
2019-02-15 16:24:17 -08:00 |
|
amantley
|
95530e6ba5
|
removed the unnecessary animArmIK.h and .cpp
|
2019-02-15 15:41:23 -08:00 |
|
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 |
|