Anthony Thibault
9faccabf0d
Merge branch 'master' of https://github.com/highfidelity/hifi into tony/vive-rendering-work
2016-03-21 21:55:53 -07:00
Anthony Thibault
b1286517c6
Removed frame latency in GLEscrow
...
This could occur if the GLEscrow queue has extra frames in it.
When new textures were fetched, before this fix, they were simply popped from the queue.
This commit introduces a loop, that will fetch from the queue until it is empty.
2016-03-21 21:51:16 -07:00
Anthony Thibault
225c462685
Improved NSIGHT instrumentation
...
* Application::idle, physics and avatar processing are tracked
* Application::paintGL frameNumber payload is tracked
* OpenGLDisplayPlugin::present is profiled with corresponding frameNumber payload
* Added color and payload support to Nsight ProfileRange class.
2016-03-21 21:47:59 -07:00
Brad Davis
28f25489f8
Fix occasional crash on creating overlay tool windows
2016-03-21 19:17:31 -07:00
Brad Hefta-Gaub
513138ca98
one more crack at fixing the blender
2016-03-21 18:28:26 -07:00
Philip Rosedale
6b3a4eb327
Merge pull request #7419 from hyperlogic/tony/no-locks-no-problem
...
Prevent deadlocks in AvatarUpdate
2016-03-21 17:54:27 -07:00
Seth Alves
eee4abfd95
Merge pull request #7420 from birarda/octree-leak
...
fix a memory leak in OctreePacketProcessor packet piggybacking
2016-03-21 17:52:04 -07:00
samcake
de374c0cac
Switching emissive and lightmap somewhere but not big issue
2016-03-21 17:51:57 -07:00
Anthony Thibault
0d046b12de
OpenVR: Moved WaitGetPoses after main window preview.
2016-03-21 17:39:10 -07:00
Anthony Thibault
63d6f888e6
Update openvr sdk to 0.9.19
2016-03-21 17:31:13 -07:00
Stephen Birarda
20c923db32
remove leaking unused method from NLPacketList
2016-03-21 17:26:49 -07:00
Clément Brisset
59b043d803
Merge pull request #7418 from birarda/ds-uuid-cookie
...
fix a crash in DS and remove storage of cookie UUIDs to disk
2016-03-21 17:17:01 -07:00
Philip Rosedale
c8816f8e76
Merge pull request #7389 from Menithal/on-grab-fix
...
Grab.js: Update Position on Mouse Grab Start
2016-03-21 17:10:00 -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
samcake
695e558851
Trying to clena up the problem?
2016-03-21 16:36:47 -07:00
Stephen Birarda
6b28523cb5
don't release the OPP processed packet
2016-03-21 16:29:18 -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
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
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
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
Andrew Meadows
0a00436700
Merge pull request #7411 from ZappoMan/fixBlenderCrashRedux
...
Fix blender crash redux
2016-03-21 15:04:22 -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
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
