matsukaze
c8c8bccbf3
Job #19766 BUG: Stop or reload all scripts crashes interface fixed.
...
QUrl(name).toString() does not equal name, therefore removing name from
ScriptEngineHash was failing, and a dangling pointer was left in the
script engine hash map.
2014-06-09 17:52:50 -04:00
matsukaze
a8d504fc81
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-06-09 17:29:50 -04:00
Leonardo Murillo
adac661e9f
Merge pull request #3003 from birarda/master
...
add a crash guard for negative silent samples
2014-06-09 15:15:18 -06:00
Stephen Birarda
ee71d34f02
add a crash guard around negative silent samples
2014-06-09 14:03:47 -07:00
Brad Hefta-Gaub
6cf30cf9d1
Merge pull request #3002 from wangyix/master
...
added code to nack and re-send dropped octree data packets
2014-06-09 13:52:21 -07:00
wangyix
e45f2fed4b
changed writelock to readlock
...
plus a coding standard fix
2014-06-09 13:42:45 -07:00
Brad Hefta-Gaub
2a4e6a1311
Merge pull request #3001 from Barnold1953/OculusOverlay
...
Simple raypicking for scripts with oculus rift.
2014-06-09 13:21:24 -07:00
wangyix
ff2a5342ee
removed another extra space
2014-06-09 12:57:50 -07:00
wangyix
412d3e19fe
removed debug prints in parseNackPacket()
2014-06-09 12:56:00 -07:00
wangyix
0fce7e721a
removed more spaces
2014-06-09 12:40:01 -07:00
wangyix
968ea3563c
removed an extra space
2014-06-09 12:37:42 -07:00
wangyix
aa694d6967
removed debug code
2014-06-09 12:35:26 -07:00
wangyix
f13ae84da6
Merge branch 'packet_recovery_pull'
2014-06-09 12:04:12 -07:00
wangyix
529dd827a2
moved around code in sendNack() a bit
2014-06-09 12:00:19 -07:00
barnold1953
936f04cece
Simple raypicking for scripts with oculus rift.
2014-06-09 11:55:29 -07:00
Andrzej Kapolka
28490f9bbc
Merge pull request #2994 from AndrewMeadows/ragdoll
...
Ragdoll Part 2: make MyAvatar's skeleton's collision shapes follow ragdoll
2014-06-09 11:55:19 -07:00
Andrew Meadows
4f9da0cc37
fix whitespace formatting
2014-06-09 11:50:31 -07:00
Andrzej Kapolka
e936697cf0
Merge pull request #2987 from leechfarm/master
...
Fix for users with some special characters in their password not being able to log in
2014-06-09 11:31:30 -07:00
AndrewMeadows
d8f21b9f44
Merge pull request #3000 from ey6es/master
...
Avoid crash on zero-length normals.
2014-06-09 11:29:49 -07:00
wangyix
3bc457d4d2
added octree scene stats locking and unlocking
2014-06-09 11:14:02 -07:00
Andrzej Kapolka
a1e208ae3d
Simplification. If the normal is zero, then the cross product will also be
...
zero, so we can just have the one check and postpone normalization until
afterwards.
2014-06-09 11:03:50 -07:00
Andrzej Kapolka
6eac0ee2ae
Avoid crash on zero-length normals.
2014-06-09 10:58:56 -07:00
AndrewMeadows
5ed1dfc4b0
Merge pull request #2999 from ey6es/metavoxels
...
Provide a way to stream enums that aren't object properties, added tests for delta streaming, fixed Windows initialization bug.
2014-06-09 08:48:20 -07:00
Brad Hefta-Gaub
8f71335bec
Merge pull request #2993 from Atlante45/temp_branch
...
More editModels.js work
2014-06-07 09:17:30 -07:00
matsukaze
c2a6345705
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-06-06 22:27:12 -04:00
wangyix
5286090812
removed interface print statements
2014-06-06 17:52:48 -07:00
wangyix
b39559d860
packet recovery seems to be working
...
Seems to impact FPS a lot. OctreeSceneStats is not being locked (causes
freezing, need to find out why).
2014-06-06 17:44:30 -07:00
Andrzej Kapolka
384fe51937
If we're going to initialize one mapping lazily, we might as well initialize
...
some more that way.
2014-06-06 16:38:52 -07:00
Andrzej Kapolka
2fec0a9db6
Fixes for Windows.
2014-06-06 15:50:28 -07:00
wangyix
d21a8e73ff
Merge remote-tracking branch 'upstream/master' into packet_recovery_pull
2014-06-06 15:05:29 -07:00
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
Andrzej Kapolka
361461516c
Check the delta-encoded objects, report bytes sent/received.
2014-06-06 14:26:20 -07:00
Andrzej Kapolka
ac2c8ffbd5
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-06 14:05:59 -07:00
Stephen Birarda
570b66b310
Merge pull request #2998 from birarda/master
...
remove MMX math in stereo audio copy
2014-06-06 12:02:21 -07:00
Stephen Birarda
194493ab9b
remove MMX math to fix stereo discrepancies
2014-06-06 12:00:47 -07:00
wangyix
6bbf3f1f17
Merge remote-tracking branch 'upstream/master'
2014-06-06 11:53:37 -07:00
Andrzej Kapolka
73723e598f
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-06 11:51:09 -07:00
Stephen Birarda
53a15bc7ed
Merge pull request #2997 from birarda/master
...
bump silent audio frame packet version
2014-06-06 11:50:52 -07:00
Stephen Birarda
6fdc5df47b
bump silent audio frame version
2014-06-06 11:50:36 -07:00
wangyix
8cd5ec3b54
started work on sending nack packets from client
2014-06-06 11:50:34 -07:00
Andrzej Kapolka
4fbd0823f0
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-06 11:49:51 -07:00
Stephen Birarda
1c8cf20ec2
Merge pull request #2996 from birarda/master
...
add a mixer crash guard for meeting
2014-06-06 11:47:45 -07:00
Stephen Birarda
a7a9656ac7
add a mixer crash guard in addSilentFrame
2014-06-06 11:47:34 -07:00
Andrzej Kapolka
f78187c256
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-06 11:43:12 -07:00
Philip Rosedale
b07a3488aa
Merge pull request #2995 from birarda/master
...
initial pass at stereo input source
2014-06-06 11:40:41 -07:00
Andrzej Kapolka
56d9bc5215
Working on delta-streaming tests.
2014-06-06 11:37:45 -07:00
Stephen Birarda
b6b148cd9f
resolve conflicts on merge with upstream master
2014-06-06 11:31:16 -07:00
Stephen Birarda
f6011b65d7
fix input loudness for a stereo source
2014-06-06 11:26:04 -07:00
