Commit graph

52410 commits

Author SHA1 Message Date
ZappoMan
bdfbc13185 add support for hand rotations to the kinect plugin, add notes on mapping from kinect orientations to our frame orientations 2017-03-28 15:09:03 -07:00
Clément Brisset
82114ae6ab Merge pull request #9940 from Atlante45/fix/sit
Fix a few sitting bugs noticed at the meetup
2017-03-28 11:14:31 -07:00
Andrew Meadows
60b8dbfce1 Merge pull request #10026 from AndrewMeadows/cleanup-fbx
reduce memory bandwitdh to GPU for skinned meshes
2017-03-28 08:55:06 -07:00
Chris Collins
83aa7358e2 Merge pull request #9998 from birarda/bug/oculus-buttons-flipped
fix swapped buttons in oculus touch graphic
2017-03-28 06:50:20 -07:00
Andrew Meadows
5fc1e97166 fix windows build of render-utils-test 2017-03-27 16:49:43 -07:00
Andrew Meadows
92b41d7a38 fix link error for linux build 2017-03-27 15:50:40 -07:00
Andrew Meadows
ff2f4da4b2 final changes as per samcake 2017-03-27 15:19:28 -07:00
Andrew Meadows
fcf18cba91 render pipeline support for normalized intergers 2017-03-27 14:40:31 -07:00
Andrew Meadows
60bc76e1c4 store cluster indices and weights in uint16_t 2017-03-27 14:40:31 -07:00
Andrew Meadows
f6d6c62fab move variable closer to context where it is used 2017-03-27 14:40:31 -07:00
Andrew Meadows
18544581e6 remove warnings about implicit float cast 2017-03-27 14:40:31 -07:00
Andrew Meadows
60874e6041 remove unused cruft 2017-03-27 14:40:31 -07:00
Brad Hefta-Gaub
c986077a4f Merge pull request #10007 from hyperlogic/feature/ik-debug-draw
Added Developer > Avatar > Show IK Targets
2017-03-27 14:29:02 -07:00
Brad Hefta-Gaub
3bdcfd8b78 Merge pull request #9796 from ZappoMan/removePropertiesFromRayPick
remove properties from RayToEntityIntersectionResult
2017-03-27 14:26:51 -07:00
Seth Alves
f8ba540d03 Merge pull request #9992 from samcake/brown
Fixing the broken rendering of subsurface scattering
2017-03-27 11:06:04 -08:00
samcake
25d39d2430 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-03-27 09:50:44 -07:00
Seth Alves
f633e0cd5a Merge pull request #10012 from sethalves/raise-max-meshes-to-1000
raise max mesh count for static collision entities from 500 to 1000
2017-03-27 08:30:07 -08:00
Seth Alves
e5326d146e Merge pull request #10003 from hyperlogic/feature/my-avatar-jsdoc
Added jsdoc documentation for some of MyAvatar properties and methods
2017-03-26 07:55:41 -08:00
Seth Alves
c21b8b4eac raise max mesh count for static collision entities from 500 to 1000 2017-03-26 08:48:08 -07:00
Seth Alves
90db9af2f9 Merge pull request #9978 from Triplelexx/fix-tablet-users-typo
fix myVisibility typo
2017-03-26 07:36:11 -08:00
Seth Alves
7455dcc2db Merge pull request #9985 from jherico/cmake_threads
Force thread linkage
2017-03-26 07:27:07 -08:00
Seth Alves
66f8e4063d Merge pull request #9984 from Atlante45/fix/warnings
Fix warnings
2017-03-26 07:03:33 -08:00
samcake
8b1a0be754 Merge pull request #9997 from jherico/ktx_cache_fix
Correctly initialize a file cache with the proper key
2017-03-25 09:58:32 -07:00
Sam Cake
ad5c78349a Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-03-25 09:57:28 -07:00
Anthony J. Thibault
5eddd232b0 Fix for change from std::string to QString 2017-03-24 17:03:01 -07:00
Anthony J. Thibault
49a95089d1 Remove hacks for debug rendering of IK targets
A AnimContext class was introduced.  This context is passed into every node during evaluation/overlay.
It holds non-animVar "global" data passed from the application.

(cherry picked from commit a028d3ba58)
2017-03-24 16:27:27 -07:00
Anthony J. Thibault
dd17b2e2f3 Added developer option to draw IK targets in world.
(cherry picked from commit 7e7803c648)
2017-03-24 16:20:52 -07:00
Anthony J. Thibault
f7de74109b Added jsdoc documentation for some of MyAvatar properties and methods 2017-03-24 15:10:26 -07:00
Stephen Birarda
3985354ff4 update graphic for oculus touch help with correct buttons 2017-03-24 13:45:56 -07:00
Brad Davis
82d502ae9f Correctly initialize a file cache with the proper key 2017-03-24 13:35:37 -07:00
Seth Alves
0d2e0eb9c3 Merge pull request #9994 from sethalves/avoid-deadlock-on-10k-mesh-fbx
Avoid deadlock on 10k mesh fbx
2017-03-24 12:34:37 -08:00
Brad Hefta-Gaub
9b26e8ee95 Merge pull request #9871 from Triplelexx/21208
21208 - Muted microphone indicator
2017-03-24 13:07:43 -07:00
Ryan Huffman
bb09dd9414 Merge pull request #9988 from huffman/fix/touch-detection-after-launch
Fix Oculus Touch + Remote not being detected after initial launch
2017-03-24 11:37:57 -07:00
Lexx
fa606446a7 remove cache buster 2017-03-24 18:27:38 +00:00
Seth Alves
aaa78d108b if a model has too many meshes, give up. 2017-03-24 11:17:24 -07:00
Seth Alves
e1e51614d9 don't hang loop if entity isDead 2017-03-24 11:16:54 -07:00
samcake
13b3809fe3 removing includes if possible 2017-03-24 11:04:52 -07:00
Clément Brisset
5ff7dbb254 Merge pull request #9991 from Atlante45/fix/entity-bad-url
Show entity bounding box for bad URLs
2017-03-24 10:56:06 -07:00
ZappoMan
52335e20a2 fix typo 2017-03-24 09:59:55 -07:00
ZappoMan
ddd0645453 fix merge issue 2017-03-24 09:59:11 -07:00
ZappoMan
84836d9331 fix typo that broke gun 2017-03-24 09:58:56 -07:00
samcake
a0488cfb91 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-03-24 09:41:09 -07:00
Brad Hefta-Gaub
1972b140b9 Merge pull request #9976 from mittens/21215
Worklist #21215 - Removing Duplicate Status Icons for Submeshes
2017-03-24 08:52:12 -07:00
ZappoMan
bc331af6a0 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-24 08:46:43 -07:00
Brad Hefta-Gaub
9a38b36f59 Merge pull request #9970 from Triplelexx/21223
21223 - Quat functions have naming inconsistencies
2017-03-24 08:12:11 -07:00
Brad Hefta-Gaub
aa1883ba85 Merge pull request #9979 from jherico/crash_fix
Fix crash in render-perf-test
2017-03-24 08:10:37 -07:00
Sam Cake
022e91b35d Clean comments and pixel format used 2017-03-24 00:26:14 -07:00
Sam Cake
83abbaa64a Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-03-23 21:55:30 -07:00
samcake
618344fe98 Fixing the bug regarding the numMIps allocated by GLBackend and breaking the HalfRezDepthTexture 2017-03-23 18:10:09 -07:00
Atlante45
4f8d9b190b Show green box when model entity has bad url 2017-03-23 17:56:33 -07:00