Commit graph

46521 commits

Author SHA1 Message Date
Andrew Meadows
61a05eb4d1 failed experiment for getting hip lean over table 2016-09-16 10:16:18 -07:00
Andrew Meadows
20418d5f58 fix hips sweep test 2016-09-15 18:39:57 -07:00
Andrew Meadows
7f381ac4c4 remove unused variables 2016-09-15 15:33:04 -07:00
Andrew Meadows
83157b573a measure max hips offset and clamp it in IK 2016-09-15 14:55:04 -07:00
Andrew Meadows
5c3da41067 fix windows build 2016-09-15 14:54:03 -07:00
Andrew Meadows
d94d721fda Merge pull request #8595 from hyperlogic/out-of-body-experience
ramp support with comfort mode option
2016-09-15 14:36:51 -07:00
Anthony J. Thibault
d51898f60d Merge branch 'out-of-body-experience' of github.com:highfidelity/hifi into out-of-body-experience 2016-09-15 14:23:38 -07:00
Anthony Thibault
530fb18108 Merge pull request #8605 from AndrewMeadows/oobe
add kinematic character controller to enable physics sweep tests near avatar
2016-09-15 14:16:24 -07:00
Andrew Meadows
821570fa76 fix Windows build and minor format/namechange 2016-09-15 09:32:03 -07:00
Andrew Meadows
d444603a54 simplified Aabb management for GhostObject 2016-09-14 14:57:47 -07:00
Andrew Meadows
418271e06b ghost tracks the collision group 2016-09-14 11:49:00 -07:00
Andrew Meadows
f5c5c68937 adding kinematic character controller demo 2016-09-14 11:43:52 -07:00
Anthony J. Thibault
bc130eaf26 ramp support with comfort mode option 2016-09-13 16:26:10 -07:00
Anthony J. Thibault
0fde3a2d76 Fix for TRUNCATE_IK_CAPSULE globals 2016-09-13 10:26:38 -07:00
Anthony J. Thibault
362e185098 Revert "When out-of-body have your avatar face toward your HMD."
This reverts commit ffb1bae1f0.
2016-09-13 09:54:19 -07:00
Andrew Meadows
09c4720665 fix typo in teleport.js 2016-09-12 16:35:52 -07:00
Andrew Meadows
9728cf6904 fix typos in teleport.js 2016-09-12 16:24:08 -07:00
Andrew Meadows
0d300c3a47 teleport.js drags avatar along 2016-09-12 16:24:08 -07:00
Andrew Meadows
954d690b8a expose setting avatar collisionless 2016-09-12 16:24:08 -07:00
Anthony J. Thibault
ffb1bae1f0 When out-of-body have your avatar face toward your HMD. 2016-09-12 16:20:13 -07:00
Anthony J. Thibault
baee5180c1 Moved outOfBody detection into MyAvatar::FollowHelper
in preparation for different follow behavior for in-body and out-of-body.
2016-09-12 11:52:27 -07:00
Anthony J. Thibault
5e0c2286ec Use OUTOFBODY_HACK as searchable token 2016-09-12 10:58:06 -07:00
Andrew Meadows
28d1faa1c0 remove unused variable 2016-09-12 09:10:11 -07:00
Anthony J. Thibault
49cac31b6c Truncate IK Targets 2016-09-09 17:33:02 -07:00
Anthony J. Thibault
86351ca21c Teleport bugs
* made HMD.setPosition thread safe
* changed script to use HMD.position = foo;
2016-09-09 17:32:02 -07:00
Andrew Meadows
82522fbbb1 fix C++ism typo in JS script 2016-09-09 16:40:07 -07:00
Andrew Meadows
6b9cdb440b update teleport.js to teleport HMD before avatar
(in theory, not tested)
2016-09-09 16:33:13 -07:00
Andrew Meadows
97623f489c expose setting HMD sensorToWorld from JS script 2016-09-09 16:32:57 -07:00
Andrew Meadows
0f248c4540 expose MyAvatar::setSensorToWorldMatrix() 2016-09-09 16:31:36 -07:00
Anthony J. Thibault
7e7803c648 Added developer option to draw IK targets in world. 2016-09-09 12:50:34 -07:00
Andrew Meadows
bc56df0be1 out-of-body with reduced recovery speeds 2016-09-08 14:31:31 -07:00
Brad Hefta-Gaub
a40a9f1d73 Merge pull request #8575 from kencooke/neon_optimization
Added ARM NEON optimized audio sample rate conversion
2016-09-08 09:58:47 -07:00
Brad Hefta-Gaub
3824c1e196 Merge pull request #8469 from kencooke/low-latency-audio
Low-latency audio
2016-09-07 09:49:09 -07:00
Ken Cooke
9457d49103 Merge branch 'master' of https://github.com/highfidelity/hifi into low-latency-audio 2016-09-06 20:56:20 -07:00
Leonardo Murillo
54af969bbf Merge pull request #8405 from SamGondelman/qt5.6
Update to Qt 5.6.1
2016-09-06 19:30:16 -06:00
Brad Davis
9d057233c6 Fixing rebase 2016-09-06 17:40:48 -07:00
Marko Kudjerski
da5f7912b5 fixed Info.plist setup for Components.app 2016-09-06 17:40:47 -07:00
SamGondelman
62edaf0ec9 commit for marko to look at later 2016-09-06 17:40:46 -07:00
Marko Kudjerski
930afad49c comment fix 2016-09-06 17:40:45 -07:00
Marko Kudjerski
b8da976123 added Info.plist to Components.app so that macdeployqt from Qt 5.6 doesn't throw a segfault 2016-09-06 17:40:45 -07:00
SamGondelman
544606bccc cmake fix 2016-09-06 17:40:44 -07:00
SamGondelman
74e5814a48 try to fix rpath issue 2016-09-06 17:40:43 -07:00
SamGondelman
7e0ad52cd5 updated build instructions to use official qt release instead of homebrew 2016-09-06 17:38:48 -07:00
SamGondelman
8a4d48ca8d set browserProfile now that Qt bug is fixed 2016-09-06 17:38:47 -07:00
SamGondelman
99176588cc remove old webwindowclass that relied on qwebkit 2016-09-06 17:36:59 -07:00
SamGondelman
7f2476f0f8 put pack macdeployqt call, but still removed qtwebprocess 2016-09-06 17:36:58 -07:00
SamGondelman
038aba20e4 disable dropshadows if unsupported (OSX and AMD cards) 2016-09-06 17:36:57 -07:00
SamGondelman
c993a6b818 try removing windows hack 2016-09-06 17:36:56 -07:00
SamGondelman
2db02fdde1 remove QtWebProcess hack on OSX 2016-09-06 17:36:56 -07:00
SamGondelman
88d0aa3737 removed showButtonDown, which didn't exist 2016-09-06 17:36:55 -07:00