Andrew Meadows
|
9d2744296e
|
update physics stats names
|
2014-07-31 13:33:46 -07:00 |
|
Andrew Meadows
|
fc1d805d54
|
add ContactConstraint and use to impede muscles
|
2014-07-31 13:16:06 -07:00 |
|
Andrew Meadows
|
0f82236f2c
|
minor cleanup
|
2014-07-31 13:09:10 -07:00 |
|
Andrew Meadows
|
0b9f246661
|
set the shape ID in the ctor's NOT the dtor
|
2014-07-31 13:08:27 -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 |
|
Philip Rosedale
|
fe6278f797
|
Merge pull request #3227 from ey6es/metavoxels
Basic metavoxel-based heightfields.
|
2014-07-31 12:34:45 -07: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 |
|
Atlante45
|
c65dc3fb1e
|
Various tweaks to ModelReferentials
|
2014-07-31 11:55:28 -07:00 |
|
Atlante45
|
5fd3fd9f8f
|
Moved MyAvatar update at the end of Application::update() to have latest data for simulation
|
2014-07-31 11:54:39 -07:00 |
|
Atlante45
|
490dad6bbd
|
Work on network streaming of referentials
|
2014-07-31 11:52:03 -07:00 |
|
Stephen Birarda
|
7860aa5b87
|
add some error messages to PaymentManager
|
2014-07-31 11:41:49 -07:00 |
|
Ryan Huffman
|
054e832cf8
|
Fix misspelled variable names
|
2014-07-31 11:32:17 -07:00 |
|
Philip Rosedale
|
204595a742
|
Merge pull request #3229 from birarda/domain-server-auth
introduce the option to require payment for voxels
|
2014-07-31 11:30:13 -07:00 |
|
barnold1953
|
ab52f384b7
|
Improvements on RPS script
|
2014-07-31 11:15:20 -07:00 |
|
Stephen Birarda
|
3c459d8460
|
fix include of tgmath for windows
|
2014-07-31 11:12:41 -07:00 |
|
Andrzej Kapolka
|
90ce73823a
|
Attempting to fix the Linux build error.
|
2014-07-31 11:03:50 -07:00 |
|
Stephen Birarda
|
e1ba076a71
|
complete redemption of signed transactions from octree server
|
2014-07-31 11:03:12 -07:00 |
|
Ryan Huffman
|
aa1c9d88dd
|
Cleaup several qDebug calls and commented lines
|
2014-07-31 10:48:26 -07:00 |
|
Ryan Huffman
|
a670889ffb
|
Remove TODO comment
|
2014-07-31 10:44:36 -07:00 |
|
Ryan Huffman
|
85ed18fd41
|
Cleanup editModels.js
|
2014-07-31 10:43:44 -07:00 |
|
Ryan Huffman
|
3e2bb0f168
|
Add more complete error handling for import/export models
|
2014-07-31 10:40:45 -07:00 |
|
barnold1953
|
2c04963242
|
Merge branch 'master' of https://github.com/highfidelity/hifi into rockPaperScissors
|
2014-07-31 10:16:35 -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
|
49e35bbc84
|
Fix bug with ModelItemProperties
When copying from a ModelItem the properties should be considered
changed
|
2014-07-31 01:14:18 -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 |
|
Ryan Huffman
|
6ecc12cdea
|
Fix export models not cancelling correctly
|
2014-07-31 01:11:05 -07:00 |
|
Ryan Huffman
|
d54e3741ed
|
Add ModelTree::findModelsInCube
|
2014-07-31 01:09:38 -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 |
|
Brad Hefta-Gaub
|
faa25af0e2
|
Merge pull request #3228 from Barnold1953/dancerScript
Procedural Animation
|
2014-07-30 19:19:10 -07:00 |
|
Ryan Huffman
|
6a53765a47
|
Rename buttons in editModels.js
|
2014-07-30 19:06:23 -07:00 |
|
Ryan Huffman
|
01737e18b2
|
Update LocalModelOverlay to work prorperly with translations
|
2014-07-30 19:06:10 -07:00 |
|
Ryan Huffman
|
06e6505584
|
Update and add localModels overlay to editModels.js import/export
|
2014-07-30 18:39:44 -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
|
7bd1628465
|
Add SendModelsOperation
|
2014-07-30 18:36:43 -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 |
|
barnold1953
|
a65f81c71a
|
Random start position for bot
|
2014-07-30 18:25: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 |
|
barnold1953
|
b6c0b4fd21
|
Random mood in procedural bot
|
2014-07-30 17:39:24 -07:00 |
|