Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 18:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41306 commits 71 branches 56 tags 1.2 GiB
Commit graph

41306 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Anthony J. Thibault
7cab8f63fb Merge branch 'master' of github.com:highfidelity/hifi into tony/no-locks-no-problem 2016-03-21 16:03:33 -07:00
ericrius1
51508b467c uupdate 2016-03-21 15:59:03 -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
ericrius1
98e43a8d0f more logging 2016-03-21 15:54:47 -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
ericrius1
b4509e428b bugs 2016-03-21 15:37:20 -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
Stephen Birarda
078872a6db correct returned OAuth redirect URL 2016-03-21 15:26:26 -07:00
Stephen Birarda
7f3761481c don't store UUIDs for cookies on disk 2016-03-21 15:22:32 -07:00
Stephen Birarda
510e8e89f2 fix a crash in DS with missing cert/key 2016-03-21 15:22:05 -07:00
Anthony J. Thibault
0f31c3da10 Application: guard idle from being called within paintGL() 2016-03-21 15:21:16 -07:00
Zach Pomerantz
2b92756c65 Default bg to SKY_DOME 2016-03-21 15:11:26 -07:00
Anthony J. Thibault
ce47f83288 Prevent deadlock if idle is called during rendering 
This extraordinary event can occur if a MessageBox is popped up by the opengl driver.

* removed AvatarData::avatarLock
* removed AvatarUpdate

This code was left over from an earlier avatar threading experiment.

Removed AvatarData avatarLock and AvatarUpdate class
 2016-03-21 15:11:15 -07:00
ericrius1
81901dc73d log change 2016-03-21 15:04:57 -07:00
Andrew Meadows
0a00436700 Merge pull request #7411 from ZappoMan/fixBlenderCrashRedux 
Fix blender crash redux
 2016-03-21 15:04:22 -07:00
ericrius1
b8cb71e16a debug 2016-03-21 15:02:39 -07:00
Atlante45
170433997c Set Asset server max bandwidth wiring 2016-03-21 14:50:18 -07:00
Atlante45
d5f6ca5e1c Add max bandwidth setting 2016-03-21 14:50:18 -07:00
Atlante45
6d2498b4f2 Remove debug print 2016-03-21 14:50:18 -07:00
Atlante45
c48be75a37 Make sure everyone calls sendPeriod's setter 2016-03-21 14:50:18 -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
ericrius1
7659aed97a dont delete the entity when spawner script shutdown 2016-03-21 14:42:53 -07:00
ericrius1
b4e400f3aa baton sound logging updates 2016-03-21 14:42:28 -07:00
Zach Pomerantz
cc83a9bc36 Actually loop qml render and wake on pause 2016-03-21 14:36:45 -07:00
ericrius1
493a91fa27 with debug box 2016-03-21 14:32:22 -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
ericrius1
e5b2483604 sound seems to be working" 2016-03-21 14:09:02 -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
ericrius1
68dc5a8251 just playing on start update 2016-03-21 13:57:54 -07:00