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

23204 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
b33ba64e05 trying to tweek the transform equation to find the intel bug 2015-03-18 17:20:27 -07:00
samcake
0f22d64802 compilation on MacOSX 2015-03-18 16:28:42 -07:00
Sam Gateau
414315b6e0 Since glProgramUniform is not supported on MAc we need a workaround... 2015-03-18 16:15:06 -07:00
Sam Gateau
b5eb4a7f5b Since glProgramUniform is not supported on MAc we need a workaround... 2015-03-18 16:12:47 -07:00
Sam Gateau
dc27bfb6ef Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-03-18 15:59:50 -07:00
Sam Gateau
0bd78be7f4 Transition model shaders to gpu:Shader 2015-03-18 15:57:01 -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
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
a2e012f7a9 Merge branch 'master' of https://github.com/highfidelity/hifi into runJSFiles 2015-03-18 11:53:19 -07:00
Brad Davis
07ee350c09 Removing reported logspam from release builds 2015-03-18 10:24:53 -07: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
Sam Gateau
5a40fcee17 set the defines for GPU profile correctly AGAIN 2015-03-17 16:51:59 -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
Sam Gateau
74ae0c4a85 set the defines for GPU profile correctly 2015-03-17 16:35:32 -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
Sam Gateau
76ac8d7eec Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-03-17 16:15:59 -07:00
Seth Alves
3a126d4840 ModelEntityItem doesn't need to be a QObject 2015-03-17 16:15:55 -07:00
Sam Gateau
03da3aeab4 Clean up on the GPU Profile defines in order to control features 2015-03-17 16:15:10 -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
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
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
ZappoMan
749bc1ee9b support for loading of JS files by drag, web page urls, and openfile events 2015-03-17 08:38:39 -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
David Rowe
d08a25f1a3 A more realistic default head height 2015-03-16 15:48:10 -07:00
David Rowe
913527eaa3 Calculate head height based on skeleton model mesh if no head model 
This fixes the problem of some skeleton models with heads having
display names rendering through them.
 2015-03-16 15:47:54 -07:00
Seth Alves
bed37ef49a incorporate code review feedback 2015-03-16 13:57:22 -07:00
Brad Davis
fd29f72bfe Making nsight usage optional (still defaults to on) 2015-03-16 12:59:41 -07:00
Seth Alves
c90ca4b425 Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-16 12:13:26 -07:00