Commit graph

41000 commits

Author SHA1 Message Date
Chris Collins
ed3a9cb24b Merge pull request #7415 from howard-stearns/thread-safe-entityToElementMap
Possible fix for getContainingElement crash.
2016-03-21 15:30:04 -07:00
Andrew Meadows
0a00436700 Merge pull request #7411 from ZappoMan/fixBlenderCrashRedux
Fix blender crash redux
2016-03-21 15:04:22 -07:00
Brad Hefta-Gaub
d28db7bec6 fix typo 2016-03-21 14:47:53 -07:00
Clément Brisset
605cc625d6 Merge pull request #7407 from birarda/udt-slow-start
fixes for udt timeout behaviour
2016-03-21 14:44:10 -07:00
Stephen Birarda
884df5739d remove comment that indicates that onTimeout is not used 2016-03-21 14:28:55 -07:00
Stephen Birarda
0956649cdb give CongestionControl timeout event from SendQueue 2016-03-21 14:28:55 -07:00
Stephen Birarda
8e97a50957 unlock before de-activating the queue 2016-03-21 14:28:55 -07:00
Stephen Birarda
c65ab5f1ad re-check the timeout guards before acting on timeout 2016-03-21 14:28:55 -07:00
Stephen Birarda
24fd39dfa3 make sure NAKs is empty before append from timeout 2016-03-21 14:28:26 -07:00
Stephen Birarda
4fe9ad94f5 notify on the emptyCondition if an ACK is received 2016-03-21 14:28:26 -07:00
Stephen Birarda
74ae18e514 replace append with insert to work around assert 2016-03-21 14:28:26 -07:00
Stephen Birarda
b059e98ff5 fix units for timeout check on expiry 2016-03-21 14:28:26 -07:00
Stephen Birarda
b7ff94e20d put packets back in the queue if flow window is full 2016-03-21 14:28:26 -07:00
Stephen Birarda
4c5ad8a03e remove first congestion event drops 2016-03-21 14:28:26 -07:00
Stephen Birarda
08dff9c7ac handle expiry check even if a packet was sent 2016-03-21 14:28:26 -07:00
Stephen Birarda
cbcc6e3ef2 fix for last decrease sequence number 2016-03-21 14:28:26 -07:00
Stephen Birarda
93a00c3d5d don't perform a decrease during single packet loss events 2016-03-21 14:28:26 -07:00
Stephen Birarda
13a906aa20 Merge pull request #7412 from huffman/fix-handshake-packet
Fix handshake packet being used across SendQueues
2016-03-21 14:28:07 -07:00
Stephen Birarda
eb5ecc84ff Merge pull request #7398 from huffman/add-request-handshake
Add HandshakeRequest packet
2016-03-21 14:27:28 -07:00
Ryan Huffman
c515355cff Fix handshakeRequestPacket not being thread safe 2016-03-21 14:07:15 -07:00
howard-stearns
8858559247 Make access to entityToElementMap thread safe. 2016-03-21 14:02:18 -07:00
Ryan Huffman
afb1d68f3b Fix handshake packet being used across SendQueues 2016-03-21 13:24:04 -07:00
Andrew Meadows
f58a00f75a Merge pull request #7409 from huffman/fix-handle-reply-finished
Fix edge-case where resource can receive a signal after request deleted
2016-03-21 13:10:24 -07:00
Andrew Meadows
47c4b226ea Merge pull request #7395 from hyperlogic/tony/openvr-crash-on-exit
openvr crash on exit fix
2016-03-21 13:04:45 -07:00
Brad Hefta-Gaub
2389295217 actually properly remove pending blendshapes 2016-03-21 13:04:37 -07:00
Ryan Huffman
4f32749c17 Fix edge-case where resource can receive a signal after request deleted 2016-03-21 11:54:41 -07:00
Brad Hefta-Gaub
492e71345a Revert "Revert "Fix ModelBlender crash""
This reverts commit f274cdcc7f.
2016-03-21 11:42:25 -07:00
Brad Hefta-Gaub
091e34e792 Merge pull request #7396 from AndrewMeadows/do-not-trust
prevent crash in SwingTwistConstraint
2016-03-21 11:13:41 -07:00
Andrew Meadows
fa7371aff8 Merge pull request #7408 from highfidelity/revert-7387-fixBlenderCrash
Revert "Fix ModelBlender crash"
2016-03-21 10:54:01 -07:00
Brad Hefta-Gaub
f274cdcc7f Revert "Fix ModelBlender crash" 2016-03-21 10:47:31 -07:00
Andrew Meadows
cd802a6549 Merge pull request #7406 from hyperlogic/tony/transparent-texture-fix
Model: fix for avatars with late loaded transparent textures.
2016-03-21 09:19:33 -07:00
Andrew Meadows
d7d428d1b2 Merge pull request #7387 from ZappoMan/fixBlenderCrash
Fix ModelBlender crash
2016-03-21 09:14:11 -07:00
Brad Hefta-Gaub
6822f0643b Merge pull request #7397 from zzmp/fix/ambient-url-listener
Add back ambientURL listener in editor
2016-03-21 08:49:43 -07:00
Brad Hefta-Gaub
2e7bc5f430 Merge pull request #7405 from sethalves/fix-voxels-js
make voxels.js buttons work, again
2016-03-21 08:46:29 -07:00
Anthony Thibault
b06f027f2e Model: fix for avatars with late loaded transparent textures. 2016-03-20 18:20:03 -07:00
Seth Alves
b600000307 refactor code a bit 2016-03-20 17:59:15 -07:00
Brad Hefta-Gaub
92c9dbc1aa Merge pull request #7404 from sethalves/quiet-invisible-zone
don't spam log when a zone is invisible
2016-03-20 17:56:15 -07:00
Seth Alves
21c688390c make voxels.js buttons work, again 2016-03-20 17:40:03 -07:00
Seth Alves
f8b8877369 coding standard 2016-03-20 17:37:06 -07:00
Brad Hefta-Gaub
5b3be03098 Merge pull request #7402 from hyperlogic/tony/empty-geometry-crash
NetworkGeometry: Fix crash for empty geometry/bad FBX versions
2016-03-20 17:25:27 -07:00
Seth Alves
d4ed9993b2 don't spam log when a zone is invisible 2016-03-20 15:06:17 -07:00
Anthony Thibault
5b2a050df7 display-plugins: Pulled getHeadPose into common base class.
* Moved getHeadPose and _headPoseCache out of each derived class and into HmdDisplayPlugin.
* updated comment in application.
2016-03-20 14:08:35 -07:00
Brad Hefta-Gaub
9d4d396db4 Merge pull request #7403 from hyperlogic/tony/disable-watchdog-for-debug
Application: disable deadlock watchdog for debug builds
2016-03-20 12:37:50 -07:00
Anthony Thibault
b71a56de38 Application: disable deadlock watchdog for debug builds
Cause it will cause a crash if you sit on a breakpoint for too long.
2016-03-20 12:18:33 -07:00
Anthony Thibault
6e872edcae NetworkGeometry: Fix crash for empty geometry/bad FBX versions
Interpret empty geometry as an error.
2016-03-20 12:13:54 -07:00
Brad Hefta-Gaub
b8929c4416 Merge pull request #7384 from zzmp/fix/bugsplat-1836
Check qml gl context on create
2016-03-20 11:26:09 -07:00
Zach Pomerantz
12aa057ff6 Always log if gl context fails 2016-03-18 18:37:14 -07:00
Ryan Huffman
b7678f9818 Remove accidental addition of whitespace 2016-03-18 16:33:00 -07:00
Ryan Huffman
c5c35b7e89 Add HandshakeRequest packet 2016-03-18 16:30:19 -07:00
Anthony J. Thibault
e1d47e7028 OculusLegacyDisplayPlugin: mac os x and linux fixes 2016-03-18 16:23:30 -07:00