Commit graph

52939 commits

Author SHA1 Message Date
volansystech
7e0efed062 Improve speed of grabbing. 2017-04-18 00:54:01 +05:30
volansystech
7bc3435cfa Initial Commit..
If distanceToObject from avatar is more than 15, we are accelarting entity travel by 2x.
This will help user to grab the entity in lesser time.
2017-04-13 02:51:30 +05:30
Andrew Meadows
76ef2b5d9f Merge pull request #10059 from ZappoMan/addKinectHandRotation
some more kinect work
2017-03-30 11:05:44 -07:00
samcake
73a8ec3e72 Merge pull request #10068 from kencooke/audio-debugbuild-fix
Fix the crash in Debug builds
2017-03-30 10:12:37 -07:00
David Kelly
348674a267 Merge pull request #10034 from davidkelly/dk/avatarEntityIssue
bad serialization of Avatar Entity parentID
2017-03-30 10:12:19 -07:00
Ken Cooke
69863dd735 Fix the crash in Debug builds, caused by undeclared metatype for AudioInjector* 2017-03-30 08:52:04 -07:00
Seth Alves
5375b87297 Merge pull request #10058 from hyperlogic/bug-fix/toolbar-hiding-woes
Fix for disappearing toolbar after reload all scripts
2017-03-29 16:04:37 -07:00
ZappoMan
047a3b8d71 add debugging 2017-03-29 14:51:42 -07:00
ZappoMan
a4d1db1aeb tweak 2017-03-29 14:40:47 -07:00
ZappoMan
4ed5219b57 add a sample script to drive feet 2017-03-29 14:36:27 -07:00
Anthony J. Thibault
332dfa098f Fix for disappearing toolbar after reload all scripts 2017-03-29 14:10:26 -07:00
ZappoMan
6f2f80e334 make sure kinect plugin debugging setting is actually saved and loaded 2017-03-29 14:06:11 -07:00
Andrew Meadows
985924a476 Merge pull request #10040 from ZappoMan/addKinectHandRotation
add support for hand rotations to the kinect plugin
2017-03-29 10:25:04 -07:00
Seth Alves
63ccaee129 Merge pull request #10048 from ctrlaltdavid/open-feed-in-tablet
Open feed in tablet after sharing snapshot from tablet
2017-03-29 10:08:51 -07:00
samcake
8fd413e7c3 Merge pull request #10037 from highfidelity/revert-10036-revert-10020-ktx_refactor
Don't hold KTX files open for longer than transfers require
2017-03-29 10:02:33 -07:00
Andrew Meadows
b69073a872 Merge pull request #10042 from samcake/blue
Clean up the utilities scrips of the render folder
2017-03-29 08:39:21 -07:00
David Rowe
c618e8e001 Open feed in tablet after sharing snapshot from tablet 2017-03-29 16:52:52 +13:00
Anthony Thibault
069ebaedf0 Merge pull request #10021 from huffman/fix/agent-animation-cache
Add AnimationCache to agent scripts
2017-03-28 20:15:21 -07:00
ZappoMan
9d3e8818f7 fix build 2017-03-28 18:49:36 -07:00
ZappoMan
80fb7bc287 add extra debugging to the kinect plugin 2017-03-28 18:42:15 -07:00
ZappoMan
a659b73edf Merge branch 'master' of https://github.com/highfidelity/hifi into addKinectHandRotation 2017-03-28 18:36:42 -07:00
Anthony Thibault
aea5cf0ac0 Merge pull request #10045 from hyperlogic/feature/ac-avatar-translation
Added translation support to AC avatar animations.
2017-03-28 18:09:26 -07:00
Anthony J. Thibault
e100e3d19b made UNIT_SCALE const 2017-03-28 17:34:15 -07:00
Anthony J. Thibault
ecc31802b8 Added translation support to AC avatar animations. 2017-03-28 17:23:36 -07:00
Seth Alves
8dcbf33e16 Merge pull request #10041 from druiz17/tablet-improve-goto
added left out design elements to the tablet goto page
2017-03-28 17:19:50 -07:00
Seth Alves
22a6e669b4 Merge pull request #10043 from sethalves/fix-polyvox-shader
fix polyvox shader
2017-03-28 16:45:42 -07:00
Seth Alves
6080c4782a fix polyvox shader 2017-03-28 16:44:31 -07:00
samcake
a03d3a1ca8 Clean up the utilities scrips of the render folder 2017-03-28 16:00:18 -07:00
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
Brad Hefta-Gaub
692dc75977 Merge pull request #10025 from ZappoMan/improvedKinectCmake
add the default environment variable name for the kinect plugin to the search hints
2017-03-28 15:07:56 -07:00
Dante Ruiz
a76e5ef8d9 improve the design of the tablet goto 2017-03-28 23:02:23 +01:00
samcake
a1bf1beab4 Merge pull request #10014 from samcake/blue
Fixing the roughness/reflection quantization bug
2017-03-28 14:50:24 -07:00
Seth Alves
4516ddf855 Merge pull request #9847 from highfidelity/tablet-ui
Tablet ui
2017-03-28 14:48:02 -07:00
samcake
a2b2e3e169 Revert "Revert "Don't hold KTX files open for longer than transfers require"" 2017-03-28 14:45:04 -07:00
samcake
78cab8ed5c Merge pull request #10036 from highfidelity/revert-10020-ktx_refactor
Revert "Don't hold KTX files open for longer than transfers require"
2017-03-28 14:06:37 -07:00
samcake
08e1a2ba4c Revert "Don't hold KTX files open for longer than transfers require" 2017-03-28 14:06:09 -07:00
samcake
e42cb52bd1 Merge pull request #10020 from jherico/ktx_refactor
Don't hold KTX files open for longer than transfers require
2017-03-28 14:06:02 -07:00
Andrew Meadows
49b3fc8674 Merge pull request #10015 from sethalves/model-scripting-2
model/mesh scripting
2017-03-28 12:53:16 -07:00
Andrew Meadows
b9e80d3fa5 Merge pull request #9972 from kunalgosar/marketsBug
Fixed buttons on Marketplace
2017-03-28 12:45:25 -07:00
Andrew Meadows
e22d825d07 Merge pull request #9989 from birarda/bullet-rel-with-debug
fix fresh MinSizeRel and RelWithDebugInfo builds
2017-03-28 12:35:24 -07:00
Seth Alves
45e83906e7 Merge pull request #10035 from sethalves/tablet-ui
Tablet ui - merge from upstream
2017-03-28 11:42:55 -07:00
Seth Alves
6df4dda746 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-28 11:42:14 -07:00
Seth Alves
8e38b41e44 Merge branch 'tablet-ui' of github.com:sethalves/hifi into tablet-ui 2017-03-28 11:41:58 -07:00
Seth Alves
851ea7dabc fix initial finger/stylus setting 2017-03-28 11:41:51 -07:00
David Kelly
4b40633104 oops damn space 2017-03-28 11:22:18 -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
Seth Alves
1cf6945bf2 pass radials argument to AABox::touchesAAEllipsoid as const reference 2017-03-28 11:12:00 -07:00
Seth Alves
9789476a73 handle case where AAEllipsoid is entirely inside the AABox 2017-03-28 10:57:03 -07:00
Seth Alves
6f6343420c don't crash if entity dimensions somehow include a zero 2017-03-28 10:56:33 -07:00
Seth Alves
54a843ee90 Merge pull request #10033 from druiz17/tablet-help-script
Remove help button from the tablet when reloading scripts
2017-03-28 10:19:14 -07:00