Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-27 15:15:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
38495 commits 71 branches 56 tags 1.2 GiB
Commit graph

264 commits

Author SHA1 Message Date
James B. Pollack
7767dfb213 remove high freq messages 2016-01-30 19:59:56 -08:00
Philip Rosedale
9f95a9de89 Limits on distance and mass for far grabbing 2016-01-29 00:52:59 -08:00
Seth Alves
41a2173901 adjust grab script so that avatars can't bootstrap themselves during an object hand-off 2016-01-22 16:38:28 -08:00
Chris Collins
5dc1eb986e Merge pull request #6874 from imgntn/fixgrabparticlesystems 
Remove Particle Search Beams from Grab Script and Create / Destroy Systems on Demand
 2016-01-21 09:25:11 -08:00
Seth Alves
311e0cee67 Merge pull request #6820 from AndrewMeadows/collision-mask 
use "collidesWith" instead of "collisionMask"
 2016-01-21 09:13:34 -08:00
James B. Pollack
c2b5dfdfe6 clear sphere 2016-01-20 16:09:37 -08:00
James B. Pollack
6f1ea9a3d3 cleanup 2016-01-20 15:20:59 -08:00
James B. Pollack
53b4a509f7 remove particle search beams and create / destroy systems on demand 2016-01-20 14:17:32 -08:00
Andrew Meadows
4a91ed3d66 fix bad conflict resolution 2016-01-19 11:42:29 -08:00
Andrew Meadows
db77f22a61 use "collidesWith" instead of "collisionMask" 
but make "collisionMask" work for those who want it
 2016-01-19 11:41:22 -08:00
Seth Alves
8b6e89a5c4 fix stopFarTrigger entity method call. re-add code to keep more than one distance grab per object from happening 2016-01-18 11:13:33 -08:00
Philip Rosedale
9b3155188d Squeeze a little to search, a lot to grab 2016-01-17 19:10:40 -08:00
Philip Rosedale
23a8d57ca2 Always show search ray 2016-01-17 14:14:00 -08:00
Philip Rosedale
588719a4c2 merge conflict fix 2016-01-17 13:07:55 -08:00
Philip Rosedale
210b3ba1ec Merge pull request #6819 from sethalves/grab-script-fixes 
grab script fixes
 2016-01-15 09:40:57 -08:00
Philip Rosedale
30199106ec Choice of hand ray pick or head pick 2016-01-13 20:47:05 -08:00
Anthony J. Thibault
75b3523c33 Simplify grab animation logic 
Moved all animation control out of the handControllerGrab.js script and back into
squeezeHands.js

Deleted old hydra/squeezeHands.js to avoid confusion.

Added new sqeezeHands.js script to the default scripts.
 2016-01-13 17:57:51 -08:00
Seth Alves
699431a9ab testing something with chris 2016-01-12 17:27:36 -08:00
Seth Alves
1128982e65 pull grab script changes over from another branch 2016-01-12 17:16:56 -08:00
Andrew Meadows
c52c543ab8 use strings for JS collisionGroup API 2016-01-12 15:11:27 -08:00
Andrew Meadows
00e5d040a2 use collision masks to prevent grab-bootstrap 2016-01-12 15:10:18 -08:00
Anthony J. Thibault
3d8f8e5618 Set WANT_DEBUG_STATE to false 2016-01-11 10:39:27 -08:00
Anthony J. Thibault
4c1ad6900d handControllerGrab.js: removed previous animationStateHandler 
Which was conflicting with the new HandAnimationBuddy animationStateHandler
 2016-01-08 11:28:02 -08:00
Anthony J. Thibault
cac19b8579 grab animation work 
Hand animations now have 5 states:

* idle
* open
* grasp
* point
* farGrasp

The handControllerGrab.js script now chooses one of these five animations, based on the state of the HandController object.

Also, removed hand trigger AnimVar setting from C++ Rig class.
 2016-01-07 19:36:57 -08:00
Anthony J. Thibault
1251be1b2b Merge branch 'master' into tony/grab-script-hand-animation 2016-01-06 16:26:56 -08:00
Anthony J. Thibault
b42fe22e03 Fixing bad line ending. 2016-01-06 16:26:16 -08:00
ericrius1
1f6e45d135 Fix for close grab jumping 2016-01-06 15:10:53 -08:00
ericrius1
67f4c250fd Search sphere goes away on far to near grab 2016-01-06 14:59:31 -08:00
ericrius1
cb03eda6d1 Instant far to near grabbing now works by using the bumper, or equip, button 2016-01-06 13:37:26 -08:00
Anthony J. Thibault
3e6ff0eb68 Moved hand animation control into grab script. 2016-01-05 19:56:56 -08:00
ericrius1
eb44e54d87 fixed merge conflicts 2016-01-05 16:28:22 -08:00
ericrius1
882ec9fe80 Using offset from intersection point to center of object for insta-grab 2016-01-05 16:24:15 -08:00
ericrius1
a80e77ff80 Squeezing bumper while distance grabbing now brings object to your hand 2016-01-05 11:01:00 -08:00
Seth Alves
212d2d9e8f merge from upstream 2016-01-05 10:27:45 -08:00
Andrew Meadows
f888cc93f6 Merge pull request #6752 from imgntn/particle_grab_cleanup 
Add Dynamic Lifetimes to Grab Beam Particle Systems
 2016-01-05 10:12:21 -08:00
James B. Pollack
4bb03f8c2d add beam visualization if sphere doesnt actually hit anything 2016-01-04 12:34:08 -08:00
Seth Alves
e1299ee290 be more careful about grab action -- if it somehow expires, reinstate it 2016-01-03 07:27:14 -08:00
Philip Rosedale
85a0dfa21a remove debug line 2015-12-31 13:49:24 -08:00
Philip Rosedale
f4389c3b1f Add head-to-hand mixing ratio, default to zero (hands only) 2015-12-31 13:36:24 -08:00
Philip Rosedale
c18a2fc264 blend 50/50 between head and hands for search 2015-12-31 11:56:37 -08:00
Philip Rosedale
0d4ac4387a Show hand-sphere search line and point just with hand direction again 2015-12-31 11:46:35 -08:00
James B. Pollack
40aee910d7 disconnect 2015-12-30 20:18:52 -08:00
James B. Pollack
58257b00e7 reduce gap btw refresh 2015-12-30 17:18:33 -08:00
James B. Pollack
eae8b48513 fix conditional 2015-12-30 11:58:18 -08:00
James B. Pollack
2de517c70f remove unused line 2015-12-30 11:50:20 -08:00
James B. Pollack
7b14fa0070 Merge branch 'master' into particle_grab_cleanup 2015-12-30 11:46:44 -08:00
James B. Pollack
b7d0a75f25 dynamic lifetimes for particle systems 2015-12-30 11:46:16 -08:00
Philip Rosedale
118f919c8b fix merge conflicts 2015-12-30 00:42:14 -08:00
Philip Rosedale
e995b29712 can target without grabbing 2015-12-30 00:36:11 -08:00
Philip Rosedale
6d857296f9 show search sphere instead of beams, start at center of view 2015-12-29 23:37:10 -08:00