wangyix
0b1bffa83c
added random packet drops; ready to test
2014-06-06 15:03:54 -07:00
wangyix
bd2148d4b7
added write lock/unlock
...
...for _octreeSceneStatsLock
2014-06-06 14:33:53 -07:00
wangyix
5c47485562
client-side nack sending complete; ready to test
2014-06-06 14:27:51 -07:00
wangyix
8cd5ec3b54
started work on sending nack packets from client
2014-06-06 11:50:34 -07:00
wangyix
5461a06e99
completed code to resend nacked packets on AC
2014-06-06 09:33:14 -07:00
wangyix
1a7e3a859c
started work on resending nacked packets
2014-06-05 18:00:58 -07:00
wangyix
124bd88b01
added tests for MovingPercentile
2014-06-04 17:23:44 -07:00
wangyix
5251057ed6
MovingPercentile moved else to same line as }
2014-06-04 15:13:16 -07:00
wangyix
0da6374e19
MovingPercentile .size() consistency
2014-06-04 14:31:58 -07:00
wangyix
e2d3fcc518
changed MovingPercentile to use QList
2014-06-04 14:24:23 -07:00
wangyix
ebfc405d9d
more cleanup 3
2014-06-04 11:55:20 -07:00
wangyix
480efcbe76
more cleanup again
2014-06-04 11:31:44 -07:00
wangyix
25e2f28b02
more cleanup
2014-06-04 11:30:35 -07:00
wangyix
b452d08495
cleaned up debug statements
...
also reorganized MovingPercentile a little bit
2014-06-04 11:20:29 -07:00
wangyix
6f45939113
re-enabled piggy-backing in OctreeSendThread
2014-06-04 11:02:31 -07:00
wangyix
12ac6105f1
changed MovingMedian to MovingPercentile
2014-06-04 10:59:32 -07:00
wangyix
50746a6540
extra commit of previous commit?
2014-06-03 16:19:12 -07:00
wangyix
c851edd0ef
added MovingMedian class, but not using it
...
added packet type/time data collection to DatagramProcessor and
post-execution prints of that info.
2014-06-03 16:18:40 -07:00
Brad Hefta-Gaub
6061330826
Merge pull request #2973 from matsukaze/master
...
Job #19700 BUG: Crash in NodeBounds::draw() fixed.
2014-06-02 22:41:02 -07:00
Brad Hefta-Gaub
6f5d2ba233
Merge pull request #2970 from Barnold1953/master
...
Mirror mode fix, particleBirds.js
2014-06-02 13:02:05 -07:00
Clément Brisset
2121648c7d
Merge pull request #2972 from polac/19748
...
Fixing the BUG #19748 : Sit.js doesn't handle overlays correctly.
2014-06-02 12:18:28 -07:00
Clément Brisset
12a40106f5
Merge pull request #2968 from AndrewMeadows/inertia
...
Make JointState a proper class: Part 1
2014-06-02 12:15:50 -07:00
Mika Impola
da3a272475
Fixing the BUG #19748 : Sit.js doesn't handle overlays correctly.
2014-06-02 21:47:31 +03:00
barnold1953
e669f1d835
Fixed and tested particle birds
2014-06-02 11:41:50 -07:00
Andrew Meadows
8e7daed2b3
Merge upsrtream/master into andrew/inertia
...
Conflicts:
interface/src/renderer/Model.cpp
2014-06-02 11:32:23 -07:00
AndrewMeadows
c3646d2421
Merge pull request #2969 from ZappoMan/silencewarnings
...
silence some unused variable warnings and move some debug code to only execute in debug mode
2014-06-02 11:04:18 -07:00
AndrewMeadows
a9a7580e8b
Merge pull request #2971 from ZappoMan/editModelsInDefaultScripts
...
Edit models in default scripts
2014-06-02 11:04:03 -07:00
AndrewMeadows
8146520c35
Merge pull request #2967 from ZappoMan/editModelsInDefaultScripts
...
Added Edit Models to default scripts
2014-06-02 10:51:22 -07:00
barnold1953
9e882957c4
Removed debug prints from particleBirds.js
2014-06-02 10:44:50 -07:00
ZappoMan
758df4f58b
silence some unused variable warnings and move some debug code to only execute in debug mode
2014-06-02 10:43:50 -07:00
barnold1953
863e2c56ae
Fixed mirror mode for non-headless models.
2014-06-02 10:41:10 -07:00
barnold1953
7997946389
Added particleBirds.js example script
2014-06-02 09:43:01 -07:00
barnold1953
db578995a8
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-06-02 09:20:12 -07:00
matsukaze
46d45a2d43
Job #19700 BUG: Crash in NodeBounds::draw() fixed.
...
QMap and QReadWriteLock are orthogonal. Combined them into a wrapper
class called NodeToJurisdictionMap, replacing typedef. This allows us to
avoid changing method signatures wherever NodeToJurisdictionMap is used.
The lock is bound with the map and is available to all clients of the
NodeToJurisdictionMap. The lock allows multi-threaded access to the map.
Fixed compiler warning in NodeBounds.cpp regarding loss of precision
during conversion of double to GLfloat.
2014-06-02 05:55:58 -04:00
ZappoMan
cad5e12aad
make editVoxels.js and editModels.js play nice together with the delete menu item
2014-05-31 14:05:05 -07:00
ZappoMan
8b51cd0d8a
fix bug in Menu::removeAction() where we weren't removing the action key from the hash, memory leak, and other problems
2014-05-31 14:04:33 -07:00
ZappoMan
f92facea76
changed Models/Delete and Voxels/Delete to both use same menu item name of 'Delete' so that either option will correctly delete either.
2014-05-31 13:30:45 -07:00
ZappoMan
30a5048840
add editModels to defaultScripts
2014-05-31 13:24:23 -07:00
ZappoMan
22a8f88195
add support for Menu.menuExists() and menu.menuItemExists()
2014-05-31 13:24:07 -07:00
Brad Hefta-Gaub
a257af76dc
Merge pull request #2966 from Atlante45/grab_attachements
...
First pass at grabbing attachment
2014-05-30 19:46:03 -07:00
Brad Hefta-Gaub
3038b193d1
Merge pull request #2965 from Atlante45/list_current_js_api
...
List current js api
2014-05-30 19:45:36 -07:00
Atlante45
4ffd51d9c4
First pass at grabbing attachment
2014-05-30 18:40:50 -07:00
Atlante45
2e5b45cfa1
print dressing
2014-05-30 17:48:35 -07:00
Atlante45
a661ea3179
Made API listing alphabetical, more clean and faster to print out.
2014-05-30 17:40:04 -07:00
Atlante45
2514906bd7
Fixed minor issue in currentAPI.js
2014-05-30 17:25:42 -07:00
Atlante45
e217ed7f75
Merge branch 'master' of https://github.com/highfidelity/hifi into list_current_js_api
2014-05-30 17:18:45 -07:00
Atlante45
9ca80cf4b3
Added script that lists the current JS API
2014-05-30 17:18:26 -07:00
Clément Brisset
a2ac7f7832
Merge pull request #2960 from ey6es/master
...
If the skeleton doesn't have eye joints (as with the Fuse models), make ...
2014-05-30 15:55:24 -07:00
Andrzej Kapolka
70afda6f86
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-30 15:19:34 -07:00
Andrzej Kapolka
6acd60fd55
Merge pull request #2964 from ZappoMan/modelPickingBugs
...
fix ray picking at distances
2014-05-30 15:19:07 -07:00
