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

2177 commits

Author SHA1 Message Date
Seth Alves
f5be64ed96 Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes 2016-05-05 09:52:33 -07:00
Seth Alves
d76b8f2335 action->locallyAddedButNotYetReceived is unneeded with isMine available 2016-05-05 06:44:52 -07:00
Andrew Meadows
be9a572fb0 fix grab motion glitch on long-ping connections 2016-05-04 16:50:42 -07:00
Seth Alves
91af732516 if we receive an update from the entity-server that doesn't include one of our actions, resend the action data 2016-05-04 16:30:38 -07:00
Seth Alves
9db839bc13 don't allow someone else to delete an action that I own. reset dynamic property when releasing and entity, even if refCount isn't 0 2016-05-04 15:01:00 -07:00
David Rowe
4b05d8ed95 Increase maximum friction to 10.0 - Bullet's maximum 2016-05-05 07:50:15 +12:00
Seth Alves
382a0c48da fix warning 2016-05-04 12:09:26 -07:00
Brad Hefta-Gaub
2c9608489f fix recursive mutex in Entites.callEntityMethod() 2016-05-04 10:01:20 -07:00
David Rowe
d1064bf5ea Increase maximum friction to 1.0 - bullet can handle it 2016-05-04 10:58:33 +12:00
Seth Alves
9e53055d43 parentID and parentJointIndex are now protected by simulation ownership 2016-05-03 15:48:50 -07:00
David Rowe
bc04d1b477 Increase maximum friction value from 0.99 to 0.9999 2016-05-04 09:01:26 +12:00
Andrew Meadows
ba226b9cb4 promote priority immediately when already owned 2016-05-03 13:43:08 -07:00
Brad Hefta-Gaub
eb209c7483 Merge pull request #7752 from Geenz/master 
Correction To sRGB Conversions
 2016-05-03 08:01:51 -07:00
Seth Alves
1da041de9b don't consume the physics related property changes from the packet that informs us that we are the simulationOwner of an entity 2016-05-02 15:09:08 -07:00
Seth Alves
ae8f502808 keep track of actions we are editing and ignore updates from server for these actions 2016-05-02 14:23:36 -07:00
Seth Alves
0fe4e42511 added zone properties to allow flying/ghosting or not 2016-05-01 13:53:44 -07:00
Zach Pomerantz
13945aa4d9 Annotate all virtual fns with override 2016-04-30 13:48:59 -07:00
Geenz
85e0620261 Merge branch 'master' of https://github.com/highfidelity/hifi 2016-04-30 15:40:28 -04:00
Andrew Meadows
b5ad989811 more optimized uses of EntityItem::getDimensions() 2016-04-27 11:04:22 -07:00
Andrew Meadows
c686418be0 optimize use of EntityItem::getDimensions() 2016-04-27 10:34:29 -07:00
Geenz
83d6f7f1e3 Quick fix for incorrect conversion. 
We want sRGB to linear, not linear to sRGB.
 2016-04-26 18:49:03 -04:00
Geenz
ef7098b39a Missed a few. 2016-04-26 17:12:04 -04:00
Seth Alves
16bf59f8a6 fix a crash in RenderableModelEntityItem::getModel 2016-04-25 10:26:32 -07:00
Brad Hefta-Gaub
8c7ef31636 Merge pull request #7746 from AndrewMeadows/supress-spurious-logs 
reduce warnings about truncated kinematic timesteps
 2016-04-23 09:34:45 -07:00
Brad Hefta-Gaub
04dab65b59 Merge pull request #7727 from ZappoMan/supportLargeClockSkew 
support for larger than 35 minute clock skew
 2016-04-23 08:42:38 -07:00
Andrew Meadows
d984ce4792 properly update _lastSimulated for kinematic objs 2016-04-22 17:19:00 -07:00
Andrew Meadows
34d622e498 add warning about truncated kinematic timestep 2016-04-22 13:10:23 -07:00
Andrew Meadows
872622c6f7 fix acceleration of for server-side kinematics 2016-04-22 09:38:43 -07:00
Andrew Meadows
14abb15216 set kinematic accel before stepping 2016-04-22 09:38:43 -07:00
Andrew Meadows
8efb07cfd8 correctg measured acceleration for kinematics 2016-04-22 09:38:43 -07:00
Andrew Meadows
a79f49a5cd don't stop slow kinematic objs when sending updates 2016-04-22 09:38:43 -07:00
Andrew Meadows
ad045bc439 remove second-order term from kinematic motion 2016-04-22 09:38:43 -07:00
Andrew Meadows
3639ffe53e optimize kinematic motion math 2016-04-22 09:38:43 -07:00
Brad Hefta-Gaub
31f9d592e0 support for larger than 35 minute clock skew 2016-04-20 18:42:00 -07:00
Howard Stearns
9ff9682b2a Merge pull request #7692 from ZappoMan/resetScriptEngineOnDomainChange 
Reset entities script engine on domain change
 2016-04-19 11:14:28 -07:00
Seth Alves
4bf98a80b9 Merge pull request #7667 from AndrewMeadows/fix-entity-server-crash 
fix entity-server crash when entity moves out of bounds
 2016-04-18 14:09:21 -07:00
Brad Hefta-Gaub
374ba10524 more CR feedback 2016-04-18 12:23:36 -07:00
Brad Hefta-Gaub
1c111e20bd fix possible thread issue with Entities.callEntityMethod() 2016-04-18 11:20:26 -07:00
Brad Hefta-Gaub
91334d6a39 Merge pull request #7664 from ZappoMan/reduceJointProperties 
only export joint values if they've been explicitly set by scripts
 2016-04-14 15:30:04 -07:00
Andrew Meadows
a263091c94 fix entity-server crash for out of bounds 2016-04-14 15:23:14 -07:00
Zach Pomerantz
e80898f095 Merge branch 'master' of github.com:highfidelity/hifi into fix/model-anim-cache 2016-04-14 10:12:16 -07:00
Brad Hefta-Gaub
7b5075cce5 Merge pull request #7645 from sethalves/dont-run-bullet-too-soon 
add a heuristic for deciding when it's safe to enable bullet
 2016-04-14 09:35:58 -07:00
Brad Hefta-Gaub
b48503a82d only export joint values if they've been explicitly set by scripts 2016-04-13 19:52:50 -07:00
Zach Pomerantz
7a15339631 Use AnimationCache for models 2016-04-13 15:44:47 -07:00
Seth Alves
3288bff963 don't flood log with messages about expired actions. also, try to remove such actions 2016-04-13 09:47:07 -07:00
Seth Alves
e4c91e5064 add a heuristic for deciding when it's safe to enable bullet 2016-04-12 11:46:00 -07:00
Seth Alves
1d63f6d354 Merge branch 'master' of github.com:highfidelity/hifi into make-fixupMissingParents-more-thread-safe 2016-04-11 09:58:08 -07:00
Brad Hefta-Gaub
47ff5c090d Merge pull request #7623 from ZappoMan/fixAnimationFrameExport 
fix export of animation properties
 2016-04-11 09:37:47 -07:00
Brad Hefta-Gaub
cc418c615f Merge pull request #7631 from sethalves/parent-equipping-and-platform-hack 
treat children of avatars and children of entities differently until velocity handling is fixed
 2016-04-10 14:55:03 -07:00
Seth Alves
43f735dd21 avoid loop where bullet moves an entity and then an entity tells bullet that it has moved. 2016-04-09 22:18:43 -07:00
Seth Alves
2aa3e5d418 re-enabled EntityItem::simulateKinematicMotion for things with parents 2016-04-09 09:06:18 -07:00
Brad Hefta-Gaub
f1f8fd8a24 fix export of animation properties 2016-04-08 14:40:06 -07:00
Seth Alves
95f446183f use for loop rather than iterator 2016-04-08 13:32:33 -07:00
Seth Alves
6088612ce0 guard access to _missingParent vector with a lock to allow safe access from multiple threads 2016-04-08 13:16:30 -07:00
Brad Hefta-Gaub
e7d75cb22e Merge pull request #7573 from sethalves/update-collision-hulls-of-avatar-children 
Update collision hulls of avatar children
 2016-04-07 14:47:44 -07:00
Brad Hefta-Gaub
7f164a7959 CR feedback 2016-04-07 08:42:40 -07:00
Seth Alves
5375fdd0f0 don't do simple kinematic simulation on things that have parents 2016-04-06 16:42:14 -07:00
Brad Hefta-Gaub
8c15116190 fix auto-hide logic in depthReticle 2016-04-06 11:00:43 -07:00
Seth Alves
af05b97c1e put back accidently deleted line. cleanups 2016-04-04 17:31:59 -07:00
Seth Alves
d814d7b35d merge from upstream 2016-04-04 16:32:49 -07:00
Seth Alves
69bb0ebd74 Revert "faster kinematic motion for entities" 2016-04-04 16:11:54 -07:00
Seth Alves
b8587e0711 update collision shapes of entities which are children of avatars 2016-04-04 16:06:53 -07:00
Seth Alves
c48a67b933 Merge pull request #7544 from AndrewMeadows/faster-kinematics 
faster kinematic motion for entities
 2016-04-04 15:26:32 -07:00
Andrew Meadows
a08ab8e127 restore setFlag in simulateKinematicMotion() 2016-04-04 11:48:45 -07:00
Andrew Meadows
a53cb2e532 use _gravity rather than _acceleration 
also tweaks and comments about supporting low gravity
 2016-04-04 11:10:50 -07:00
Andrew Meadows
74058ac049 more correct moving test for ballistic kinematics 2016-04-03 19:15:16 -07:00
Andrew Meadows
0830c55bcf getLocalEverything->getLocalTransformAndVelocities 2016-04-01 17:48:56 -07:00
howard-stearns
cec4175e9d whitespace 2016-04-01 15:00:51 -07:00
howard-stearns
b5cbd7720e Lock entity tree on export, and clipboard on import. 2016-04-01 14:56:56 -07:00
Andrew Meadows
442b52313f faster kinematic motion calculations 2016-04-01 13:14:03 -07:00
Zach Pomerantz
54b8a9278d Guard model texs 2016-03-30 14:11:45 -07:00
Brad Hefta-Gaub
6fdedb8f34 Merge pull request #7508 from howard-stearns/import-export-parents 
Make export/import and copy/paste be parent/child-clean.
 2016-03-30 09:06:33 -07:00
howard-stearns
5381be6902 Whitespace 2016-03-29 17:06:19 -07:00
howard-stearns
86a77d4f55 Remove unused/non-existent include. 2016-03-29 16:55:17 -07:00
howard-stearns
eef9de4d4f Remove obsolete remapIDs. 2016-03-29 16:28:02 -07:00
howard-stearns
4ebf816166 cleanup 2016-03-29 16:17:19 -07:00
howard-stearns
bcb729eac2 Abstract out globalizeProperties. 2016-03-29 15:21:06 -07:00
howard-stearns
4a28dadae5 Working, but not cleaned up. 2016-03-29 13:26:50 -07:00
Howard Stearns
5db1c33e4d kill offsets 2016-03-29 09:18:29 -07:00
howard-stearns
1b3d9d7ab6 Merge branch 'master' of https://github.com/highfidelity/hifi into import-export-parents 2016-03-28 16:59:20 -07:00
howard-stearns
b09b9a4a0a snapshot after using tree from entity item. 2016-03-28 16:58:20 -07:00
howard-stearns
7a066afa26 Checkpoint for freakin edit.js again. 2016-03-28 14:25:51 -07:00
Zach Pomerantz
2de94e672b Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching 2016-03-28 14:08:30 -07:00
howard-stearns
c6347eb92a checkpoint for debugging/comparing edit.js 2016-03-28 13:39:43 -07:00
Andrew Meadows
5ac0640cbe check for time machine 2016-03-27 16:33:53 -07:00
Philip Rosedale
dfb09f134a Merge pull request #7476 from ZappoMan/bugFixes 
fix a couple of model bugs
 2016-03-25 15:58:52 -07:00
Seth Alves
d97ab1e2fc Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking 2016-03-25 13:53:01 -07:00
Zach Pomerantz
c5e5195db1 Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching 2016-03-25 12:07:00 -07:00
Brad Hefta-Gaub
4ebb114a8e also fix joint simulation from 3rd party editors 2016-03-25 11:43:32 -07:00
Andrew Meadows
d3d724530a minor optimiztion 2016-03-24 21:12:22 -07:00
Seth Alves
1b88284bf7 more threading cleanups 2016-03-24 19:14:25 -07:00
Zach Pomerantz
3e9e083df5 Update users of NetworkGeometry 2016-03-24 11:35:41 -07:00
Seth Alves
bd178640f1 Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking 2016-03-24 09:51:31 -07:00
Seth Alves
462da3aaf3 don't call getMesh from render 2016-03-23 22:46:43 -07:00
Seth Alves
2d7f32a554 redo polyvox locking 2016-03-23 22:03:27 -07:00
Brad Hefta-Gaub
62a56ecbfa fix typos 2016-03-23 17:45:22 -07:00
Brad Hefta-Gaub
fdd0b48ae1 reduce log spam 2016-03-23 17:06:03 -07:00
Chris Collins
ed3a9cb24b Merge pull request #7415 from howard-stearns/thread-safe-entityToElementMap 
Possible fix for getContainingElement crash.
 2016-03-21 15:30:04 -07:00
howard-stearns
8858559247 Make access to entityToElementMap thread safe. 2016-03-21 14:02:18 -07:00
Brad Hefta-Gaub
492e71345a Revert "Revert "Fix ModelBlender crash"" 
This reverts commit f274cdcc7f.
 2016-03-21 11:42:25 -07:00
Brad Hefta-Gaub
f274cdcc7f Revert "Fix ModelBlender crash" 2016-03-21 10:47:31 -07:00
Brad Hefta-Gaub
2ef5b3727e Merge branch 'master' of https://github.com/highfidelity/hifi into fixBlenderCrash 2016-03-18 14:04:45 -07:00
Seth Alves
1e02c8d9d3 minimize diff 2016-03-17 17:28:36 -07:00
Seth Alves
cbfde2032c fix bug which caused observers of a parenting grab to not see the entity in the grabber's hand 2016-03-17 17:09:32 -07:00
Brad Hefta-Gaub
7483b8546b remove FaceModel, make Model support shared_from_this() so we can ave shared and weak pointers to it 2016-03-17 17:05:35 -07:00
Brad Hefta-Gaub
d5bf65cc8f Merge pull request #7379 from sethalves/fix-crashes-0 
possibly fix a couple of crashes
 2016-03-17 15:51:27 -07:00
Seth Alves
db5c6d80d2 possibly fix a couple of crashes 2016-03-17 10:31:54 -07:00
Clément Brisset
17e5b441cf Merge pull request #111 from huffman/atp-manager-name 
Add atp filename to entities added to world
 2016-03-15 10:19:53 -07:00
Stephen Birarda
72c64532f5 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-15 09:12:49 -07:00
Ryan Huffman
7823882aa1 Add atp filename to entities added to world 2016-03-14 16:13:33 -07:00
ZappoMan
1a17de6dbb reduce log spam 2016-03-14 14:02:25 -07:00
Seth Alves
5292e537ea further unmangle merge 2016-03-14 11:22:01 -07:00
Seth Alves
908481d5d4 merge from upstream 2016-03-14 11:15:16 -07:00
Seth Alves
7641b1e99d remove debug print 2016-03-13 08:45:23 -07:00
Seth Alves
415f21c189 be more aggressive about putting entities into the missing-its-parent list 2016-03-13 08:35:21 -07:00
Seth Alves
0a2fb77698 delete child entities when parent is deleted 2016-03-13 07:04:50 -07:00
Seth Alves
01659cf93b try, try again 2016-03-11 16:21:20 -08:00
Seth Alves
5f05d576cc move checkAndAdjustQueryAACube into SpatiallyNestable 2016-03-11 15:55:42 -08:00
Seth Alves
1e8706b1da remove debug print 2016-03-11 14:47:53 -08:00
Seth Alves
2ad15f7568 try harder to get queryAABoxes to be correct 2016-03-11 14:38:31 -08:00
Seth Alves
7a4dad8e51 allow entity-server to patch up broken queryAACubes 2016-03-11 13:20:52 -08:00
Seth Alves
f611d8f747 if needed, set querryAACube when dimensions are updated 2016-03-11 12:41:18 -08:00
Stephen Birarda
5ad4645b47 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-10 13:28:59 -08:00
Ryan Huffman
b42bec78dc Add Entities.addModelEntity 2016-03-10 10:25:20 -08:00
Philip Rosedale
ee1e4b898e Merge pull request #7278 from AndrewMeadows/simulation-priority 
adjust simulation priorities
 2016-03-10 08:52:18 -08:00
Andrew Meadows
9157ff6eda more correct notion of desired simulation priority 2016-03-09 11:02:50 -08:00
Brad Hefta-Gaub
1c07276501 fix a couple bugs 2016-03-09 09:45:55 -08:00
Andrew Meadows
99a1310711 change properties at 127 priority, grab at 128 2016-03-08 22:17:44 -08:00
Brad Hefta-Gaub
8d4ef28411 CR feedback 2016-03-08 15:29:04 -08:00
Brad Hefta-Gaub
35d6afbe77 Merge branch 'master' of https://github.com/highfidelity/hifi into fixSceneNotStable 2016-03-08 14:53:41 -08:00
Brad Hefta-Gaub
6d211dd4e5 first cut at fixing the scene not stable bug 2016-03-08 14:52:21 -08:00
Seth Alves
dcb720a832 fix polyvox hull when registration changes. 2016-03-06 14:09:45 -08:00
Seth Alves
9346171695 if entity registration isn't default, adjust physics shapes to match 2016-03-04 16:47:30 -08:00
Philip Rosedale
3eabf0d451 Merge pull request #7209 from sethalves/auto-unhook-stuck-to-hand 
when trigger is squeezed, check for things stuck to hand and unhook them
 2016-02-29 12:59:02 -08:00
Clément Brisset
2ffaa1f2e7 Merge pull request #7196 from AndrewMeadows/simulation-ownership 
no expiry for simulation ownership
 2016-02-29 08:26:53 -08:00
Andrew Meadows
a933935e2d lock mutex in clearEntitiesInernal() 2016-02-28 15:13:49 -08:00
Seth Alves
5bf8670bc2 fix SpatiallyNestable::getChildren 2016-02-28 12:16:41 -08:00
Seth Alves
6c9cf386a6 when trigger is squeezed, check for things stuck to hand and unhook them 2016-02-26 10:14:09 -08:00
Andrew Meadows
acef6642c9 fix logic typo 2016-02-25 18:09:35 -08:00
Andrew Meadows
5d1e283508 namechange TouchesKeyhole to IntersectsKeyhole 2016-02-25 18:09:35 -08:00
Andrew Meadows
dfdf375853 use shapeInFrustum() names again 
but at the same time make the code more redable
also: add some more efficient shape-touches-view methods
and cleanup some whitespace
 2016-02-25 18:09:35 -08:00
Brad Hefta-Gaub
202a456e1a Merge pull request #7126 from AndrewMeadows/cleanup 
cleanup ViewFrustum method names
 2016-02-25 16:12:25 -08:00
Brad Hefta-Gaub
82cbf19bca Merge pull request #7078 from zzmp/fix/light-intensity 
Reimplement light attenuation for spot and point lights
 2016-02-25 16:08:28 -08:00
Andrew Meadows
b4edfe2390 no expiry for simulation ownership 2016-02-25 12:07:20 -08:00
Zach Pomerantz
32ce7c6eab Rename light surfaceRadius->falloffRadius 2016-02-25 10:02:33 -08:00
Andrew Meadows
9c927ea36b ViewFrustum method renames and whitespace cleanup 
fooInFrustum() --> computeFooViewLocation()
except pointInFrustum() --> computeFrustumLocation()
 2016-02-25 09:11:28 -08:00
Zach Pomerantz
13153bcf08 Fix keyLight.ambientURL capitalization 2016-02-23 16:53:16 -08:00
Zach Pomerantz
1e3cfd6baf Detect changes for surfaceRadius 2016-02-22 19:27:35 -08:00
Zach Pomerantz
8688bf2abb Move light entity defaults to light 2016-02-22 15:56:10 -08:00
Zach Pomerantz
77ad4039bc Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity 2016-02-22 15:11:12 -08:00