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

222 commits

Author SHA1 Message Date
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