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

285 commits

Author SHA1 Message Date
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
James B. Pollack
2ec712a5db disable near grabbing on sliders 2015-12-28 15:27:17 -08:00
James B. Pollack
f0a12e0251 switch 2015-12-28 14:50:35 -08:00
Eric Levin
890b39f04b Merge pull request #6740 from imgntn/blacklist_grab 
Add Raypick Blacklisting to handControllerGrab.js
 2015-12-28 13:39:23 -08:00
James B. Pollack
7d7d0d4c07 mege 2015-12-28 13:21:00 -08:00
James B. Pollack
0e30393c81 make sure theres something on the blacklist 2015-12-27 12:47:56 -08:00
James B. Pollack
546e908633 protect blacklisting to my id 2015-12-27 12:46:40 -08:00
James B. Pollack
28c53822b1 add raypick blacklisting to hand grab script 2015-12-27 12:37:33 -08:00
ericrius1
cd983db419 fixed merge conflicts 2015-12-23 15:13:45 -08:00
ericrius1
b4988b0998 Taking individual avatar hand size into consideration for grabbing objects 2015-12-23 15:09:10 -08:00
AlessandroSigna
2c72e7964d Fix assignment 2015-12-23 13:54:06 -08:00
Thijs Wenker
505f4ce7e4 Merge branch 'master' of https://github.com/worklist/hifi into 20736 
Conflicts:
	examples/controllers/handControllerGrab.js
 2015-12-23 02:37:38 +01:00
James B. Pollack
4115138b5b fix merge problems 2015-12-22 17:22:55 -08:00
James B. Pollack
64eb22bf22 merging 2015-12-22 16:34:01 -08:00
James B. Pollack
edd11a670a minor adjustments to particles 2015-12-22 14:38:53 -08:00
James B. Pollack
60f2314469 remove debugging print 2015-12-22 14:38:05 -08:00
James B. Pollack
7bc7bddc3a set defaults 2015-12-22 12:00:45 -08:00
ericrius1
45ba7a3d35 merged 2015-12-21 10:46:54 -08:00
ericrius1
0dd7287e61 mergedq 2015-12-21 10:46:45 -08:00
ericrius1
7a7befafb9 arc balls working 2015-12-21 10:43:59 -08:00
ericrius1
1beec0dbe7 balls 2015-12-18 18:15:05 -08:00
James B. Pollack
387c30d83f close button 2015-12-18 15:04:13 -08:00
James B. Pollack
a25feb5578 switching branches 2015-12-17 16:58:38 -08:00
James B. Pollack
8e2128c692 update light volume when you move light parent 2015-12-17 11:59:21 -08:00
James B. Pollack
5cc5a2ab33 working non kinematic release 2015-12-17 10:58:14 -08:00
James B. Pollack
cd911b31d2 dont accidentally constrain all objects 2015-12-17 10:26:54 -08:00
James B. Pollack
40a096ca8d kinematic grab things 2015-12-16 14:34:01 -08:00
James B. Pollack
e37d68449b rename folder 2015-12-16 13:57:40 -08:00
James B. Pollack
9a2d9997e9 prep for feedback 2015-12-15 18:20:12 -08:00
James B. Pollack
d4f55ed6d2 working lsiders 2015-12-15 15:55:03 -08:00
James B. Pollack
76487bca7a updates 2015-12-14 13:01:03 -08:00
James B. Pollack
e43b60f9f5 other variations 2015-12-14 11:40:47 -08:00
James B. Pollack
a0b698c028 reorg props 2015-12-12 17:33:54 -08:00
James B. Pollack
0ddc2ba76e rename lasers to lines 2015-12-12 16:18:15 -08:00
James B. Pollack
fe05542440 more vis 2015-12-12 14:30:34 -08:00
Thijs Wenker
cfd2c2785c Merge branch 'master' of https://github.com/worklist/hifi into 20736 2015-12-12 21:16:02 +01:00
Thijs Wenker
cb948e0608 allow entity scripts to attach entities to a hand with handControllerGrab.js 2015-12-12 21:15:06 +01:00
James B. Pollack
70a0e51cc9 back to default state 2015-12-11 17:59:03 -08:00
James B. Pollack
1b1edf6f7a actually delete lights now that it doesnt crash 2015-12-11 17:23:35 -08:00
James B. Pollack
11aaeb1ec0 only create particle beams if set 2015-12-11 14:48:07 -08:00
James B. Pollack
4e9d81f187 add support for various beam visualizations 2015-12-11 11:38:16 -08:00
James B. Pollack
2acc0df1f0 beams with spotlights 2015-12-10 17:39:29 -08:00
James B. Pollack
16ab7e74de cleanup spotlights 2015-12-10 16:53:13 -08:00
James B. Pollack
efaa30a509 rotatable light 2015-12-10 16:18:40 -08:00
James B. Pollack
9fc456697e merge 2015-12-10 14:30:55 -08:00
James B. Pollack
c3e9cde7fb beamz 2015-12-10 13:44:53 -08:00
James B. Pollack
1000b60280 far beams 2015-12-10 12:21:50 -08:00
James B. Pollack
31526091d3 create beams at start 2015-12-10 11:13:35 -08:00
James B. Pollack
1134d12ea0 particles 2015-12-09 16:08:32 -08:00
Atlante45
65bc6aa371 Fix left hand grab 2015-12-09 14:25:18 -08:00
James B. Pollack
2fb318cc53 work with clements branch 2015-12-08 17:52:23 -08:00
Atlante45
1d498af76e Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-12-04 15:18:25 -08:00
Seth Alves
4246672813 enable head-moving of distance grabbing 2015-12-04 10:38:24 -08:00
Seth Alves
17b5ade9c0 allow moving distantly grabbed objects with head 2015-12-03 16:45:46 -08:00
Seth Alves
a600df5ea6 try a different method of exagerating hand motion onto distanly held object 2015-12-03 16:04:39 -08:00
Eric Levin
34234da2d1 fixed spacing 2015-12-01 17:05:51 -08:00
ericrius1
40fb45c6d3 fixed accidental newline in handgrab 2015-12-01 17:04:10 -08:00
ericrius1
0fd1bdaec5 fixed accidental newline in handgrab 2015-12-01 17:03:11 -08:00
ericrius1
e4199439af added collision sounds to some toys 2015-12-01 17:00:43 -08:00
James B. Pollack
aca0fa7beb support disabling both hands 2015-12-01 16:03:19 -08:00
Atlante45
c4e43c4e0b Merge branch 'baseball-test' of github.com:Atlante45/hifi into baseball 2015-12-01 15:16:05 -08:00
Atlante45
97454ae446 Update handControllerGrab.js 2015-12-01 14:32:59 -08:00
Seth Alves
e0eae23dd3 Merge pull request #6515 from imgntn/personal_lasers 
Personal lasers in handControllerGrab.js
 2015-12-01 13:29:05 -08:00
James B. Pollack
31d2f6463f cleanup 2015-12-01 13:03:51 -08:00
James B. Pollack
25422084b9 make it so that only you can see your beams until youre grabbing something 2015-12-01 13:02:40 -08:00
Philip Rosedale
8e40889068 Merge pull request #6508 from sethalves/fix-observers-dont-see-equip-motion 
possible fix for observers not seeing a held entity moving
 2015-12-01 11:41:08 -08:00
Seth Alves
7f95e1eec6 make sure observed held objects are active in bullet, disable equip spring action 2015-12-01 10:49:07 -08:00
James B. Pollack
1ba6bfa2e0 lazers 2015-11-30 18:58:53 -08:00
ericrius1
b67c481726 resolved merge conflicts 2015-11-30 18:19:57 -08:00
James Pollack
55f797838f remove unused key 2015-11-28 23:22:00 -08:00
James Pollack
1e2398cbea use constants 2015-11-28 23:04:52 -08:00
James Pollack
1315201bdc update name of function 2015-11-28 22:55:44 -08:00
James Pollack
8f51ee6f58 rename hand disabler 2015-11-28 22:29:12 -08:00
James B. Pollack
9ec2a01475 isolate grab script changes from bow branch 2015-11-27 12:13:53 -08:00
James B. Pollack
6f76f0cbc0 release grasp at cleanup 2015-11-19 16:22:54 -08:00
James B. Pollack
3f89d73fc6 add grasp to equip and example 2015-11-19 16:15:34 -08:00
ericrius1
4bf1c36fd6 Firing works 2015-11-18 14:32:49 -08:00
ericrius1
aed5629eca equipping 2015-11-18 12:50:42 -08:00
ericrius1
47c2119888 Adding generic pistol 2015-11-18 12:25:36 -08:00
Seth Alves
94f18672d4 equip from a distance uses a spring to pull the object to the hand before equipping it 2015-11-17 17:18:16 -08:00