Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-14 03:56:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
23462 commits 25 branches 0 tags 1.1 GiB
Commit graph

711 commits

Author SHA1 Message Date
Andrew Meadows
b9b2c30bba use QObject::deleteLater() not explicit delete 2015-03-27 09:01:44 -07:00
Stephen Birarda
ef0281ab43 use the new placename entry as entry point 2015-03-25 15:30:03 -07:00
Ryan Huffman
1c0e7e26a2 Merge pull request #4507 from birarda/friends-only-location 
make friends-only discoverability mode work as described
 2015-03-25 13:48:08 -07:00
Stephen Birarda
4bf8e9f625 change AccountManager request API, leverage in networking and DS 2015-03-25 12:04:04 -07:00
Leonardo Murillo
c3c1d4a5ae Switching to .com 2015-03-25 12:36:37 -06:00
ZappoMan
81bf7138a4 also attempt to clean up placement of PROP_ATTRIBUTION in the stream 2015-03-20 13:21:29 -07:00
Atlante45
0a3d936427 Merge branch 'master' of https://github.com/highfidelity/hifi into attribution_property 2015-03-20 17:28:32 +01:00
Brad Davis
599fe09e75 type & squish 2015-03-19 17:24:58 -07:00
Atlante45
d3ae7cf5cf Merge branch 'master' of https://github.com/highfidelity/hifi into attribution_property 2015-03-19 16:25:26 +01:00
Brad Davis
160f666d89 Merge branch 'master' into avatar 2015-03-18 12:55:56 -07:00
Atlante45
8b5ade10b8 Initial add of the Attribution property 2015-03-18 18:57:05 +01:00
Seth Alves
5475e76516 merge from upstream 2015-03-17 14:16:00 -07:00
Brad Davis
6415ff99f6 Work in progress 2015-03-17 12:04:04 -07:00
Seth Alves
069c358aa3 Work around a deadlock: 
thread 15 locks Octree
thread 1 blocks waiting for Octree lock
thread 15 tries to pass a message to thread 1 with QMetaObject::invokeMethod, and hangs

thread 15 is blocked on qt message passing to thread 1
  ResourceCache::getResource                       libraries/networking/src/ResourceCache.cpp:57
  GeometryCache::getGeometry                       libraries/render-utils/src/GeometryCache.cpp:1774
  ModelEntityItem::isReadyToComputeShape           libraries/entities/src/ModelEntityItem.cpp:431
  PhysicsEngine::addEntityInternal                 libraries/physics/src/PhysicsEngine.cpp:67
  EntitySimulation::addEntity                      libraries/entities/src/EntitySimulation.cpp:129
  EntityTree::postAddEntity                        libraries/entities/src/EntityTree.cpp:91
        ^ locks simulation
  EntityTreeElement::readElementDataFromBuffer     libraries/entities/src/EntityTreeElement.cpp:773
  Octree::readElementData                          libraries/octree/src/Octree.cpp:301
  Octree::readElementData                          libraries/octree/src/Octree.cpp:354
  ...
  Octree::readBitstreamToTree                      libraries/octree/src/Octree.cpp:439
  OctreeRenderer::processDatagram                  libraries/octree/src/OctreeRenderer.cpp:136
        ^ lockForWrite Octree::_lock
  OctreePacketProcessor::processPacket             interface/src/octree/OctreePacketProcessor.cpp:91
  ReceivedPacketProcessor::process                 libraries/networking/src/ReceivedPacketProcessor.cpp:51

thread 1 is blocked on lockForWrite of Octree::_lock
  Octree::lockForWrite                             libraries/octree/src/Octree.h:292
  EntityTree::update                               libraries/entities/src/EntityTree.cpp:668
        ^ lockForWrite on Octree:_lock
  EntityTreeRenderer::update                       libraries/entities-renderer/src/EntityTreeRenderer.cpp:258
  Application::update                              interface/src/Application.cpp:2189
        ^ calls _physicsEngine.stepSimulation() before this
  Application::idle                                interface/src/Application.cpp:1535
  timer
 2015-03-17 11:38:42 -07:00
Brad Davis
86881fb4d4 Merge branch 'master' into avatar 2015-03-17 09:44:10 -07:00
Brad Davis
d7b1852164 Creating eachMatchingNode and using it in avatar mixer 2015-03-16 15:25:44 -07:00
Stephen Birarda
a874f933c6 go to sandbox if location not present in settings 2015-03-16 11:00:04 -07:00
Seth Alves
019ea55d24 minimize diff 2015-03-15 08:21:57 -07:00
Seth Alves
50798398ff merge from upstream 2015-03-13 18:04:55 -07:00
Stephen Birarda
641581a825 Merge pull request #4446 from huffman/marketplace-window 
Marketplace window
 2015-03-13 17:51:44 -07:00
samcake
8581e6b4a9 Merge pull request #4445 from Atlante45/resource_cache_bug 
Fix the timeout crash
 2015-03-13 17:29:23 -07:00
Ryan Huffman
f44ab9da8f Update OAuthNetworkAccessManager to only send auth to metaverse 2015-03-13 17:29:01 -07:00
Atlante45
405301f861 Don't refresh if no lastModified tag in http request 2015-03-13 20:24:52 +01:00
Atlante45
691b078efc Fix the timeout crash 2015-03-13 18:43:51 +01:00
Seth Alves
89b58e2681 trying to get loaded callback for model hooked up to PhysicsEngine 2015-03-13 09:11:15 -07:00
Stephen Birarda
0fe843db01 Revert "remove the launch activity from UserActivityLogger" 
This reverts commit bc6ac9081f.
 2015-03-12 15:53:05 -07:00
Stephen Birarda
bc6ac9081f remove the launch activity from UserActivityLogger 2015-03-12 15:08:05 -07:00
Stephen Birarda
0b55a0f123 remove the close event from UserActivityLogger 2015-03-12 15:06:44 -07:00
Stephen Birarda
df8864f9b0 Revert "make sure UserActivityLogger::close() waits for the pending log message to complete" 
This reverts commit 3bd3f5a6d2.
 2015-03-12 15:04:51 -07:00
Stephen Birarda
09e2c0987e use Dependency customDeleter for Application NL 2015-03-12 12:27:48 -07:00
Stephen Birarda
7bfc747748 Revert "Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList"" 
This reverts commit 9269b2a0b2.
 2015-03-12 12:13:32 -07:00
Stephen Birarda
9269b2a0b2 Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList" 2015-03-12 11:28:07 -07:00
Stephen Birarda
4da9186045 Merge pull request #4429 from birarda/master 
NOT MERGEABLE: graceful cleanup on Application dtor for NodeList
 2015-03-12 11:26:56 -07:00
Stephen Birarda
851d020390 remove QThread include required for debug 2015-03-11 17:21:49 -07:00
Stephen Birarda
7a8e94f1e5 remove extra debug information for node thread cleanup 2015-03-11 17:18:49 -07:00
Stephen Birarda
5d9a3811ca more graceful cleanup for Application NodeList and DatagramProcessor 2015-03-11 17:14:20 -07:00
Stephen Birarda
9f754e40d0 move all silent node timers into LimitedNodeList 2015-03-11 16:59:06 -07:00
ZappoMan
e87e0a1e0b some cleanup of dead code related to timers 2015-03-11 16:27:04 -07:00
ZappoMan
3bd3f5a6d2 make sure UserActivityLogger::close() waits for the pending log message to complete 2015-03-10 14:23:23 -07:00
Seth Alves
99300a5bc8 merge from master 2015-03-09 13:39:51 -07:00
Andrew Meadows
51d05cc43e merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
 2015-03-09 08:51:49 -07:00
Seth Alves
08c3fa6363 merge from upstream 2015-03-08 17:29:05 -07:00
Brad Hefta-Gaub
21cd7e36e0 Merge pull request #4381 from Atlante45/disk_cache 
Disk cache tweaks
 2015-03-08 11:40:40 -07:00
Jason
0fd9540bc3 Sync to upstream 
Did "fetch upstream", "merge upstream/master", and resolved one
conflict.
 2015-03-07 21:40:06 -08:00
Seth Alves
1a1863679d bump entity-data message version number 2015-03-07 20:32:41 -08:00
Seth Alves
d713d5596f bump entity-data message version number 2015-03-07 20:32:28 -08:00
Seth Alves
b8cdf1a318 quiet warning 2015-03-07 20:31:53 -08:00
Seth Alves
bb0f6b4d28 uninitialized variable 2015-03-07 11:27:52 -08:00
Seth Alves
6772847d0b make it so I don't have to count 2015-03-07 07:52:39 -08:00
Andrew Meadows
f5352333f0 entities use radians per second for angular velocity 2015-03-06 16:42:06 -08:00