ZappoMan
|
c4fe36b13d
|
more Models->Entities renaming
|
2014-06-26 17:01:07 -07:00 |
|
ZappoMan
|
a60e66bcfd
|
more file renaming models->entities
|
2014-06-26 16:47:51 -07:00 |
|
ZappoMan
|
8b13bc564f
|
renaming some files
|
2014-06-26 16:42:13 -07:00 |
|
ZappoMan
|
ccc9eabd33
|
first cut at renaming Models to Entities
|
2014-06-26 16:39:52 -07:00 |
|
ZappoMan
|
f7820ce97a
|
renaming mode files to entity
|
2014-06-26 11:52:45 -07:00 |
|
ZappoMan
|
6c2d6c2c04
|
removed old version of ModelItem writing
|
2014-06-26 11:08:36 -07:00 |
|
ZappoMan
|
52a04c5270
|
support old format models.svo files
|
2014-06-25 19:28:53 -07:00 |
|
ZappoMan
|
59a2f093fd
|
fix warning
|
2014-06-25 19:11:33 -07:00 |
|
ZappoMan
|
99374403f4
|
cleanup ModelTreeElement::readElementDataFromBuffer() to not read the buffer twice
|
2014-06-25 19:11:07 -07:00 |
|
ZappoMan
|
714dfd3008
|
cleanup ModelTreeElement::readElementDataFromBuffer() to not read the buffer twice
|
2014-06-25 19:06:26 -07:00 |
|
ZappoMan
|
049b8b7074
|
switch deleteModels() to use single pass for entire model set
|
2014-06-25 17:06:19 -07:00 |
|
ZappoMan
|
b4bb1ef6f5
|
revert whitespace change
|
2014-06-25 16:54:40 -07:00 |
|
ZappoMan
|
750ee639f0
|
change DeleteModelOperator to handle multiple deletes in single pass
|
2014-06-25 16:47:46 -07:00 |
|
ZappoMan
|
5d4ce73499
|
added deleteModels() unit test
|
2014-06-25 16:46:20 -07:00 |
|
ZappoMan
|
3bc970c9e9
|
added ModelTree::deleteModels(QSet<ModelItemID>) which correctly marks tree as changed
|
2014-06-25 16:11:06 -07:00 |
|
ZappoMan
|
bf0171700a
|
tweaks to unit tests
|
2014-06-25 15:35:52 -07:00 |
|
ZappoMan
|
441a345864
|
implement version of deleteModel that correctly marks tree as changed
|
2014-06-25 15:08:34 -07:00 |
|
ZappoMan
|
154f203541
|
add deleteModel unit test
|
2014-06-25 15:08:08 -07:00 |
|
ZappoMan
|
34fad16dcf
|
tweaks
|
2014-06-25 14:12:03 -07:00 |
|
ZappoMan
|
311d8154bd
|
added bestFit support for testing add
|
2014-06-25 14:06:28 -07:00 |
|
ZappoMan
|
0f18e4971c
|
added more debug
|
2014-06-25 12:03:40 -07:00 |
|
ZappoMan
|
142fc02ec5
|
octree tests tweaks
Conflicts:
tests/octree/src/ModelTests.cpp
tests/octree/src/main.cpp
|
2014-06-25 11:38:18 -07:00 |
|
ZappoMan
|
9e0f010edd
|
seed random generator to make tests reproducable
|
2014-06-25 11:14:15 -07:00 |
|
ZappoMan
|
47c0e2266f
|
added more timing details to model tests
Conflicts:
tests/octree/src/ModelTests.cpp
|
2014-06-25 11:09:41 -07:00 |
|
ZappoMan
|
f440227322
|
Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel
|
2014-06-24 16:26:57 -07:00 |
|
Stephen Birarda
|
7d46b8062b
|
Merge pull request #3070 from birarda/rounding-fix
revert credit balance rounding
|
2014-06-24 16:25:57 -07:00 |
|
Stephen Birarda
|
5f4baaffa5
|
revert credit balance rounding
|
2014-06-24 16:25:41 -07:00 |
|
ZappoMan
|
8a1a19b91b
|
added some more tests
|
2014-06-24 16:20:04 -07:00 |
|
ZappoMan
|
a019b70e58
|
Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel
Conflicts:
tests/octree/CMakeLists.txt
tests/octree/src/ModelTests.cpp
tests/octree/src/main.cpp
|
2014-06-24 15:59:17 -07:00 |
|
Brad Hefta-Gaub
|
6d77d438ab
|
Merge pull request #3057 from AndrewMeadows/ragdoll
Ragdoll Part3: avatar shapes self collide (but don't yet affect the joint positions of MyAvatar)
|
2014-06-24 15:47:18 -07:00 |
|
AndrewMeadows
|
da45e8a5f8
|
Merge pull request #3058 from ZappoMan/octreeTests
added some model tree performance tests
|
2014-06-24 14:27:29 -07:00 |
|
Brad Hefta-Gaub
|
c38790db72
|
Merge pull request #3068 from ZappoMan/serverSideAudioMixerStats
make default ring buffer much larger
|
2014-06-24 12:19:35 -07:00 |
|
ZappoMan
|
cdbda02765
|
make default ring buffer much larger
|
2014-06-24 12:09:58 -07:00 |
|
Stephen Birarda
|
c46453c97f
|
Merge pull request #3067 from ZappoMan/serverSideAudioMixerStats
adding more stats & allow config setting to enable/disable dynamic jitter buffers
|
2014-06-24 10:49:35 -07:00 |
|
ZappoMan
|
1d390faad8
|
add support for commandline/config value for dynamic jitter buffers
|
2014-06-24 10:29:38 -07:00 |
|
ZappoMan
|
5c188ea81e
|
adding more stats
|
2014-06-24 09:41:29 -07:00 |
|
Brad Hefta-Gaub
|
2089dec38a
|
Merge pull request #3066 from ctrlaltdavid/fix_default_audio
Fix default audio devices on Windows
|
2014-06-24 09:33:04 -07:00 |
|
David Rowe
|
c40c5d78c8
|
Fix default audio devices on Windows
Windows 8 provides the full friendly device name, not just the first 31 characters.
|
2014-06-24 08:50:39 -07:00 |
|
Brad Hefta-Gaub
|
fc88b1f710
|
Merge pull request #3065 from ZappoMan/serverSideAudioMixerStats
remove resizing of jitter buffers for now, only ask for 1 frame
|
2014-06-23 18:54:18 -07:00 |
|
ZappoMan
|
fda60cc8d5
|
remove resizing of jitter buffers for now, only ask for 1 frame
|
2014-06-23 18:45:24 -07:00 |
|
Brad Hefta-Gaub
|
c105bc6c39
|
Merge pull request #3064 from ZappoMan/serverSideAudioMixerStats
max desired must be one less than the max frames in our ringbuffer
|
2014-06-23 18:11:37 -07:00 |
|
ZappoMan
|
355ab2cb95
|
max desired must be one less than the max frames in our ringbuffer
|
2014-06-23 17:58:55 -07:00 |
|
Brad Hefta-Gaub
|
51dfb33985
|
Merge pull request #3063 from ZappoMan/serverSideAudioMixerStats
add more stats
|
2014-06-23 17:32:50 -07:00 |
|
ZappoMan
|
6434c0a2a4
|
add more stats
|
2014-06-23 17:28:39 -07:00 |
|
Brad Hefta-Gaub
|
672808ef86
|
Merge pull request #3062 from ZappoMan/serverSideAudioMixerStats
ignore the numSilentSamples from client, always assume one frame
|
2014-06-23 16:56:58 -07:00 |
|
ZappoMan
|
77f262561c
|
typo
|
2014-06-23 16:47:10 -07:00 |
|
ZappoMan
|
8a633743b3
|
ignore the numSilentSamples from client, always assume one frame
|
2014-06-23 16:40:38 -07:00 |
|
Brad Hefta-Gaub
|
e374ccb0fa
|
Merge pull request #3061 from ZappoMan/serverSideAudioMixerStats
use node uuid in stats
|
2014-06-23 16:17:51 -07:00 |
|
ZappoMan
|
4becb66e2a
|
use node uuid in stats
|
2014-06-23 16:10:51 -07:00 |
|
Brad Hefta-Gaub
|
13030d64e6
|
Merge pull request #3060 from ZappoMan/serverSideAudioMixerStats
break up audio mixer stats across multiple packets
|
2014-06-23 15:56:27 -07:00 |
|