Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
23462 commits 29 branches 0 tags 1.1 GiB
Commit graph

7785 commits

Author SHA1 Message Date
ZappoMan
19c8e526e1 add guards to _jointStates array size 2015-03-23 08:47:06 -07:00
Andrew Meadows
49f5de2b94 make character's "up" axis depend on orientation 2015-03-20 16:39:38 -07:00
Brad Davis
2d4aee7343 Merge pull request #4480 from samcake/temp1 
Fixing the intel bug & switching the shaders away from the QtProgramObject to the gpu::Shader
 2015-03-20 16:11:23 -07:00
Sam Gateau
07bcd115c2 trying to remove useless glsl code for Legacy path 2015-03-20 13:28:42 -07:00
ZappoMan
81bf7138a4 also attempt to clean up placement of PROP_ATTRIBUTION in the stream 2015-03-20 13:21:29 -07:00
Andrew Meadows
0164de80fe apply coding standard to CharacterController 2015-03-20 13:19:24 -07:00
Sam Gateau
68de91c80a cleaning code for review 2015-03-20 13:17:32 -07:00
Andrew Meadows
6454149536 formatting and comments 2015-03-20 12:45:29 -07:00
Sam Gateau
5063159581 cleaning code for review 2015-03-20 12:00:16 -07:00
Sam Gateau
1babf53643 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-03-20 11:55:30 -07:00
Sam Gateau
fdbf4e5288 cleaning code for review 2015-03-20 11:55:00 -07:00
ZappoMan
ad833b76c8 fix PROP index mismatch 2015-03-20 11:43:01 -07:00
Atlante45
0a3d936427 Merge branch 'master' of https://github.com/highfidelity/hifi into attribution_property 2015-03-20 17:28:32 +01:00
Atlante45
63c51673de Move PROP_COLLISION_MODEL_URL to the right spot 2015-03-20 17:28:00 +01:00
Andrew Meadows
e7423caf2b merge upstream/master into andrew/bispinor 2015-03-20 08:43:36 -07:00
Andrew Meadows
ab9d8eb345 reorder arguments to StepDownConvexResultCallback ctor 2015-03-20 08:42:35 -07:00
Brad Hefta-Gaub
451aedbb3c Merge pull request #4476 from jherico/avatar 
Working on tuning the avatar updates to take into account available per-node bandwidth as well as distance
 2015-03-19 18:40:07 -07:00
Brad Davis
7079b5f978 type & squish again 2015-03-19 17:29:57 -07:00
Brad Davis
599fe09e75 type & squish 2015-03-19 17:24:58 -07:00
Andrew Meadows
230a8851e7 merge upstream/master into andrew/bispinor 
Conflicts:
	libraries/physics/src/PhysicsEngine.cpp
 2015-03-19 16:38:10 -07:00
Andrew Meadows
90a8844738 merge upstream/master into andrew/bispinor 
Conflicts:
	libraries/physics/src/PhysicsEngine.cpp
 2015-03-19 16:18:52 -07:00
samcake
d2868bcafc fixing the shader for mac 2015-03-19 16:00:47 -07:00
Brad Davis
bf607e4c9c Fixing indentation and usage 2015-03-19 15:53:16 -07:00
Seth Alves
1db9a9ef46 use .isEmpty on urls rather than convert them to strings and compare to empty string 2015-03-19 15:48:48 -07:00
Andrew Meadows
3cd2ce82d4 tuning character so it can walk up ledges 2015-03-19 15:31:34 -07:00
Sam Gateau
65727dd613 clean up code 2015-03-19 15:23:50 -07:00
Sam Gateau
619a323196 Using Scribe preprocessor @func@ instead of regular glsl function to solve the intel bug with the transform stack 2015-03-19 14:46:50 -07:00
Sam Gateau
20764e9917 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-03-19 09:57:34 -07:00
Brad Davis
2552afffe7 Merge branch 'master' into avatar 2015-03-19 09:47:36 -07:00
Atlante45
cbef6e546f Fix emun placement 2015-03-19 17:25:53 +01:00
Seth Alves
8eedab72b3 remove some unneeded asserts 2015-03-19 09:15:57 -07:00
Seth Alves
480eae7317 Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-19 09:14:26 -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
91906d619f Removing unmatched QReadWriteLock::unlock() call 2015-03-18 22:32:06 -07:00
Sam Gateau
f874a3ae82 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-03-18 17:26:31 -07:00
Sam Gateau
b33ba64e05 trying to tweek the transform equation to find the intel bug 2015-03-18 17:20:27 -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
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
e2a104c38a unjack AvatarData locks 2015-03-18 14:11:02 -07:00
Seth Alves
dd97b54e52 quiet physics log spam 2015-03-18 13:22:29 -07:00
Seth Alves
1cab14064d remove unneeded code, quiet some debug spew 2015-03-18 13:10:53 -07:00
Seth Alves
36e0a5afc5 cleanups 2015-03-18 13:04:27 -07:00
Seth Alves
b7a54e672d Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-18 13:01:07 -07:00
Seth Alves
9161cc8b83 attempt to handle collision models in the same way as render models 2015-03-18 13:00:09 -07:00
Brad Davis
160f666d89 Merge branch 'master' into avatar 2015-03-18 12:55:56 -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
ZappoMan
8239a295cb Merge branch 'master' of https://github.com/highfidelity/hifi into LODTweaks 2015-03-18 11:54:05 -07:00
Atlante45
8b5ade10b8 Initial add of the Attribution property 2015-03-18 18:57:05 +01:00
samcake
948ced81ce Merge pull request #4461 from Atlante45/fix_recordings 
Fix recordings
 2015-03-18 09:52:29 -07:00
Seth Alves
906f082a2a Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-18 09:11:35 -07:00
Andrew Meadows
8eec83c144 comments and formatting 2015-03-17 22:28:38 -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
Andrew Meadows
180d147806 merge upstream/master into andrew/isentropic 2015-03-17 15:59:09 -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
Brad Davis
6415ff99f6 Work in progress 2015-03-17 12:04:04 -07:00
Brad Davis
1c6db9c8cf Merge branch 'tryLocker' into avatar 2015-03-17 11:50:08 -07:00
Brad Davis
80b5a44cc4 Adding a RAII version of the mutex locker that uses tryLock instead of lock 2015-03-17 11:49:17 -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
Brad Davis
86881fb4d4 Merge branch 'master' into avatar 2015-03-17 09:44:10 -07:00
Andrew Meadows
9ea13fac37 cleanup formatting 2015-03-17 09:01:36 -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
Andrew Meadows
b4263cd2eb allow objs to collide agains char controller 
but char controller only responds to penetration when enabled
 2015-03-16 17:10:49 -07:00
Seth Alves
b76103edb0 clean up debugging spew 2015-03-16 16:44:29 -07:00
Andrew Meadows
78b614f855 move avatar details into CharacterController 2015-03-16 16:24:32 -07:00
Brad Davis
d7b1852164 Creating eachMatchingNode and using it in avatar mixer 2015-03-16 15:25:44 -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