Commit graph

41021 commits

Author SHA1 Message Date
Anthony Thibault
63d6f888e6 Update openvr sdk to 0.9.19 2016-03-21 17:31:13 -07:00
Chris Collins
277f49ef64 Merge pull request #7410 from hyperlogic/tony/limit-accumulate-time-loops
AnimUtil: prevent accumulateTime from looping forever
2016-03-21 16:39:37 -07:00
Brad Hefta-Gaub
7f3ce6dd26 Merge pull request #7417 from zzmp/fix/skybox-default
Default background behavior to stars
2016-03-21 16:15:06 -07:00
Brad Hefta-Gaub
afa6e6e30a Merge pull request #7414 from zzmp/fix/leaking-reply
Delete used QNetworkReply
2016-03-21 16:06:45 -07:00
Brad Hefta-Gaub
8cfa6fc960 Merge pull request #7413 from huffman/fix-emit-audio-packet
Fix audio packet being used in a thread-unsafe way
2016-03-21 15:58:10 -07:00
Chris Collins
6324d0e3be Merge pull request #7393 from ZappoMan/protectMeshBoxes
Fix for crash in recalculateMeshBoxes()
2016-03-21 15:46:28 -07:00
Brad Hefta-Gaub
a6bf84b90e Merge pull request #7399 from zzmp/fix/qml-thread
Move QML rendering to a defined thread
2016-03-21 15:31:42 -07:00
Brad Hefta-Gaub
5f3c29d3e2 Merge pull request #7416 from zzmp/fix/static-cast-network
Static cast avatar network reply
2016-03-21 15:31:20 -07:00
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
Zach Pomerantz
2b92756c65 Default bg to SKY_DOME 2016-03-21 15:11:26 -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
Zach Pomerantz
cc83a9bc36 Actually loop qml render and wake on pause 2016-03-21 14:36:45 -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
Zach Pomerantz
1750b973e0 Static cast avatar network reply 2016-03-21 14:28:15 -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
99010c7bf6 Fix audio packet being used in a thread-unsafe way 2016-03-21 13:33:56 -07:00
Zach Pomerantz
40aabe7fae Delete used QNetworkReply 2016-03-21 13:30:01 -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
Anthony J. Thibault
df5afffc77 AnimUtil: prevent accumulateTime from looping forever
This might happen with large dts, large timeScales.
2016-03-21 11:58:13 -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
Zach Pomerantz
d3d0f229aa Merge branch 'master' of github.com:highfidelity/hifi into fix/qml-thread 2016-03-21 11:25:14 -07:00
Zach Pomerantz
41fcf4cc6d Forward declare qml render thread 2016-03-21 11:18:18 -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