Andrew Meadows
d3ba00770f
merge upstream/master into andrew/ragdoll
2014-07-25 15:34:32 -07:00
Andrew Meadows
60612f6397
implement VerletPoint::integrateForward()
2014-07-25 15:23:12 -07:00
Andrew Meadows
b2c2cfec79
implement base Ragdoll::stepRagdollForward()
2014-07-25 15:22:25 -07:00
Clément Brisset
53b345d4cd
Merge pull request #3209 from AndrewMeadows/ragdoll
...
Ragdoll Part 5: send visible transforms when using ragdoll
2014-07-25 11:50:15 -07:00
AndrewMeadows
361ec5d1ee
Merge pull request #3204 from Barnold1953/jsBlendShapes
...
Exposed Avatar Blendshape control to JS
2014-07-25 09:40:48 -07:00
Philip Rosedale
a5d6b2282e
Merge pull request #3201 from wangyix/master
...
moved audio stats to own overlay; audio stats now reset when audiomixer is killed;
2014-07-24 21:40:43 -07:00
Philip Rosedale
9a83be618a
Merge pull request #3191 from Atlante45/make_scriptEngine_a_qScriptEngine
...
ScriptEngine now inherit from QScriptEngine
2014-07-24 21:38:13 -07:00
Philip Rosedale
e272d0be75
Merge pull request #3203 from Atlante45/laser_pointer_js
...
Laser pointer js
2014-07-24 17:28:08 -07:00
barnold1953
d5ea2de4ea
Merge branch 'master' of https://github.com/highfidelity/hifi into jsBlendShapes
2014-07-24 11:32:31 -07:00
barnold1953
9ac8b732f0
FIxed error on ubuntu
2014-07-24 10:32:34 -07:00
Andrew Meadows
2ddca4fbf9
split independent classes out of Ragdoll files
2014-07-24 09:50:16 -07:00
Andrew Meadows
924cc600b0
merge upstream/master into andrew/ragdoll
2014-07-23 18:03:09 -07:00
Andrew Meadows
7f2eb88fc2
merge upstream/master into andrew/ragdoll
2014-07-23 17:01:43 -07:00
Andrew Meadows
b62f04e9fe
check for nan's coming out of rotationBetween()
2014-07-23 16:51:53 -07:00
Andrew Meadows
c0e02107c5
minor cleanup
2014-07-23 16:51:26 -07:00
barnold1953
aba031a125
Proper blendshape JS api.
2014-07-23 16:25:45 -07:00
barnold1953
ba9d896856
Revert "Added FacialAnimationData class"
...
This reverts commit fc9fb11e4f
2014-07-23 15:54:47 -07:00
barnold1953
7c89201ce8
Revert "Moved some FaceShift stuff to FacialAnimationData. Made use of"
...
This reverts commit f3ae228030
2014-07-23 15:54:45 -07:00
barnold1953
6aa9e6b736
Revert "Ability to modify AC avatar blendshapes from JS"
...
This reverts commit 512034fd7c
2014-07-23 15:54:40 -07:00
wangyix
a36c9e872e
merged with upstream
2014-07-23 15:36:37 -07:00
barnold1953
512034fd7c
Ability to modify AC avatar blendshapes from JS
2014-07-23 15:23:27 -07:00
Thijs Wenker
49fcd302f4
AbstractControllerScriptingInterface matches ControllerScriptingInterface
2014-07-24 00:16:00 +02:00
Atlante45
0d039b1cdb
Fixed invokeMethod bug + removed debug
2014-07-23 14:38:37 -07:00
Atlante45
cc2bc1ef78
Merge branch 'master' of https://github.com/highfidelity/hifi into make_scriptEngine_a_qScriptEngine
2014-07-23 14:01:58 -07:00
wangyix
4a4d065f00
another parseData change
2014-07-23 12:06:31 -07:00
wangyix
849c489b4c
removed warnings about parseData() overloading in ringbuffer classes
2014-07-23 11:20:30 -07:00
Thijs Wenker
b6cb19c2f6
FEATURE: Allows detecting simulated cursors in JS, this allows JS-developers to track all cursors separately. By using the deviceID. (deviceID 0 = default mouse-cursor , 1500 and 1501 hydra cursors)
2014-07-23 16:55:59 +02:00
barnold1953
f3ae228030
Moved some FaceShift stuff to FacialAnimationData. Made use of
...
FacialAnimationData
2014-07-22 13:46:29 -07:00
barnold1953
fc9fb11e4f
Added FacialAnimationData class
2014-07-22 11:56:19 -07:00
Atlante45
17a6a72bdd
ScriptEngine now inherit from QScriptEngine
2014-07-22 11:39:49 -07:00
Brad Hefta-Gaub
01ebefbffd
Merge pull request #3189 from wangyix/master
...
Made Audio.cpp always push a whole number of frames to the audio output; added audio input buffer stats to interface
2014-07-21 17:46:42 -07:00
wangyix
621f0725cc
added input ring buffer stats to interface
2014-07-21 15:39:33 -07:00
Atlante45
029160a60a
Merge branch 'master' of https://github.com/highfidelity/hifi into laser_pointer_js
2014-07-21 14:12:17 -07:00
Andrew Meadows
b21bac25a1
bug fix for broken seams in models
...
don't hijack the "weight" variable because it's used elsewhere
2014-07-21 13:41:41 -07:00
Atlante45
35caef1882
Added pointing behaviour
2014-07-18 15:39:12 -07:00
Philip Rosedale
e8539d0006
Merge pull request #3181 from birarda/master
...
foundation of support for signed transactions from interface
2014-07-17 16:03:28 -07:00
Philip Rosedale
1b265f3adb
Merge pull request #3180 from AndrewMeadows/ragdoll
...
Ragdoll Part4: ragdoll shapes follow target joints, visible joints follow ragdoll shapes
2014-07-17 16:00:02 -07:00
Andrew Meadows
58e31abf60
improved collision shapes for fingers
2014-07-17 14:31:16 -07:00
Stephen Birarda
5cad6edb38
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-17 14:06:11 -07:00
Andrew Meadows
53ee5f2340
minor cleanup around measurements of joint radius
2014-07-17 12:42:18 -07:00
Brad Hefta-Gaub
437e3efbc2
Merge pull request #3179 from wangyix/quick_audio_PR
...
Lost audio packets are replaced with silent frames in AudioMixer; AudioMixer silent-packet-dropping now enabled no matter what; Moving avg of audio frames available replaces _currentJitterBufferFrames
2014-07-17 11:44:05 -07:00
Stephen Birarda
45ae9f614d
add dialog to Menu to insert wallet private key
2014-07-17 11:43:30 -07:00
Stephen Birarda
0c8c4a2cf9
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-17 11:08:35 -07:00
Andrew Meadows
b22652f441
merge upstream/master into andrew/ragdoll
2014-07-17 10:52:27 -07:00
Andrew Meadows
66158cb8a2
fix capsule-vs-capule collision test
2014-07-17 09:19:17 -07:00
Brad Hefta-Gaub
87ff6b9012
Merge pull request #3178 from Atlante45/activity_logger_on_off_option
...
Activity logger on off option
2014-07-17 08:53:47 -07:00
Brad Hefta-Gaub
d8d6d08958
Merge pull request #3145 from samcake/19734
...
19734 - Leapmotion support
2014-07-17 08:45:55 -07:00
wangyix
e557ba8052
removed space
2014-07-16 18:06:55 -07:00
wangyix
8775d22765
re-added calculated desired frames to domain page stats
2014-07-16 17:44:49 -07:00
wangyix
397e6c8b13
renamed a function
2014-07-16 17:34:48 -07:00
