Philip Rosedale
44c6f81c0f
Merge pull request #7457 from ZappoMan/reduceFalsePositiveDeadlocks
...
make the deadlock watchdog more generous
2016-03-25 16:10:37 -07:00
Philip Rosedale
dfb09f134a
Merge pull request #7476 from ZappoMan/bugFixes
...
fix a couple of model bugs
2016-03-25 15:58:52 -07:00
Brad Hefta-Gaub
fe31be71eb
protect against unexpected rollover
2016-03-25 14:59:43 -07:00
Clément Brisset
82f22b42e1
Merge pull request #7465 from sethalves/redo-polyvox-locking
...
Redo polyvox locking
2016-03-25 14:35:27 -07:00
Seth Alves
f3ba16ab3e
fix locking around polyvox state flags
2016-03-25 14:06:57 -07:00
Ryan Huffman
306425b940
Merge pull request #7475 from birarda/udt-fixes
...
guard long sleeps in udt::SendQueue
2016-03-25 13:56:45 -07:00
Seth Alves
d97ab1e2fc
Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking
2016-03-25 13:53:01 -07:00
Stephen Birarda
d9abc79b5d
return for AccountManager sendRequest if threads do not match
2016-03-25 13:37:13 -07:00
Alan Z
cffbc2e1a4
Merge pull request #7478 from birarda/new-icons
...
replace interface/server-console icons with new set from Alan
2016-03-25 13:17:58 -07:00
Stephen Birarda
044fb983d7
cast chrono durations to qint64
2016-03-25 13:07:54 -07:00
Stephen Birarda
ce4d56fb90
add warning for long sendqueue sleeps
2016-03-25 13:06:21 -07:00
Brad Hefta-Gaub
541c1e5c6f
Merge branch 'master' of https://github.com/highfidelity/hifi into reduceFalsePositiveDeadlocks
2016-03-25 13:03:31 -07:00
Brad Hefta-Gaub
941821e2c7
add some extra debugging at deadlock detection to explain unreasonable numbers
2016-03-25 12:17:24 -07:00
Philip Rosedale
4893d1f09e
Merge pull request #7474 from zzmp/fix/drop-network-data
...
Drop network data after processing
2016-03-25 11:43:58 -07:00
Brad Hefta-Gaub
4ebb114a8e
also fix joint simulation from 3rd party editors
2016-03-25 11:43:32 -07:00
Stephen Birarda
bb95aec528
replace the interface icons
2016-03-25 11:42:48 -07:00
Stephen Birarda
74e041e9aa
cast chrono durations to int explicitly
2016-03-25 11:41:41 -07:00
Stephen Birarda
42e297b458
replace the console beta/PR icons
2016-03-25 11:41:10 -07:00
Stephen Birarda
f0da39be22
replace the console icon with new icons
2016-03-25 11:40:13 -07:00
Philip Rosedale
e891fd219b
Merge pull request #7472 from AndrewMeadows/delete-mortal-entities
...
expire mortal entities correctly
2016-03-25 11:33:07 -07:00
Brad Hefta-Gaub
759fac228c
fix the doppelganger
2016-03-25 11:29:14 -07:00
Andrew Meadows
7064b29a2d
Merge pull request #7473 from jherico/revert_webchannel
...
Revert "Build a better event bridge"
2016-03-25 11:29:06 -07:00
Brad Hefta-Gaub
6c6131c7b3
fix the doppelganger
2016-03-25 11:22:54 -07:00
Stephen Birarda
d8859def37
fix for AccountManagerAuth::Type register, consts
2016-03-25 10:47:06 -07:00
Brad Hefta-Gaub
984d6ae48f
fix model resizing bug
2016-03-25 10:46:14 -07:00
Philip Rosedale
f000ef6158
Merge pull request #7469 from hyperlogic/tony/eye-tracking-fix
...
Avatar: Eye-tracking works again
2016-03-25 10:24:37 -07:00
Stephen Birarda
0043a84234
guard the SendQueue sleep and send a user activity when weird
2016-03-25 10:22:14 -07:00
Chris Collins
2a85170a46
Merge pull request #7470 from zzmp/fix/tex-json
...
Accept textures as list or json
2016-03-25 10:05:12 -07:00
Zach Pomerantz
aad40f5de0
Drop network data after processing
2016-03-25 09:58:34 -07:00
Brad Davis
a47614c9b6
Revert "Build a better event bridge"
...
This reverts commit a43fde0803
2016-03-25 09:48:25 -07:00
samcake
093f5d0019
Merge pull request #7460 from hyperlogic/tony/skip-culling-render-config
...
CullTask: added ability to disable culling during rendering.
2016-03-25 09:40:35 -07:00
Philip Rosedale
5804559f91
Merge pull request #7468 from Atlante45/fix/console-log
...
Fix sometimes slow server-console logs.
2016-03-25 09:18:34 -07:00
Anthony J. Thibault
c00a412d3b
Fix misleading comments for _skipCulling case.
2016-03-25 09:10:46 -07:00
Andrew Meadows
6c36d55fea
Merge pull request #7459 from kencooke/master
...
Fix Reverb Zone settings to work correctly with new reverb
2016-03-25 08:17:45 -07:00
Seth Alves
ae6d6f4bb3
added comments, minor cleanups
2016-03-24 21:37:46 -07:00
Seth Alves
c57aa565df
Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking
2016-03-24 21:37:25 -07:00
Brad Hefta-Gaub
fb09ad51b3
CR feedback
2016-03-24 21:14:07 -07:00
Andrew Meadows
ac5c055a1e
don't verify simulated bit when adding to delete list
2016-03-24 21:12:22 -07:00
Andrew Meadows
d3d724530a
minor optimiztion
2016-03-24 21:12:22 -07:00
Brad Davis
39ef5402bd
Merge pull request #7471 from highfidelity/revert-7467-clean/drop-data
...
Revert "Drop resource data after load"
2016-03-24 20:50:06 -07:00
Brad Hefta-Gaub
cd5beabf10
Revert "Drop resource data after load"
2016-03-24 20:37:16 -07:00
Seth Alves
e0ab875ca8
Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking
2016-03-24 19:43:30 -07:00
Zach Pomerantz
413c3b88cf
Accept textures as list or json
2016-03-24 19:40:02 -07:00
Seth Alves
1b88284bf7
more threading cleanups
2016-03-24 19:14:25 -07:00
Brad Hefta-Gaub
7de8a2267f
one more try
2016-03-24 18:09:14 -07:00
Anthony J. Thibault
6a5a443eff
Avatar: Eye-tracking works again
...
This replaces the calculation of the Head left and right eye positions used for eye tracking.
Which was inadvertently removed in this commit 7483b8546b
2016-03-24 18:07:46 -07:00
Atlante45
76c30d9014
Fix sometimes slow server-console logs.
2016-03-24 17:56:11 -07:00
Brad Hefta-Gaub
17a2ed7dd0
Merge pull request #7467 from zzmp/clean/drop-data
...
Drop resource data after load
2016-03-24 17:52:19 -07:00
Brad Davis
0ac70049c7
Merge pull request #7431 from hyperlogic/tony/vive-rendering-work
...
OpenVR rendering & Nsight instrumentation improvements
2016-03-24 17:44:30 -07:00
Brad Hefta-Gaub
cfaa97d8f3
one more try
2016-03-24 17:39:23 -07:00
