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 |
|
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 |
|
samcake
|
948ced81ce
|
Merge pull request #4461 from Atlante45/fix_recordings
Fix recordings
|
2015-03-18 09:52:29 -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 |
|
Sam Gateau
|
5a40fcee17
|
set the defines for GPU profile correctly AGAIN
|
2015-03-17 16:51:59 -07:00 |
|
Sam Gateau
|
74ae0c4a85
|
set the defines for GPU profile correctly
|
2015-03-17 16:35:32 -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 |
|
Seth Alves
|
42122a0bee
|
EntityItem doesn't need to be a QObject
|
2015-03-17 15:56:58 -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 |
|
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 |
|
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 |
|
Seth Alves
|
b76103edb0
|
clean up debugging spew
|
2015-03-16 16:44:29 -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 |
|
Seth Alves
|
fe658c0ed0
|
diff minimization
|
2015-03-16 12:13:16 -07:00 |
|
Seth Alves
|
5bc2d88ea6
|
diff minimization
|
2015-03-16 12:11:41 -07:00 |
|
Seth Alves
|
999324bcaf
|
remove unused code
|
2015-03-16 12:06:27 -07:00 |
|
Seth Alves
|
1e50d94384
|
don't put arbitrarily large array on stack
|
2015-03-16 11:59:30 -07:00 |
|
Seth Alves
|
2d4a95c634
|
move to-map recurse operator class to its own file
|
2015-03-16 11:54:50 -07:00 |
|
Seth Alves
|
109271de3d
|
remove unused constant
|
2015-03-16 11:54:06 -07:00 |
|
Seth Alves
|
ecb958687d
|
don't crash if we encounter an unknown shape type
|
2015-03-16 11:53:47 -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 |
|
Seth Alves
|
32c79f6172
|
bounce json's QVariants through QScripts before making them into properties, in order to take advantage of existing conversion code
|
2015-03-16 09:17:32 -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 |
|
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
|
b15fd2ef94
|
compatibility and other fixes for obj reader
|
2015-03-15 08:08:39 -07:00 |
|
Seth Alves
|
6c4b808813
|
Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json
|
2015-03-15 07:10:56 -07:00 |
|