Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 11:49:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
37410 commits 76 branches 59 tags 1.2 GiB
Commit graph

5014 commits

Author SHA1 Message Date
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
Howard Stearns
d1a72e8d63 Merge pull request #6807 from hyperlogic/tony/grab-script-hand-animation 
Move hand animation control into grab script
 2016-01-12 13:02:59 -08:00
Howard Stearns
38b0fd2747 Merge pull request #6806 from PhilipRosedale/energybar 
Energybar example script and test script for scaling
 2016-01-12 09:36:14 -08:00
Philip Rosedale
3fdfa1b624 simpler loop 2016-01-11 17:49:46 -08:00
Philip Rosedale
40aecf3bf4 I was told there would be no math 2016-01-11 17:36:12 -08:00
Brad Hefta-Gaub
ddd9b0826b Merge pull request #6798 from ericrius1/menuTweaks 
separating out marketplace icon from edit toolbar and making directory icon from directory.js movable and persistent
 2016-01-11 12:20:12 -08:00
Anthony J. Thibault
3d8f8e5618 Set WANT_DEBUG_STATE to false 2016-01-11 10:39:27 -08:00
Anthony J. Thibault
8f78a0624c Merge branch 'master' into tony/grab-script-hand-animation 2016-01-11 10:16:51 -08:00
Philip Rosedale
b8565358ff Added basic energy bar example 2016-01-11 09:16:33 -08:00
ericrius1
8182372e02 Made drag selection area bigger for marketplace and directory icons. Added marketplace.js to default scripts 2016-01-11 08:39:34 -08:00
Philip Rosedale
e4855b7595 Script that drops different kinds of entities near you 2016-01-10 15:34:46 -08:00
ericrius1
a66bc791a3 directory.js - icon is now movable and persistent 2016-01-08 16:33:51 -08:00
ericrius1
7e7424ec2b Removed marketplace icon from edit menu 2016-01-08 16:22:10 -08:00
ericrius1
b3f19ef4d6 separating out marketplace 2016-01-08 16:08:43 -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
Brad Hefta-Gaub
b9068d0738 fix selectAudioDevice.js to honor new menu spec 2016-01-08 11:22:21 -08:00
Brad Hefta-Gaub
fb484584e4 fix edit.js to honor new menu spec 2016-01-08 11:21:55 -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
c2736cb68c Merge branch 'master' into tony/grab-script-hand-animation 2016-01-07 16:58:10 -08:00
Anthony J. Thibault
5d19de76ab Added avatarAttachmentTest.js script 2016-01-07 16:15:24 -08:00
Brad Hefta-Gaub
a78d5274e7 Merge pull request #6780 from jherico/z_order 
Address some z-ordering issues in overlay windows
 2016-01-06 20:08:52 -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
Seth Alves
01c9de4f9d Merge pull request #6771 from ericrius1/directDistanceGrab 
Squeezing bumper while distance grabbing now brings object to your hand in all cases
 2016-01-06 15:30:23 -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
Brad Hefta-Gaub
6ac8d081dc include debug log in collision example 2016-01-06 13:02:07 -08:00
Brad Hefta-Gaub
d4e039ea7a include debug log in collision example 2016-01-06 13:00:50 -08:00
Brad Hefta-Gaub
a5f618ef33 include debug log in collision example 2016-01-06 12:54:14 -08:00
Brad Davis
1b82200ecb Address some z-ordering issues in overlay windows 2016-01-06 10:58:56 -08:00
Seth Alves
8800a74186 Merge pull request #6778 from imgntn/mousegrabfix 
Only grab/release mouse grab with left button
 2016-01-06 10:36:36 -08:00
Anthony J. Thibault
3e6ff0eb68 Moved hand animation control into grab script. 2016-01-05 19:56:56 -08:00
Anthony Thibault
95f821d61a Merge pull request #6732 from sethalves/set-model-entity-joints 
hook up a way for scripts to set model-entity joint state
 2016-01-05 17:31:18 -08:00
James B. Pollack
8c7c436ef2 fix 2016-01-05 16:54:18 -08:00
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
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
Seth Alves
086ea66c04 Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2016-01-05 16:24:10 -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
b59934573a Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2016-01-05 13:50:12 -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
Seth Alves
942e77166e merge from upstream 2016-01-05 11:11:19 -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
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
Seth Alves
ce1b8ae6f0 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2016-01-04 19:35:36 -08:00
Seth Alves
afc1757adf Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2016-01-04 19:17:45 -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
Seth Alves
9304477233 split out calls for rotation and translation 2016-01-04 15:29:06 -08:00
Seth Alves
9a979f4abf update doppelganger script 2016-01-04 14:18:24 -08:00
Seth Alves
e18298c974 Merge branch 'doppelganger' of github.com:imgntn/hifi into set-model-entity-joints 2016-01-04 14:16:30 -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
a2d21ed5cb Update doppelganger.js 
delete correct id
 2015-12-28 21:42:54 -08:00
James B. Pollack
3a6478aac1 Update raveStick.js 
leading zeroes
 2015-12-28 21:15:52 -08:00
James B. Pollack
bf296a36ed cleanup change model 2015-12-28 18:38:09 -08:00
James B. Pollack
d8ef19a019 working!! 2015-12-28 18:32:49 -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
93a81315f2 Merge branch 'master' into doppelganger 2015-12-28 16:43:28 -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