Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-15 18:13:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41073 commits 25 branches 0 tags 1.1 GiB
Commit graph

16593 commits

Author SHA1 Message Date
Andrew Meadows
a52ac3cc50 remove excess whitespace 2016-03-23 14:39:49 -07:00
Brad Davis
84dc15aff6 Fix potential deadlock in QML 2016-03-23 12:59:17 -07:00
Brad Hefta-Gaub
8c290ea6b9 Merge pull request #7390 from Atlante45/feat/udp-flood-protection 
Server side bandwidth dial
 2016-03-23 11:47:41 -07:00
Brad Hefta-Gaub
08b87b9b98 Merge pull request #7434 from zzmp/clean/incomplete-fbo 
Clean up QML Render Thread
 2016-03-23 10:43:21 -07:00
Brad Hefta-Gaub
2e6c360708 Merge pull request #7427 from huffman/fix-scriptengine-threading 
Add protection around ScriptEngine::runInThread being called twice
 2016-03-23 10:27:16 -07:00
Chris Collins
29ac80d3fe Merge pull request #7430 from ZappoMan/blenderDestructorCrash 
make Blender keep a shared pointer to the model it's blending
 2016-03-23 09:00:01 -07:00
Brad Hefta-Gaub
03a12ecf5a Merge pull request #7433 from zzmp/fix/long-qml-instantiation 
Avoid triggering deadlock on long local qml component instantion
 2016-03-23 08:30:50 -07:00
Brad Davis
252a49eea4 Add a tracker and logging of memory allocated by the GPU library 2016-03-22 22:35:46 -07:00
Zach Pomerantz
40b21933a5 Clean QML Surface render log 2016-03-22 18:42:54 -07:00
Zach Pomerantz
fe1d8b24b4 Lock the QML Surface resizing better 2016-03-22 18:42:46 -07:00
Zach Pomerantz
b41c106f3c Only set the context once per QML surface 2016-03-22 18:40:58 -07:00
Zach Pomerantz
745438148a Reset deadlock watch before qml load 2016-03-22 17:17:36 -07:00
Brad Hefta-Gaub
9f0084dbb1 make Blender keep a shared pointer to the model it's blending 2016-03-22 16:01:31 -07:00
Brad Davis
3e71316589 Merge pull request #7426 from ZappoMan/avatarIdentityFix 
fix to default avatar model
 2016-03-22 13:46:52 -07:00
Brad Hefta-Gaub
d372ca47ad Merge pull request #7428 from zzmp/fix/clear-qml-gl 
Clear GL error before initializing qml to avoid mystery crash
 2016-03-22 13:39:45 -07:00
Zach Pomerantz
e28a876629 Compare gl to GL_NO_ERROR, not GLEW_OK 2016-03-22 13:25:43 -07:00
Zach Pomerantz
471ac80135 Revert most of "Rm extra GL logging" 2016-03-22 13:24:29 -07:00
Brad Hefta-Gaub
361aa3e683 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarIdentityFix 2016-03-22 12:31:19 -07:00
Zach Pomerantz
362e288be8 Rm mystery GL error before qml fbo 2016-03-22 12:05:24 -07:00
Zach Pomerantz
23e3b7e4e3 Rm extra GL logging 2016-03-22 12:04:58 -07:00
Zach Pomerantz
64ced6ee04 Add comment explaining bare glGetError 2016-03-22 12:04:24 -07:00
Brad Hefta-Gaub
691ee87c73 fix to default avatar model 2016-03-22 11:32:38 -07:00
Ryan Huffman
1a2f74f43a Add protection around ScriptEngine::runInThread being called twice 2016-03-22 11:26:10 -07:00
Seth Alves
47fb85eaeb be more defensive in FBXGeometry::convexHullContains 2016-03-22 11:24:12 -07:00
Philip Rosedale
f57332e4be Merge pull request #7421 from ZappoMan/fixBlenderCrashRedux 
one more crack at fixing the blender
 2016-03-22 09:51:21 -07:00
Andrew Meadows
114cb27c4f Merge pull request #7422 from jherico/tabs 
Fix occasional crash on creating overlay tool windows
 2016-03-22 09:49:22 -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
Stephen Birarda
20c923db32 remove leaking unused method from NLPacketList 2016-03-21 17:26:49 -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
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
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
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
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