Stojce Slavkovski
|
939f8c49de
|
return balance in satoshis
|
2014-06-08 15:55:16 +02:00 |
|
Stojce Slavkovski
|
b3279e03ca
|
references fix
|
2014-06-07 23:27:51 +02:00 |
|
Stojce Slavkovski
|
8de2bdfb99
|
expose account details via AccountScriptingInterface
|
2014-06-07 23:17:49 +02:00 |
|
Stojce Slavkovski
|
6365f6b857
|
Extend TextOverlay to accept font size
Fix TextRenderer color rendering
|
2014-06-07 22:24:35 +02:00 |
|
Stojce Slavkovski
|
9810335adf
|
Merge branch 'master' of https://github.com/worklist/hifi into 19755
|
2014-06-07 10:33:41 +02:00 |
|
Stojce Slavkovski
|
fea1433ced
|
Add initial mybalance script
|
2014-06-07 10:32:36 +02:00 |
|
Stephen Birarda
|
b6b148cd9f
|
resolve conflicts on merge with upstream master
|
2014-06-06 11:31:16 -07:00 |
|
Stephen Birarda
|
f6011b65d7
|
fix input loudness for a stereo source
|
2014-06-06 11:26:04 -07:00 |
|
Stephen Birarda
|
ae2f6a3cb6
|
complete piping of stereo audio through mixer
|
2014-06-06 10:55:04 -07:00 |
|
Stephen Birarda
|
681ce247d6
|
tweak resample to handle 48 to 24 stereo, add stereo/mono byte
|
2014-06-06 10:27:59 -07:00 |
|
Stephen Birarda
|
7da091d2b4
|
initial hooks for stereo audio
|
2014-06-06 10:15:09 -07:00 |
|
Andrew Meadows
|
c689d826f4
|
fix for broken windows build with PrioVR libs
The Model API changed but this code path was not updated.
|
2014-06-05 15:48:18 -07:00 |
|
Clément Brisset
|
02452819c3
|
Merge pull request #2988 from AndrewMeadows/ragdoll
RagDoll Part 1: basic data structure
|
2014-06-05 14:44:36 -07:00 |
|
Andrzej Kapolka
|
8d908a12a3
|
Fix build.
|
2014-06-05 12:28:02 -07:00 |
|
barnold1953
|
f0f7d0c55f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay
Conflicts:
interface/src/ui/ApplicationOverlay.cpp
|
2014-06-05 12:17:09 -07:00 |
|
Andrew Meadows
|
4eb801b8e9
|
merge upstream/master into andrew/ragdoll
|
2014-06-05 11:32:18 -07:00 |
|
Andrew Meadows
|
1b2cd2e144
|
adding RagDoll scaffold
|
2014-06-05 11:07:35 -07:00 |
|
barnold1953
|
4e699c0f84
|
Fixed coding standard and build error
|
2014-06-05 10:34:06 -07:00 |
|
Andrzej Kapolka
|
47c71e2d3a
|
Merge pull request #2983 from PhilipRosedale/master
Added squeezeHands.js for open/close hand animation with controller trigger
|
2014-06-04 17:35:43 -07:00 |
|
barnold1953
|
84cd200617
|
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay
|
2014-06-04 17:33:04 -07:00 |
|
barnold1953
|
e60c671c05
|
Switched Oculus UI to hemisphere. Added curved semicircle UI
|
2014-06-04 17:24:20 -07:00 |
|
Philip Rosedale
|
864db25f4f
|
remove unused variables causing warning
|
2014-06-04 15:43:33 -07:00 |
|
Andrew Meadows
|
7807388b08
|
merge upstream/master into andrew/inertia
Conflicts:
interface/src/renderer/Model.cpp
|
2014-06-04 14:28:23 -07:00 |
|
Andrew Meadows
|
e1cb88471f
|
add a comment
|
2014-06-04 14:19:45 -07:00 |
|
Andrew Meadows
|
f19b562e88
|
add JointState::setRotation(rotModelFrame)
|
2014-06-04 14:17:39 -07:00 |
|
Andrew Meadows
|
212ac13802
|
setRotation -> setJointRotationFromBindFrame
|
2014-06-04 14:10:28 -07:00 |
|
Andrew Meadows
|
323fa70cf3
|
remove last of "InModelFrame" qualifiers
|
2014-06-04 14:03:29 -07:00 |
|
Andrew Meadows
|
ccfd620c84
|
setJointPositionInModelFrame -> setJointPosition
|
2014-06-04 13:56:37 -07:00 |
|
Andrew Meadows
|
3af4b1b333
|
getJointPositionInModelFrame -> getJointPosition
|
2014-06-04 13:51:43 -07:00 |
|
Andrew Meadows
|
971268d4f2
|
setRotationInModelFrame -> setRotation
|
2014-06-04 13:46:08 -07:00 |
|
Andrew Meadows
|
b3cabb8156
|
applyRotationDeltaInModelFrame -> applyRotationDelta
|
2014-06-04 13:43:15 -07:00 |
|
Andrew Meadows
|
d8f5e10947
|
getPositionInModelFrame -> getPosition
|
2014-06-04 13:36:54 -07:00 |
|
Andrew Meadows
|
4a3fbfcdee
|
getRotationInModelFrame -> getRotation
|
2014-06-04 13:34:58 -07:00 |
|
Andrew Meadows
|
4ae58153e0
|
computeTransformInModelFrame -> computeTransform
|
2014-06-04 13:31:31 -07:00 |
|
Andrew Meadows
|
d32e14ca04
|
renames of JointState data members
|
2014-06-04 13:27:28 -07:00 |
|
Andrew Meadows
|
b1b7f6bdc4
|
remove last world-frame transfoms from JointState
|
2014-06-04 12:03:01 -07:00 |
|
Andrew Meadows
|
d46a90d763
|
remove JointState::_combinedRotation
instead use JointState::_rotationInModelFrame
|
2014-06-04 11:56:20 -07:00 |
|
Andrew Meadows
|
19f0f453a5
|
remove JointState::setRotation()
instead use JointState::setRotationInModelFrame()
|
2014-06-04 11:52:07 -07:00 |
|
Andrzej Kapolka
|
f6395435cf
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-06-04 11:51:11 -07:00 |
|
Andrzej Kapolka
|
74afcf5626
|
Allow floating point start/end frames and negative play speeds.
|
2014-06-04 11:47:53 -07:00 |
|
Andrew Meadows
|
5d8e3d447a
|
remove JointState::getRota/PositionInWorldFrame()
instead: use getRotat/PositionInModelFrame() and do math
|
2014-06-04 11:36:00 -07:00 |
|
Andrew Meadows
|
729c01ddbf
|
remove more getHybridTransform() calls
|
2014-06-04 11:25:38 -07:00 |
|
Andrew Meadows
|
30d936c15b
|
getJointPosition -> getJointPositionInWorldFrame
|
2014-06-04 10:52:10 -07:00 |
|
Andrew Meadows
|
14e782e439
|
remove some JointState::getHybridTransform() calls
|
2014-06-04 10:42:04 -07:00 |
|
Andrew Meadows
|
d3f51fe38e
|
FinalOrientation -> FinalOrientationInWorldFrame
|
2014-06-04 10:41:17 -07:00 |
|
Andrew Meadows
|
aea517af46
|
fix for partial hand restore after hydra inactive
|
2014-06-04 10:19:27 -07:00 |
|
barnold1953
|
edf5d5bda1
|
Fixed bug that disabled cursor for windows
|
2014-06-04 08:38:01 -07:00 |
|
barnold1953
|
d4fd1e9515
|
Stopped Oculus UI from glowing.
|
2014-06-03 16:01:47 -07:00 |
|
Andrew Meadows
|
a1afcfd42c
|
remove JointState::applyRotationDelta()
(use JointState::applyRotationDeltaInModelFrame()) instead)
|
2014-06-03 15:57:16 -07:00 |
|
Andrew Meadows
|
7f46e9d514
|
remove JointState::getJointRotation()
(use getRotationModelFrame() instead)
|
2014-06-03 15:42:38 -07:00 |
|