Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 03:53:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
23216 commits 71 branches 56 tags 1.2 GiB
Commit graph

23216 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stojce Slavkovski
57011c2d4b get models from S3 2015-03-19 20:55:18 +01:00
Stojce Slavkovski
d0c4dddc1b Merge branch 'master' of https://github.com/highfidelity/hifi into 20397 2015-03-19 19:34:34 +01:00
Seth Alves
ed63e339bc Merge pull request #4475 from jherico/deadlock 
Removing unmatched QReadWriteLock::unlock() call
 2015-03-19 06:54:41 -07:00
Brad Davis
7d73a0317d Merge pull request #4473 from sethalves/maximum-capacity 
Maximum capacity
 2015-03-18 22:43:17 -07:00
Brad Davis
91906d619f Removing unmatched QReadWriteLock::unlock() call 2015-03-18 22:32:06 -07:00
Seth Alves
f800b29682 Merge pull request #4474 from AndrewMeadows/thermonuclear 
proper shape management for ConvexHull shapes
 2015-03-18 17:01:58 -07:00
samcake
c0a66a05f4 Merge pull request #4463 from ZappoMan/LODTweaks 
MVP Task - tweaks to automatic-LOD adjustments & Display warning when LOD is decreased
 2015-03-18 16:55:39 -07:00
Andrew Meadows
c032b29633 proper shape management for ConvexHull shapes 2015-03-18 16:29:57 -07:00
Seth Alves
4412ba916e don't lock out someone from localhost, even if the maximum number of users are connected 2015-03-18 15:17:25 -07:00
Seth Alves
610607e8e6 optionally limit number of avatars that can connect 2015-03-18 14:08:53 -07:00
Seth Alves
feeabc7bc8 Merge branch 'master' of github.com:highfidelity/hifi into maximum-capacity 2015-03-18 13:44:12 -07:00
Andrew Meadows
a07be6ba9f Merge pull request #4472 from sethalves/quiet-physics-log 
quiet physics log spam
 2015-03-18 13:41:23 -07:00
Seth Alves
405eceeda6 Merge branch 'master' of github.com:highfidelity/hifi into maximum-capacity 2015-03-18 13:26:46 -07:00
Seth Alves
dd97b54e52 quiet physics log spam 2015-03-18 13:22:29 -07:00
Andrew Meadows
517b2648ca Merge pull request #4465 from sethalves/avatars-can-collide 
One convex hull shape for models that provide decomposition data.
 2015-03-18 12:52:52 -07:00
Brad Davis
0c465ce2b5 Merge pull request #4460 from ZappoMan/runJSFiles 
MVP task - Allow a script to be added to a users "running script" from the marketplace
 2015-03-18 12:52:44 -07:00
Brad Hefta-Gaub
6d0fbcfcd6 Merge pull request #4470 from jherico/logspam 
Removing reported logspam from release builds
 2015-03-18 12:49:52 -07:00
ZappoMan
8239a295cb Merge branch 'master' of https://github.com/highfidelity/hifi into LODTweaks 2015-03-18 11:54:05 -07:00
ZappoMan
a2e012f7a9 Merge branch 'master' of https://github.com/highfidelity/hifi into runJSFiles 2015-03-18 11:53:19 -07:00
Stojce Slavkovski
00f1d96af5 Use existing house models 2015-03-18 19:30:08 +01:00
Brad Davis
07ee350c09 Removing reported logspam from release builds 2015-03-18 10:24:53 -07:00
Stojce Slavkovski
879e3054d1 Merge branch 'master' of https://github.com/highfidelity/hifi into 20397 2015-03-18 18:09:43 +01:00
samcake
948ced81ce Merge pull request #4461 from Atlante45/fix_recordings 
Fix recordings
 2015-03-18 09:52:29 -07:00
Brad Hefta-Gaub
53ae4b48bc Merge pull request #4459 from ctrlaltdavid/20400 
CR for 20400 - Name tags going through the head
 2015-03-17 21:54:13 -07:00
Brad Hefta-Gaub
a5294ae3fa Merge pull request #4436 from sethalves/persist-entities-as-json 
Optionally persist entities as json
 2015-03-17 21:53:17 -07:00
Seth Alves
2dd75fef2c remove some unneeded Q_OBJECT macros, diff minimization 2015-03-17 19:12:26 -07:00
Seth Alves
f9be7dda36 bump shape stuff from ModelEntityItem down to RenderableModelEntityItem 2015-03-17 18:55:13 -07:00
Brad Hefta-Gaub
55d9560c9e Merge pull request #4469 from jherico/frustumFetchCheck 
Fix broken aspect ratio in mirror
 2015-03-17 17:06:21 -07:00
Brad Davis
1662230289 Adding some fixmes to the code, since globals are evil and such checks should be confined to debug mode only 2015-03-17 16:44:29 -07:00
Brad Davis
e616308911 Adding runtime check to ensure that the correct frustum is fetched during rendering 2015-03-17 16:28:44 -07:00
Seth Alves
3a126d4840 ModelEntityItem doesn't need to be a QObject 2015-03-17 16:15:55 -07:00
Brad Davis
895a0d7b85 Correcting frustum usage by the avatar renderer that was causing aspect ratio problem 2015-03-17 16:14:35 -07:00
Seth Alves
42122a0bee EntityItem doesn't need to be a QObject 2015-03-17 15:56:58 -07:00
Seth Alves
1e28c385f1 Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-17 15:52:52 -07:00
Seth Alves
4bae19015c add (thus far unused) domain-server setting for maximum user capacity 2015-03-17 15:52:23 -07:00
ZappoMan
9dd913bd6d add copyright header to LODWarning.js 2015-03-17 15:51:08 -07:00
ZappoMan
6dbdfb7e7b add LODWarning.js to default scripts 2015-03-17 15:49:34 -07:00
ZappoMan
37ccd7b9f8 add LOD warnings script 2015-03-17 15:47:23 -07:00
Brad Hefta-Gaub
fde7d5d464 Merge pull request #4464 from jherico/rearView 
Removing a hack that breaks rendering of the head in mirror mode
 2015-03-17 15:24:43 -07:00
Stojce Slavkovski
af789f842d #20397 initial version of script 2015-03-17 22:47:18 +01:00
Seth Alves
222c3f01eb minor cleanups, diff minimization 2015-03-17 14:24:46 -07:00
Seth Alves
5475e76516 merge from upstream 2015-03-17 14:16:00 -07:00
Brad Davis
c88f6f8f07 Adding some documentation on the change 2015-03-17 13:49:06 -07:00
ZappoMan
1e03335012 implement scripting interface for LODManager 2015-03-17 13:18:29 -07:00
Brad Davis
71e59cfa88 Fix: Mini-mirror doesn't render avatar head when in first person mode 2015-03-17 13:15:15 -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
ZappoMan
e5be8d01b6 tweaks to automatic-LOD adjustments 2015-03-17 10:36:39 -07:00
Atlante45
3a11ed0574 Account for stereo audio in recorder 2015-03-17 16:40:26 +01:00
Atlante45
7121126e6f Wrong byte array size in audio client 2015-03-17 16:40:26 +01:00
Atlante45
b0fd28beeb Typo 2015-03-17 16:40:25 +01:00