Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-15 01:33:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
36976 commits 25 branches 0 tags 1.1 GiB
Commit graph

4910 commits

Author SHA1 Message Date
Clément Brisset
a2135dfdd2 Merge pull request #6720 from ctrlaltdavid/20760 
Fix particle radius and rgba start, middle, finish interpolation
 2016-01-05 16:48:13 -08:00
James B. Pollack
7c18359fba cleanup 2016-01-05 16:17:11 -08:00
James B. Pollack
68e03a08c0 targets fix 2016-01-05 15:43:49 -08:00
Seth Alves
cd82383d33 Merge branch 'master' of github.com:highfidelity/hifi into improve-grab-action-reliability 2016-01-05 11:13:38 -08:00
Andrew Meadows
0473891e86 Merge pull request #6671 from sethalves/near-grab-via-parenting 
queryAACube plumbing
 2016-01-05 11:01:28 -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
Seth Alves
ce1b8ae6f0 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2016-01-04 19:35:36 -08:00
Eric Levin
f569d08ca8 Merge pull request #6761 from imgntn/grab_add_beam 
Add Beam Visualization When Grab Doesn't Intersect
 2016-01-04 15:36:05 -08:00
David Rowe
f04222b5ac Merge branch 'master' into 20760 2016-01-05 10:29:04 +13:00
James B. Pollack
29612f2246 Merge pull request #6760 from ericrius1/muzzleFix 
Fix to pistol.js so muzzle flash particle system doesn't stick around…
 2016-01-04 12:53:38 -08:00
James B. Pollack
4bb03f8c2d add beam visualization if sphere doesnt actually hit anything 2016-01-04 12:34:08 -08:00
James B. Pollack
0be5725f71 Merge pull request #6744 from ericrius1/raveGlow 
Added glow effect to ravestick
 2016-01-04 11:49:54 -08:00
ericrius1
4360595ed6 Fix to pistol.js so muzzle flash particle system doesn't stick around forever 2016-01-04 11:29:57 -08:00
Brad Hefta-Gaub
ec8a2ae093 Merge pull request #6739 from jherico/qml_window 
Support QML and Web content in overlay windows
 2016-01-03 10:18:26 -10:00
Seth Alves
9145a8a753 back out off-brand change 2016-01-03 07:29:24 -08:00
Seth Alves
9f828448a0 add comment 2016-01-03 07:29:14 -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
Seth Alves
bfa8cc1969 merge from upstream 2016-01-03 06:47:25 -08:00
Philip Rosedale
60bc023d6e Merge pull request #6754 from PhilipRosedale/master 
Show hand-sphere search line and point just with hand direction again
 2015-12-31 13:53:21 -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
Brad Davis
f4bd2afc8e Make script launched windows invisible at creation time 2015-12-30 11:38:34 -08:00
Eric Levin
9276c78368 Merge pull request #6741 from PhilipRosedale/master 
Improved hand controller grab and mouse movement
 2015-12-30 11:10:37 -08:00
Brad Davis
0901e3aae1 Support QML and Web content in overlay windows 2015-12-30 09:14:49 -08:00
Brad Davis
76eba89f7d Merge pull request #6745 from hyperlogic/tony/neuron-plugin 
Support for Perception Neuron
 2015-12-30 11:39:32 -05: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
5caa6cbdbf Update pistol.js 
leading zeroes
 2015-12-29 18:38:57 -08:00
ericrius1
4cc94b44ba muzzle is in sync 2015-12-29 18:30:07 -08:00
ericrius1
1a84b5c0f0 Fixing issue with muzzle flash and hit point being out of sync for pistol 2015-12-29 18:13:34 -08:00
James B. Pollack
3a6478aac1 Update raveStick.js 
leading zeroes
 2015-12-28 21:15:52 -08:00
Anthony J. Thibault
4661152aa7 NeuronAvatar.js: Now aligns the head with the HMD if active 2015-12-28 17:57:24 -08:00
ericrius1
cc35eaf4be Added glow effect to ravestick 2015-12-28 17:32:10 -08:00
James B. Pollack
2ec712a5db disable near grabbing on sliders 2015-12-28 15:27:17 -08:00
James B. Pollack
c266a093e0 clear sliders at cleanup 2015-12-28 15:17:00 -08:00
James B. Pollack
9f342ba8ce readme 2015-12-28 15:14:59 -08:00
James B. Pollack
5786789a66 cleanup cleanup 2015-12-28 15:12:29 -08:00
Philip Rosedale
36beea17fa Improved hand controller reticle movement 2015-12-28 14:59:43 -08:00
James B. Pollack
f0a12e0251 switch 2015-12-28 14:50:35 -08:00
James B. Pollack
d4fd59edc0 send blacklist messages 2015-12-28 13:49:00 -08:00