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

23135 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
1e28c385f1 Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-17 15:52:52 -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
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
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
Brad Hefta-Gaub
d33d3afb52 Merge pull request #4454 from Atlante45/fix_mouse_visible_in_oculus 
Hide cursor at MainWindow level when in VRMode
 2015-03-17 08:06:05 -07:00
Clément Brisset
9acc4a1a8f Merge pull request #4457 from ZappoMan/quietLogs 
dont report deleteEntity warnings in client for delete messages coming back from server
 2015-03-17 15:42:20 +01:00
Clément Brisset
6ffd44e768 Merge pull request #4456 from birarda/master 
go to sandbox if location not present in settings
 2015-03-17 15:31:09 +01:00
Atlante45
1f8a874ce6 Hide cursor in 3D TV mode too 2015-03-17 12:34:13 +01:00
Brad Hefta-Gaub
88b3f14000 Merge pull request #4458 from jherico/nsight2 
Making nsight usage optional (still defaults to on)
 2015-03-16 19:04:05 -07:00
Seth Alves
b76103edb0 clean up debugging spew 2015-03-16 16:44:29 -07:00
Brad Davis
fd29f72bfe Making nsight usage optional (still defaults to on) 2015-03-16 12:59:41 -07:00
Andrew Meadows
e18d9fd81c Merge pull request #4452 from sethalves/obj-reader-fixes 
Obj reader fixes
 2015-03-16 11:35:51 -07:00
Andrew Meadows
fa27b76183 Merge pull request #4442 from Atlante45/edit_entities_box_selection 
editEntities - select all in/touching box
 2015-03-16 11:33:35 -07:00
Seth Alves
08cb13640c debugging spew 2015-03-16 11:22:42 -07:00
ZappoMan
7ddd54b782 dont report deleteEntity warnings in client for delete messages coming back from server 2015-03-16 11:11:07 -07:00
Stephen Birarda
a874f933c6 go to sandbox if location not present in settings 2015-03-16 11:00:04 -07:00
Seth Alves
a2bc34ced9 fix attempt to avoid normalizing a zero length vector, other adjustments to respond to code review 2015-03-16 10:03:55 -07:00
Andrew Meadows
510bcb4488 Merge pull request #4453 from sethalves/quiet-some-warnings 
Quiet some warnings
 2015-03-16 09:31:14 -07:00
Atlante45
c421adaf58 Fix unresolve merge conflict 2015-03-16 16:27:33 +01:00
Atlante45
a9ed09a742 Merge branch 'master' of https://github.com/highfidelity/hifi into edit_entities_box_selection 2015-03-16 15:53:59 +01:00
Clément Brisset
468b62e536 Merge pull request #4451 from sethalves/linux-tools-window-freakout 
don't autohide tools window on Linux
 2015-03-16 07:41:52 -07:00
Atlante45
c6167f6893 CR 2015-03-16 14:35:17 +01:00
Atlante45
ad16f49d01 Merge branch 'master' of https://github.com/highfidelity/hifi into edit_entities_box_selection 2015-03-16 14:28:24 +01:00
Clément Brisset
dfd39ca1e1 Merge pull request #4448 from huffman/loading-image 
Add hourglass image to loading svo overlay
 2015-03-16 06:25:41 -07:00
Clément Brisset
934d9c087a Merge pull request #4447 from ctrlaltdavid/20394 
CR for Job #20394 - Build friends.js v1
 2015-03-16 06:24:35 -07:00
Atlante45
c5010c4d55 Hide cursor at MainWindow level when in VRMode 2015-03-16 14:19:24 +01:00
Seth Alves
bd85179d82 suppress a compiler warning 2015-03-15 08:24:59 -07:00
Seth Alves
af10c2274b remove stray carriage returns 2015-03-15 08:24:49 -07:00
Seth Alves
019ea55d24 minimize diff 2015-03-15 08:21:57 -07:00
Seth Alves
d074cec135 fix obj writer in vhacd util 2015-03-15 08:14:25 -07:00
Seth Alves
b15fd2ef94 compatibility and other fixes for obj reader 2015-03-15 08:08:39 -07:00
Seth Alves
bfa38521ed linux desktops are often configured as point-to-focus. don't autohide tools window on linux 2015-03-15 07:59:32 -07:00
Seth Alves
59e4efa651 debugging prints around a deadlock 2015-03-15 07:10:43 -07:00
Seth Alves
250567e315 formatting, diff minimization 2015-03-14 12:09:23 -07:00
Seth Alves
6b49b0ed7d formatting 2015-03-14 11:58:53 -07:00
Seth Alves
a58f0fe76e remove cruft, formatting 2015-03-14 11:57:08 -07:00
Seth Alves
0c803cd82b fix up obj reader and writer 2015-03-14 11:50:16 -07:00
Seth Alves
833fb2e2f4 obj file handles faces of the form 1/2/3 2015-03-13 20:16:53 -07:00
Seth Alves
b815c365eb formatting 2015-03-13 18:57:27 -07:00
Seth Alves
f7f75cabf4 formatting 2015-03-13 18:49:48 -07:00
Leonardo Murillo
d6bf0f3bec Merge pull request #4450 from birarda/master 
some & squishes missed in review, metaverse user-agent fix
 2015-03-13 19:48:59 -06:00
Seth Alves
87cc710efc more merge madness, calculate 2nd PhysicsEngine hash with qChecksum if url is set 2015-03-13 18:43:24 -07:00
Seth Alves
d749b350eb still recovering from troubled merge 2015-03-13 18:29:59 -07:00
Stephen Birarda
9d055f81f4 use a Mozilla user agent for mod security 2015-03-13 18:29:55 -07:00
Stephen Birarda
9f7ed7b12a update user agent to be HighFidelityInterface 2015-03-13 18:28:09 -07:00
Seth Alves
a5cdc3c68b still recovering from troubled merge 2015-03-13 18:27:52 -07:00
Seth Alves
c24ea023f6 still recovering from troubled merge 2015-03-13 18:26:09 -07:00