Commit graph

8324 commits

Author SHA1 Message Date
Andrew Meadows
aa1a7307cc use Ragdoll::_accumulatedMovement to move MyAvatar 2014-08-18 12:53:34 -07:00
Andrew Meadows
7e7978de1a compute and store Ragdoll::_accumulatedMovement 2014-08-18 12:53:04 -07:00
Andrew Meadows
3e2095332f make SkeletonRagdoll::updateMuscles() protected 2014-08-18 12:50:07 -07:00
Andrew Meadows
60d411ead5 cleanup Ragdoll API (less "ragdoll" qualifiers) 2014-08-14 14:41:51 -07:00
Andrew Meadows
46c91052c9 split SkeletonModel and Ragdoll classes apart 2014-08-14 14:29:03 -07:00
Andrew Meadows
ca4a23e532 use "visible joint positions" for MyAvatar only 2014-08-14 09:21:15 -07:00
Andrew Meadows
7852321152 merge upstream/master into andrew/ragdoll 2014-08-13 14:52:14 -07:00
Andrew Meadows
3d107cc7e5 less variability in verlet simulation loop count 2014-08-13 14:51:16 -07:00
Stephen Birarda
4dce4c4919 link to ws2_32.lib if LibOVR is being linked to 2014-08-12 15:23:12 -07:00
Stephen Birarda
4bf7bbe0df if enable VR mode is re-checked then attempt to re-connect to Oculus 2014-08-12 15:20:04 -07:00
Stephen Birarda
00087e81d8 remove a line of debug that shouldn't have made its way in 2014-08-12 14:44:49 -07:00
Stephen Birarda
a8e17e19a4 resolve conflicts on merge with upstream master 2014-08-12 14:43:30 -07:00
Stephen Birarda
1b5c229dd6 Merge pull request #3273 from PhilipRosedale/master
Fix bug with first person camera being laggy when flying
2014-08-12 14:42:07 -07:00
Philip Rosedale
9933c011d7 Remove filtered eye position from head 2014-08-12 14:31:40 -07:00
Leonardo Murillo
e12cf9015f Merge pull request #3271 from birarda/take-out-the-trash
allow CL specific that an optional external be required
2014-08-12 14:30:17 -07:00
Philip Rosedale
a68af15b82 DDE Face tracker tweaks to start adding long term averaging 2014-08-12 14:26:14 -07:00
Stephen Birarda
75aedae300 integration of positional tracking with DK2 2014-08-12 14:12:13 -07:00
Thijs Wenker
4ff7ff61e8 OSX compatibility with SDK 0.4.1 2014-08-12 13:25:22 +02:00
Thijs Wenker
87abc6b66a Merge branch 'master' of https://github.com/worklist/hifi 2014-08-12 13:17:32 +02:00
Philip Rosedale
0e72c6a0b6 Merge pull request #3269 from ey6es/metavoxels
Script access for heightfield heights, ray intersection against heightfields, basic color and height brush tools.
2014-08-12 00:40:14 -07:00
Andrew Meadows
2918feddf0 reduce acceptable error for ragdoll simulation 2014-08-11 14:51:42 -07:00
AndrewMeadows
0650169c25 Merge pull request #3270 from chansensturm/audio-filter
Added support for biquad, parametric, and multi-band filter eq
2014-08-11 12:22:40 -07:00
Stephen Birarda
cadfaab770 fix order now that I know my ABCs 2014-08-11 09:58:21 -07:00
Stephen Birarda
2469d958d6 include CoreFoundation for Audio.cpp defaultAudioDeviceForMode 2014-08-11 09:57:13 -07:00
Stephen Birarda
405e79fe6d allow command line specification that an external be required 2014-08-11 09:51:36 -07:00
AndrewMeadows
e5c2a099b8 Merge pull request #3268 from birarda/take-out-the-trash
cmake (in)sanity
2014-08-11 09:15:38 -07:00
Craig Hansen-Sturm
481108ecd1 added support for biquad, parametric, and multi-band filter eq 2014-08-10 22:47:27 -07:00
Andrzej Kapolka
18256a657e Removed unused uniform. 2014-08-08 14:25:02 -07:00
Andrzej Kapolka
b7910cfe74 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-08 14:20:38 -07:00
Andrzej Kapolka
468a3d4d67 Bump up the packet version. 2014-08-08 14:18:32 -07:00
Andrzej Kapolka
768410ca0b A couple comments, let right mouse button decrease height. 2014-08-08 14:14:35 -07:00
Andrzej Kapolka
e24ff0130f Basic color/height painting. 2014-08-08 14:10:44 -07:00
Stephen Birarda
d5b1bee13c resolve conflicts on merge with upstream master 2014-08-08 13:48:32 -07:00
Stephen Birarda
2badf9ab1a don't quote linked ZLIB and OpenSSL libs for interface 2014-08-08 13:42:07 -07:00
Stephen Birarda
a99b19d28a make Qt5 and ZLIB required finds, add OpenSSL to interface 2014-08-08 13:17:54 -07:00
Stephen Birarda
b1310c065c remove TARGET_NAME from cmake macros where it is not required 2014-08-08 13:17:54 -07:00
Stephen Birarda
e4d01d269c use shared dependency linking macro in hifi projects 2014-08-08 13:17:54 -07:00
Stephen Birarda
17df6484d4 remove ssize_t and replace with size_t or int where appropriate 2014-08-08 13:17:53 -07:00
Stephen Birarda
1a71d655b9 more cmake cleanup to remove ROOT_DIR passing 2014-08-08 13:17:53 -07:00
Stephen Birarda
87cf262b9e get to successful cmake after library link macro changes 2014-08-08 13:17:53 -07:00
Stephen Birarda
31488e72fe repairs for interface build to succeed 2014-08-08 13:17:53 -07:00
Stephen Birarda
892e30c5e1 get past assignment-client build after cmake auditing 2014-08-08 13:17:53 -07:00
Stephen Birarda
9a50532b1f bubble up sub dependencies to link_hifi_library 2014-08-08 13:17:52 -07:00
Stephen Birarda
45afce48f7 remember old session UUID in AvatarHashMap to work around ghosting 2014-08-08 13:14:03 -07:00
Andrzej Kapolka
b7b1b018ee No need to use a texture for the cursor; we can just use a fragment shader. 2014-08-08 11:24:57 -07:00
Andrew Meadows
2286eae64a head connects to neck during ragdoll simulation 2014-08-08 10:53:38 -07:00
Andrew Meadows
05318acc7f don't make shapes for joints with zero radius 2014-08-08 08:37:28 -07:00
Andrew Meadows
bcb0cb2c3c fix bug: variable should be float rather than int 2014-08-08 08:26:25 -07:00
Andrew Meadows
5de762361a remove cleanup of Model::_jointStates tree
the cleanup causes crashes and broken models
2014-08-08 08:20:42 -07:00
Andrzej Kapolka
6930174a9e Hide the cursor when the mouse pointer is hidden. 2014-08-07 18:30:33 -07:00