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
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
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
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
Seth Alves
87cc710efc more merge madness, calculate 2nd PhysicsEngine hash with qChecksum if url is set 2015-03-13 18:43:24 -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
Stephen Birarda
dcff4f5956 use HIGH_FIDELITY_USER_AGENT for DataWebPage 2015-03-13 18:25:17 -07:00
Seth Alves
af2c00b235 still recovering from troubled merge 2015-03-13 18:21:59 -07:00
Seth Alves
8481a65fbb still recovering from troubled merge 2015-03-13 18:21:30 -07:00
Seth Alves
2345e5a4f9 oops 2015-03-13 18:19:49 -07:00
Seth Alves
7230257b9e oops 2015-03-13 18:08:58 -07:00
Seth Alves
0cfc48ab43 don't copy hull points 2015-03-13 18:05:02 -07:00
Seth Alves
50798398ff merge from upstream 2015-03-13 18:04:55 -07:00
Stephen Birarda
641581a825 Merge pull request #4446 from huffman/marketplace-window 
Marketplace window
 2015-03-13 17:51:44 -07:00
Philip Rosedale
6a4dbd35b5 Merge pull request #4449 from AndrewMeadows/thermonuclear 
ShapeManager can release shape by pointer
 2015-03-13 17:34:32 -07:00
Philip Rosedale
009551c4dd Merge pull request #4441 from AndrewMeadows/isentropic 
more correct shape for avatar collision capsule
 2015-03-13 17:33:16 -07:00
Seth Alves
43dbd64f4a fix obj reader 2015-03-13 17:31:52 -07:00
samcake
8581e6b4a9 Merge pull request #4445 from Atlante45/resource_cache_bug 
Fix the timeout crash
 2015-03-13 17:29:23 -07:00
Ryan Huffman
f44ab9da8f Update OAuthNetworkAccessManager to only send auth to metaverse 2015-03-13 17:29:01 -07:00
Andrew Meadows
e4c6d49c4d ShapeManager can release shape by pointer 2015-03-13 16:36:18 -07:00
Seth Alves
2368e6e5b7 collision with a hull sort of works. there is a new memory corruption problem 2015-03-13 15:41:57 -07:00
Ryan Huffman
d512a67c8a Merge branch 'master' of github.com:highfidelity/hifi into edit-lights-overlays 2015-03-13 14:13:56 -07:00
Atlante45
405301f861 Don't refresh if no lastModified tag in http request 2015-03-13 20:24:52 +01:00
Atlante45
691b078efc Fix the timeout crash 2015-03-13 18:43:51 +01:00
Andrew Meadows
99e2d799c5 correct math for capsule halfHeight 2015-03-13 09:40:32 -07:00
Andrew Meadows
924ebe1e54 propagate skeleton's bounding box into AvatarData 2015-03-13 09:39:47 -07:00
Seth Alves
89b58e2681 trying to get loaded callback for model hooked up to PhysicsEngine 2015-03-13 09:11:15 -07:00
Atlante45
29300e0ae0 Added findEntitiesInBox to JS API 2015-03-13 13:55:26 +01:00
Atlante45
7911974946 Added findEntities for AAbox 2015-03-13 13:55:26 +01:00
Andrew Meadows
be252147e2 merge upstream/master into andrew/isentropic 2015-03-12 16:38:59 -07:00
Seth Alves
a945421d9d still trying to make PhysicsEngine::addEntityInternal be async 2015-03-12 16:38:55 -07:00
Andrew Meadows
a1a12465da able to update avatar controller in PhysicsEngine 2015-03-12 16:36:41 -07:00
Seth Alves
4b1fc4fa10 merge from upstream 2015-03-12 15:59:37 -07:00
Seth Alves
2cf0e1ab25 break PhysicsEngine::addEntityInternal in half, making the 2nd part asynch. This is to allow a ModelEntityItem time to download its collision hull before the 2nd part runs 2015-03-12 15:58:09 -07:00
Stephen Birarda
0fe843db01 Revert "remove the launch activity from UserActivityLogger" 
This reverts commit bc6ac9081f.
 2015-03-12 15:53:05 -07:00
Stephen Birarda
bc6ac9081f remove the launch activity from UserActivityLogger 2015-03-12 15:08:05 -07:00
Stephen Birarda
0b55a0f123 remove the close event from UserActivityLogger 2015-03-12 15:06:44 -07:00
Stephen Birarda
df8864f9b0 Revert "make sure UserActivityLogger::close() waits for the pending log message to complete" 
This reverts commit 3bd3f5a6d2.
 2015-03-12 15:04:51 -07:00
Stephen Birarda
471e55c8ce fix some lingering warnings 2015-03-12 12:36:39 -07:00
Stephen Birarda
09e2c0987e use Dependency customDeleter for Application NL 2015-03-12 12:27:48 -07:00
Stephen Birarda
cd2ce2ee2f Merge branch 'master' of https://github.com/highfidelity/hifi 2015-03-12 12:14:43 -07:00
Stephen Birarda
7bfc747748 Revert "Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList"" 
This reverts commit 9269b2a0b2.
 2015-03-12 12:13:32 -07:00
Seth Alves
3c61727a22 Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-12 11:56:12 -07:00
Ryan Huffman
ebf70f818a Merge branch 'master' of git://github.com/highfidelity/hifi into edit-light-2 
Conflicts:
	examples/editEntities.js
 2015-03-12 11:39:26 -07:00
Seth Alves
b945ce5e7a Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-12 11:38:01 -07:00
Seth Alves
c9eacd2197 remove unneeded debug print 2015-03-12 11:37:53 -07:00
Seth Alves
6903904267 formatting 2015-03-12 11:31:57 -07:00
Seth Alves
e66ac7f982 formatting 2015-03-12 11:29:47 -07:00
Stephen Birarda
9269b2a0b2 Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList" 2015-03-12 11:28:07 -07:00
Stephen Birarda
4da9186045 Merge pull request #4429 from birarda/master 
NOT MERGEABLE: graceful cleanup on Application dtor for NodeList
 2015-03-12 11:26:56 -07:00
Seth Alves
4aa7b0eb0f provide defaults for anything entity properties read from a map 2015-03-12 11:19:47 -07:00
Ryan Huffman
5c9ec6bdcc Add add/delete/rename/clear events to EntitiesScriptingInterface 2015-03-12 11:17:07 -07:00
Atlante45
eb5206f8e6 Naming 2015-03-12 19:05:06 +01:00
Atlante45
0bd97ce40c Dependency::customDeleter uses a lambda 2015-03-12 18:53:29 +01:00
Seth Alves
9e6c289ab8 move filename utils into shared library 2015-03-12 10:23:57 -07:00
Seth Alves
3bc85c2531 instead of a json checkbox, a dropdown to chose the file type 2015-03-12 09:34:01 -07:00
Seth Alves
ac882f86e2 backup code is now aware of possible file extension differences 2015-03-12 09:13:53 -07:00
Seth Alves
2a06816f71 added persist-as-json checkbox to domain settings. File extension of persist file is automatically adjusted when entity server saves. When loading, if both a json and svo file exist, the newer one is used. This is regardless of the persistAsJson setting 2015-03-11 23:09:15 -07:00
Seth Alves
87ac38c3df Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-11 18:35:13 -07:00
Seth Alves
ed47753e33 Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-11 18:34:39 -07:00
Seth Alves
bf1cb951a3 move PhysicsEntity so that ModelEntityItem can initiate a model download 2015-03-11 18:34:27 -07:00
Stephen Birarda
851d020390 remove QThread include required for debug 2015-03-11 17:21:49 -07:00
Stephen Birarda
7a8e94f1e5 remove extra debug information for node thread cleanup 2015-03-11 17:18:49 -07:00
Stephen Birarda
5d9a3811ca more graceful cleanup for Application NodeList and DatagramProcessor 2015-03-11 17:14:20 -07:00
Stephen Birarda
9f754e40d0 move all silent node timers into LimitedNodeList 2015-03-11 16:59:06 -07:00
ZappoMan
e87e0a1e0b some cleanup of dead code related to timers 2015-03-11 16:27:04 -07:00
Seth Alves
df29d5365a Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-11 15:18:55 -07:00
Seth Alves
918cfa8b4e Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-11 14:36:25 -07:00
Andrew Meadows
feafa0a60b remove old Ragdoll and avatar interactions 2015-03-11 14:29:03 -07:00
Seth Alves
3a3e723f4e trying to figureo out where to download hull models 2015-03-11 14:26:30 -07:00
Seth Alves
20a22ff42c Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-11 07:17:19 -07:00
Seth Alves
1c73f50dbc started to hook up geometry downloader to ShapeInfo 2015-03-11 07:17:13 -07:00
Brad Hefta-Gaub
5cced9fc66 Merge pull request #4400 from samcake/temp0 
Introduce gpu::Shader, Pipeline and State
 2015-03-10 16:51:40 -07:00
Brad Hefta-Gaub
77eae204cf Merge pull request #4411 from AndrewMeadows/thermonuclear 
fix for crash when deleting physical entity that departs the domain
 2015-03-10 16:43:17 -07:00
Andrew Meadows
dd9ae49e49 Merge pull request #4392 from virneo/20304 
worklist 20304: calculate mass properties of a mesh
 2015-03-10 16:18:14 -07:00
Philip Rosedale
2e85cf7459 Merge pull request #4413 from birarda/master 
fix stereo to stereo resampling via soxr
 2015-03-10 16:09:31 -07:00
Stephen Birarda
8ede9fb39b fix stereo to stereo resampling 2015-03-10 15:50:30 -07:00
Andrew Meadows
9736ee1c28 Merge pull request #4410 from ZappoMan/crashonexit 
make sure UserActivityLogger::close() waits for the pending log message to complete
 2015-03-10 15:47:18 -07:00
Seth Alves
48244840d5 merge from upstream 2015-03-10 15:43:40 -07:00
Seth Alves
cf20596d6d Merge pull request #4406 from ZappoMan/svoFromURL 
Support for importing from a network URL
 2015-03-10 15:41:41 -07:00
Seth Alves
844085b514 started on hull collisions 2015-03-10 15:30:08 -07:00
ZappoMan
b9671f3f9b CR feedback 2015-03-10 15:27:44 -07:00
Virendra Singh
a0e7125e11 code revamp and correction in parallel axis theorem 2015-03-11 03:11:17 +05:30
Andrew Meadows
f82f9cc2f4 merge upstream/master into andrew/thermonuclear 2015-03-10 14:28:02 -07:00
Andrew Meadows
503afc8c73 erase deleted entities from pending sort list 2015-03-10 14:26:19 -07:00