Atlante45
|
1d2cf3536b
|
Coefficients tweaks
|
2014-08-04 11:20:18 -07:00 |
|
Atlante45
|
c80cd0d71d
|
connected blendshapes
|
2014-08-04 11:04:14 -07:00 |
|
Atlante45
|
cac3983778
|
Added a few blendshapes
|
2014-08-04 11:03:58 -07:00 |
|
Atlante45
|
8d1438a44c
|
Plugged in dde face tracker
|
2014-08-04 10:28:52 -07:00 |
|
Atlante45
|
bbb52fc4aa
|
Added dde face tracker class
|
2014-08-04 10:28:29 -07:00 |
|
Atlante45
|
38741aed73
|
Fixed wrong header guard
|
2014-08-04 10:27:29 -07:00 |
|
Brad Hefta-Gaub
|
e9286e5700
|
Merge pull request #3238 from ctrlaltdavid/19824
Code Review for Job #19824
|
2014-08-01 16:35:16 -07:00 |
|
Brad Hefta-Gaub
|
211bed946f
|
Merge pull request #3232 from huffman/19783
Code Review for Job #19783
|
2014-08-01 16:34:50 -07:00 |
|
Ryan Huffman
|
d01d605b40
|
Add ModelItemProperties::copyFromNewModelItem
|
2014-08-01 13:52:00 -07:00 |
|
Andrew Meadows
|
3305f5edf9
|
merge upstream/master into andrew/ragdoll
|
2014-08-01 11:13:18 -07:00 |
|
ZappoMan
|
fa5a2b9a4d
|
reset sent time gap stats on reset
|
2014-08-01 10:04:35 -07:00 |
|
ZappoMan
|
7e51ebea49
|
added some additional audio stats
|
2014-08-01 09:42:31 -07:00 |
|
David Rowe
|
f3b4f708a5
|
Add Script.load() JavaScript method
|
2014-07-31 21:50:07 -07:00 |
|
Leonardo Murillo
|
c4751d7dd7
|
Merge pull request #3231 from birarda/domain-server-auth
add some error messages to PaymentManager
|
2014-07-31 13:40:56 -06:00 |
|
Andrzej Kapolka
|
53fc31353d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-07-31 12:06:01 -07:00 |
|
Andrzej Kapolka
|
a0886d4301
|
Use raw OpenGL textures rather than QOpenGLTexture, since that we're having
issues with constants in that class.
|
2014-07-31 11:55:52 -07:00 |
|
Stephen Birarda
|
7860aa5b87
|
add some error messages to PaymentManager
|
2014-07-31 11:41:49 -07:00 |
|
Andrzej Kapolka
|
90ce73823a
|
Attempting to fix the Linux build error.
|
2014-07-31 11:03:50 -07:00 |
|
Ryan Huffman
|
aa1c9d88dd
|
Cleaup several qDebug calls and commented lines
|
2014-07-31 10:48:26 -07:00 |
|
Ryan Huffman
|
3e2bb0f168
|
Add more complete error handling for import/export models
|
2014-07-31 10:40:45 -07:00 |
|
Stephen Birarda
|
453c37f4b9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth
|
2014-07-31 10:05:40 -07:00 |
|
Stephen Birarda
|
eadae8ed1a
|
allow unauthenticated redemptions of signed transactions from octree server
|
2014-07-31 10:05:26 -07:00 |
|
Stephen Birarda
|
ce4336894a
|
actually send signed transaction from PaymentManager
|
2014-07-31 09:26:18 -07:00 |
|
Stephen Birarda
|
350c759618
|
add a method to SignedWalletTransaction to return binary message
|
2014-07-31 09:18:57 -07:00 |
|
Ryan Huffman
|
68f1ad79d6
|
Update clipboard call to exportModels to not scale to tree size
|
2014-07-31 01:14:07 -07:00 |
|
Ryan Huffman
|
a39a7e2356
|
Update exportModels implementation
|
2014-07-31 01:13:17 -07:00 |
|
Brad Hefta-Gaub
|
d4d4069f11
|
Merge pull request #3225 from birarda/master
cmake file cleanup to suppress warnings on cmake 3.0
|
2014-07-30 19:20:18 -07:00 |
|
Ryan Huffman
|
01737e18b2
|
Update LocalModelOverlay to work prorperly with translations
|
2014-07-30 19:06:10 -07:00 |
|
Ryan Huffman
|
43f61b4718
|
Add localmodels overlay type
|
2014-07-30 18:38:42 -07:00 |
|
Ryan Huffman
|
521bf6023e
|
Implement pasteModels in Clipboard
|
2014-07-30 18:38:09 -07:00 |
|
Ryan Huffman
|
051bbd5d34
|
Add LocalModelsOverlay
|
2014-07-30 18:34:22 -07:00 |
|
Ryan Huffman
|
06294b403b
|
Add pasteModels
|
2014-07-30 18:31:58 -07:00 |
|
Andrzej Kapolka
|
f2a72aa5a9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-07-30 18:17:28 -07:00 |
|
Stephen Birarda
|
631977bac2
|
setup a SignedTransaction from PaymentManager
|
2014-07-30 18:15:20 -07:00 |
|
Andrzej Kapolka
|
c3c2265ddd
|
Hide the unset (black) bits.
|
2014-07-30 18:14:11 -07:00 |
|
Stephen Birarda
|
ef58453fda
|
turn off verbose octree packet debug
|
2014-07-30 18:10:11 -07:00 |
|
Stephen Birarda
|
db25cd9d2c
|
call PaymentManager when an OctreeEditPacketSender needs to pay
|
2014-07-30 18:07:08 -07:00 |
|
Brad Hefta-Gaub
|
d6e6cfd585
|
Merge pull request #3216 from wangyix/inbound_audio_stream
Audio ringbuffer classes refactored into subclasses of InboundAudioStream
|
2014-07-30 18:00:17 -07:00 |
|
Stephen Birarda
|
9c1dd7c4a4
|
fix call to connect in Application
|
2014-07-30 17:35:49 -07:00 |
|
Stephen Birarda
|
99daa062c0
|
trigger domainSettingsReceived slot when connected to domain
|
2014-07-30 17:35:33 -07:00 |
|
Stephen Birarda
|
363cef6d8a
|
move satoshi costs to VoxelEditPacketSender
|
2014-07-30 17:33:37 -07:00 |
|
wangyix
|
7281eca5a4
|
fixed inj crash; added statcDesired to MixedAudioStream
|
2014-07-30 17:20:05 -07:00 |
|
wangyix
|
24be668d36
|
added check before pushAudioToOutput to prevent starvecount buildup
|
2014-07-30 15:47:49 -07:00 |
|
wangyix
|
636b6d3307
|
Merge branch 'pull_mode_audio_output' into inbound_audio_stream
|
2014-07-30 15:37:18 -07:00 |
|
wangyix
|
daeb2a898d
|
added staticDesiredJitterBufferFrames feature; AudioMixer crashing
moved some callbacks from Application::updateAvatar() to
Application::update()
|
2014-07-30 15:35:40 -07:00 |
|
Stephen Birarda
|
2796f71419
|
library cleanup to suppress warnings on cmake 3.0
|
2014-07-30 15:06:15 -07:00 |
|
Andrzej Kapolka
|
82e442c115
|
Working on heightfield transmission, merging.
|
2014-07-30 14:54:38 -07:00 |
|
Stephen Birarda
|
6275dd68ab
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-07-30 14:15:22 -07:00 |
|
Stephen Birarda
|
4be8a92e52
|
remove explicit requirement of LibOVR source file in OculusManager
|
2014-07-30 14:15:14 -07:00 |
|
wangyix
|
a2945eaa96
|
qaudiooutput overflow check enabled by default
|
2014-07-30 12:52:35 -07:00 |
|