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
Stephen Birarda
cb9a2c615e
use OpenSSL to create signed wallet transaction using hard-code key
2014-07-16 15:44:49 -07:00
wangyix
6764ace8eb
droppable silent packets are added for dropped packets;
...
_currentJitterBufferFrames replaced with moving average of frames
available. Downstream framesAvailable stat now includes the frames in
QAudioOutput as well as the ringbuffer.
2014-07-16 14:41:24 -07:00
Stephen Birarda
74a107f9f4
initial rev of SignedWalletTransaction that creates a message
2014-07-16 12:26:24 -07:00
Atlante45
5dca794322
On/Off for activity logger
2014-07-16 12:22:27 -07:00
barnold1953
4483c7dc6b
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK
2014-07-16 11:24:32 -07:00
Andrew Meadows
922912b784
merge upstream/master into andrew/ragdoll
...
Conflicts:
interface/src/Menu.h
2014-07-16 09:00:36 -07:00
Andrzej Kapolka
3be00b972d
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-15 18:11:54 -07:00
Andrzej Kapolka
2d4134afaf
Provide basic conversions to/from SharedObjectPointer (still have to work out
...
how to handle reference counting correctly).
2014-07-15 17:58:31 -07:00
Andrzej Kapolka
a13d8559e6
Better scoping.
2014-07-15 16:55:52 -07:00
Andrzej Kapolka
ce0210bf04
The weak shared object hash can be accessed by multiple threads, so it must
...
be locked.
2014-07-15 16:52:17 -07:00
Andrzej Kapolka
469e31cc05
Script bindings for QColor.
2014-07-15 16:44:02 -07:00
Andrzej Kapolka
ebcb8d00d6
Unfortunately, the early test for subdivision doesn't work, which means that,
...
for now, we need to traverse the entire tree to find subdivided nodes. To be
revisited.
2014-07-15 15:47:31 -07:00
Brad Hefta-Gaub
8128214144
Merge pull request #3172 from wangyix/quick_audio_PR
...
removed SIMD instructions in AudioMixer; removed IsNaN check for _nextOutputTrailingLoudness
2014-07-15 15:20:13 -07:00
Andrzej Kapolka
e2c8bdbdbe
Create new nodes on subdivision.
2014-07-15 13:22:50 -07:00
wangyix
871aa2790a
forgot unused variable
2014-07-15 12:24:28 -07:00
wangyix
828410b7d6
removed isNan check for _nextOutputTrailingLoudness
2014-07-15 12:23:54 -07:00
wangyix
a1b2bf59e9
disabled SIMD adds in AudioMixer for windows
2014-07-15 12:23:02 -07:00
Andrzej Kapolka
1f5922fa67
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-15 11:55:47 -07:00
barnold1953
b339e9c2af
Added getVoxelEnclosingPointBlocking and improved sand script
2014-07-15 11:44:59 -07:00
ZappoMan
0068428c7c
fixed some warnings
2014-07-15 10:41:29 -07:00
Andrzej Kapolka
9d55100087
Merge (but don't clear redundant nodes) after reading subdivisions.
2014-07-15 09:31:23 -07:00
Andrzej Kapolka
60e8c12d4b
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-15 09:25:36 -07:00
Brad Hefta-Gaub
12f8cfbb67
Merge pull request #3167 from Atlante45/typed_arrays
...
Typed arrays
2014-07-15 08:31:02 -07:00
Brad Hefta-Gaub
dcd3110266
Merge pull request #3166 from wangyix/quick_audio_PR
...
Made audio timegap stats more readable with varying units; Fixed AudioMixer NaN error on WIndows;
2014-07-15 08:28:48 -07:00
Clément Brisset
529fa50025
Merge pull request #3169 from murillodigital/master
...
Adding place/user go to logging
2014-07-14 16:41:44 -07:00
wangyix
1047ec7c87
merge with upstream
2014-07-14 16:25:26 -07:00
Andrzej Kapolka
e32bab5b04
Beginnings of some metavoxel scriptability, to create some test landscapes.
2014-07-14 14:32:55 -07:00
Leonardo Murillo
6bf06989db
Adding place/user go to logging
2014-07-14 15:24:47 -06:00
Aleric Inglewood
935f28aa35
Type fix. That that even compiled :/
2014-07-14 21:18:37 +02:00
Atlante45
afa43a9d7e
Fix win build fail
2014-07-14 11:06:10 -07:00
Andrzej Kapolka
eab0fa4c27
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-14 10:58:01 -07:00
wangyix
cb5a9bf668
moved some const defs to avoid redefinition
2014-07-14 10:43:02 -07:00
Atlante45
30fd4e27d0
pre-CR cleanup
2014-07-14 10:43:01 -07:00
Atlante45
8b50fbad92
Merge branch 'master' of https://github.com/highfidelity/hifi into typed_arrays
2014-07-14 09:57:17 -07:00
Andrew Meadows
8ffc3aa73d
merge upstream/master into andrew/thermonuclear (AKA samcake/19734)
...
Conflicts:
interface/src/Application.cpp
2014-07-14 09:10:27 -07:00
