Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-07 07:28:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33636 commits 25 branches 0 tags 1.1 GiB
Commit graph

221 commits

Author SHA1 Message Date
Seth Alves
612e906a44 change the names of entityMethods which the grab script will call. adjust the release velocity multiplier 2015-09-18 15:09:05 -07:00
Seth Alves
d1a7aca7f0 add continue-distance-holding state. don't call callEntityMethod unless action creation works. increase distance-holding multiplier. 2015-09-18 14:45:49 -07:00
Seth Alves
c5716b715d merge from upstream 2015-09-18 14:22:11 -07:00
Seth Alves
7a8cee4cc3 fix release velocity so throwing things works reliably 2015-09-18 14:13:08 -07:00
Brad Hefta-Gaub
0d37511071 add support for scripts to call methods on entity scripts 2015-09-18 14:06:38 -07:00
Seth Alves
b08f567999 put controller specific functions inside the controller object 2015-09-18 09:56:45 -07:00
Seth Alves
b8c8ea2b53 move magic numbers to constant variables, add some comments 2015-09-18 07:20:35 -07:00
Seth Alves
6d7b129b83 rework handControllerGrab.js 2015-09-17 23:15:18 -07:00
Seth Alves
f7193dbb97 if the intersection distance is small, use grab-mode rather than distant-grab-mode 2015-09-15 16:55:51 -07:00
Seth Alves
e650e40388 try harder to have line rezzed when it's needed. don't ignore entities that are too close when doing line intersection 2015-09-15 11:32:56 -07:00
Seth Alves
7b5d6c20e9 double change in hand rotation before applying it to the object 2015-09-15 11:21:13 -07:00
Seth Alves
99b0046fc7 various adjustments 2015-09-15 10:43:17 -07:00
Seth Alves
d874c9b382 snip out tractor beam 2015-09-14 14:20:49 -07:00
Seth Alves
f4aad05621 reduce radius of hand-intersects-object test. fix lifetime of laser line 2015-09-14 14:07:16 -07:00
Seth Alves
f51f17b267 Merge pull request #5775 from ericrius1/paintCan 
Paint can
 2015-09-11 12:34:44 -07:00
ericrius1
0a46db60ac spawning particles on grab and deleting on release, with a lifetime, for better cleanup of particles 2015-09-11 12:01:01 -07:00
Philip Rosedale
93261976c0 Merge pull request #5763 from hyperlogic/tony/squeeze-hands-improvements 
Improvements to squeezeHands.js
 2015-09-10 15:34:52 -07:00
ericrius1
66a4ff752c cleaning up lifetime calc 2015-09-10 09:01:51 -07:00
ericrius1
9ba681dd7f fixed way lifetime on pointer entity is updated 2015-09-10 08:59:05 -07:00
Anthony J. Thibault
839047e583 Improvements to squeezeHands.js 
* Account for controller dead spot. This helps us to see first few frames of the opening animation
  and the last few frames of the closing animation
* Added a small amount of smoothing on the triggers
* Fixed bug when controllers were closed quickly and the animation frame was never getting set,
  because frame and lastFrame were equal.
* Changed animation urls to Ozan's latest.
 2015-09-09 21:46:35 -07:00
ericrius1
5025030726 added lifetime to pointer, default grab behavior now honors objects initial position and rotation 2015-09-09 14:24:30 -07:00
ericrius1
572b120bf0 removed print statements 2015-09-08 15:57:31 -07:00
ericrius1
7133fc94f5 hydraGrab now grabs entities based on how they want to be grabbed (through setting of userData field with a key called spatialKey 2015-09-08 12:54:02 -07:00
Brad Davis
a8b5336e02 Merge pull request #5709 from ZappoMan/breakdanceToy 
next wave of breakdance work
 2015-09-03 14:55:04 -07:00
Brad Hefta-Gaub
44c554895d next wave of breakdance work 2015-09-03 14:33:25 -07:00
ericrius1
ebe5818c84 relative path 2015-09-03 14:09:01 -07:00
ericrius1
fa42334430 added userData manipulations to grab script 2015-09-03 11:30:44 -07:00
ericrius1
d303c7e119 only add actions to physical objects 2015-09-02 16:45:50 -07:00
ericrius1
1e6198cf59 update dhydra grab to grab near and far objects, and removed grabbing logic from toybox.js 2015-09-02 11:29:37 -07:00
Brad Hefta-Gaub
542b124146 first cut at breakdance toy 2015-08-27 16:12:33 -07:00
Brad Davis
380b0cb23c Removing tabs from our javascript and C++ 2015-08-24 15:26:46 -07:00
SamGondelman
b77de1b598 added fists to toybox 2015-08-07 18:07:14 -07:00
SamGondelman
23fea1f221 working on toybox script, squeezeHands, and default mappings 2015-08-07 16:59:50 -07:00
Sam Gondelman
3256e30f02 toybox script 2015-08-05 18:54:08 -07:00
Howard Stearns
5114f82dca Fix https://app.asana.com/0/32622044445063/38213714069516 2015-06-23 12:07:01 -07:00
ericrius1
cf579ab275 fixed bullet size to be smaller 2015-06-23 09:52:29 -07:00
Howard Stearns
e6bafb9bf1 Draggable toolBar.js, with persistence, and update some scripts for it. 2015-06-11 16:19:54 -07:00
Howard Stearns
d214f128cd Miniumum change for gun to use per-entity collisions. 
I have *not* updated this script for other recent changes (e.g., to entityIDs).
 2015-05-25 17:39:15 -07:00
Seth Alves
f9d46b0cb5 interface decides on entityIDs rather than bouncing a temporary id through the entity server 2015-05-19 14:25:23 -07:00
Eric Levin
7a12a4d58e added support for both right and left hydras for hydra scripts, and made picking accurate 2015-05-14 17:00:40 -07:00
Eric Levin
ebb590e58a added new hydragrab script which works similarly to mouse grab script, and added header to hydraGrabHockey script 2015-05-14 11:46:52 -07:00
Thijs Wenker
bd8ea7bfc0 Merge branch 'master' of github.com:PhilipRosedale/hifi into 20423 
Conflicts:
	examples/controllers/hydra/gun.js
 2015-04-01 19:13:46 +02:00
Thijs Wenker
f22c739642 updated gunscript 2015-04-01 16:26:55 +02:00
Philip Rosedale
9642bd199d Buttons at bottom 2015-03-31 22:12:06 -07:00
Philip Rosedale
b7f0be761c gun buildings fall on creation, dice stops correctly 2015-03-31 16:27:09 -07:00
Philip Rosedale
182a1a726d remove debug 2015-03-10 13:34:16 -07:00
Philip Rosedale
2d6c51ac77 Detect moving objects before catching them 2015-03-10 13:32:56 -07:00
Andrew Meadows
a758ccd75a Merge pull request #4402 from birarda/master 
add underlying controls for user discoverability
 2015-03-10 08:30:46 -07:00
Stephen Birarda
2f22c0cd96 cleanup username API from GlobalServicesScriptingInterface 2015-03-09 16:28:01 -07:00
Andrew Meadows
5b854857c1 fix JS scripts to use radians per second 
in entity properties
 2015-03-07 18:02:41 -08:00
Philip Rosedale
9d021a1a1e remove unused line 2015-02-24 11:49:12 -08:00
Philip Rosedale
7489b468f3 give angular velocity to the thrown ball 2015-02-24 11:48:35 -08:00
Thijs Wenker
4d12a6d81c Merge branch 'master' of https://github.com/worklist/hifi into 20245 
Conflicts:
	examples/notifications.js
 2015-02-17 23:30:58 +01:00
Andrew Meadows
d896f3a811 Merge pull request #4252 from thoys/20224 
CR for Job #20224 - Make virtualKeyboard.js go to locations and support gamepads
 2015-02-17 09:03:17 -08:00
Stephen Birarda
70e085009b use injector restart in airGuitar script 2015-02-12 11:44:14 -08:00
Stephen Birarda
05b7cd819e use isPlaying property instead of getter 2015-02-11 16:21:45 -08:00
Stephen Birarda
d8646f6ea0 repairs for new injector API in air guitar script 2015-02-11 16:17:10 -08:00
Thijs Wenker
2c52c9c3c0 fixes for the virtualKeyboardTextEntityExample 2015-02-11 22:57:59 +01:00
Thijs Wenker
1d5afba1fa removed some console noise 2015-02-09 18:40:36 +01:00
Thijs Wenker
e53b38e497 style / make sure the magnifier isn't rendered when we don't want it 2015-02-09 17:16:54 +01:00
Thijs Wenker
d810283d5a just show the instructions the first 2 times 2015-02-09 16:47:00 +01:00
Thijs Wenker
8251542b78 show instructions whenever the first gamepad is plugged since the script is loaded 2015-02-07 14:35:14 +01:00
Thijs Wenker
d270979f95 Instructions initial 2015-02-04 23:19:56 +01:00
Thijs Wenker
34fd44c081 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-29 22:32:26 +01:00
Philip Rosedale
0c3f4b894c Menu for handedness, that really works. 2015-01-29 10:53:50 -08:00
Philip Rosedale
a85c6aa956 fix tabs? 2015-01-28 09:49:45 -08:00
Philip Rosedale
b515a0468b Merge branch 'master' of https://github.com/worklist/hifi 2015-01-28 09:35:07 -08:00
Thijs Wenker
6947436994 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-27 22:29:49 +01:00
Brad Hefta-Gaub
0c53193e79 Merge pull request #4175 from cozza13/20283 
CR for Job #20283 - Clean up scripts that have recently been added.
 2015-01-27 13:05:17 -08:00
Andrew Meadows
6b6e846378 Merge pull request #4177 from ZappoMan/fixGlitches 
Some physics improvements
 2015-01-27 13:02:11 -08:00
Chris Collins
283a056a43 remove VRui 
remove VRui
 2015-01-27 11:37:31 -08:00
Chris Collins
411541b884 Tidy up some scripts. 
Tidy up scripts. Make some changes to some script references and
reorganize.
 2015-01-27 11:04:50 -08:00
Philip Rosedale
e8f4783bea border, new size for blocks, smoother hydra grab action 2015-01-26 22:06:59 -08:00
Philip Rosedale
8b5a451886 Grab now correctly adds linear velocity so that you can grab and throw things 2015-01-26 21:09:21 -08:00
Philip Rosedale
bf0cde060c Merge branch 'master' of https://github.com/worklist/hifi 2015-01-26 20:35:34 -08:00
Philip Rosedale
e0c9af853c remove 'STICKS' mode, add drop line to better tell what something you are holding is above 2015-01-26 20:19:46 -08:00
Atlante45
cf631bf3fc Remove unnecessary stopAnimation in script to get rid of sacades 2015-01-26 19:20:47 -08:00
Philip Rosedale
6d3a9f7bc0 merge fix 2015-01-26 18:43:42 -08:00
Atlante45
64f8495681 Fixed mapped rotation + doubled it 2015-01-26 18:20:08 -08:00
Philip Rosedale
dd352e5a1a Merge branch 'master' of https://github.com/worklist/hifi 2015-01-26 17:31:35 -08:00
Philip Rosedale
a1babe3a33 Put paddle exactly in hand, add animation of fingers gripping paddle 2015-01-26 17:20:31 -08:00
Atlante45
4b3291d946 Some cleanup in hydraGrab.js 2015-01-26 17:11:49 -08:00
Philip Rosedale
bfdbe2e675 Detach both guns on shutdown 2015-01-26 16:25:07 -08:00
ZappoMan
08fbcbaf40 tweaks for debugging 2015-01-26 12:38:02 -08:00
Thijs Wenker
ffb35666e1 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-26 19:37:27 +01:00
Philip Rosedale
09527cc264 hit target 2015-01-25 21:52:08 -08:00
Philip Rosedale
67632fa589 remove debug 2015-01-25 21:51:12 -08:00
Philip Rosedale
901044fc53 First version, popcorn machine 2015-01-25 21:40:16 -08:00
Philip Rosedale
1048c9cda3 Merge branch 'master' of https://github.com/worklist/hifi 2015-01-23 16:09:51 -08:00
Philip Rosedale
806c1851be add save/restore of gravity 2015-01-23 16:09:45 -08:00
Atlante45
7a1300d66c Request blocking calls 2015-01-23 16:05:06 -08:00
Thijs Wenker
42cf9e846a Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-23 19:10:08 +01:00
Philip Rosedale
59f79fd436 Add handedness choice, default to right handed 2015-01-22 13:42:19 -08:00
Philip Rosedale
45a84895e1 Paddle ball game, first version 2015-01-22 12:44:07 -08:00
Philip Rosedale
6567fcfe0b Added shootable blocks on platform, grenade, buttons for making grid of targets 2015-01-21 16:17:25 -08:00
Philip Rosedale
e02e0088af Improvements to gun to add shootable targets on a platform 2015-01-21 13:58:48 -08:00
Thijs Wenker
9c2f6c78a8 Merge branch '20224' of github.com:thoys/hifi into 20245 
Conflicts:
	examples/notifications.js
 2015-01-21 17:26:22 +01:00
Thijs Wenker
6bad7a6002 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-17 01:35:35 +01:00
Philip Rosedale
a07b5a9723 laser pointers to guns, toppling targets (press 't') 2015-01-15 17:34:52 -08:00
Thijs Wenker
5de4f8f249 Merge branch 'master' of https://github.com/worklist/hifi into 20224 
Conflicts:
	examples/libraries/virtualKeyboard.js
 2015-01-15 22:59:05 +01:00
Thijs Wenker
12136e5305 cursor follows look at rotation now 2015-01-15 22:25:59 +01:00
Chris Collins
d6a3b94c73 Changed references of global.js to a var 
Changed references of global.js to a var
 2015-01-15 10:48:31 -08:00
Chris Collins
6ce71d9655 Fix library and placement reference 
Fix library reference and switch the gun hand.
 2015-01-14 13:54:34 -08:00
Thijs Wenker
2611e2f364 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-14 15:40:46 +01:00
Andrew Meadows
b4ee7b684c Merge pull request #4070 from cozza13/20259 
CR for Job #20259 - Fix up bad links on bot scripts
 2015-01-13 17:06:36 -08:00
Thijs Wenker
38d49854cb hide cursor 2015-01-14 01:06:44 +01:00
Thijs Wenker
74d56fb754 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-13 22:42:02 +01:00
Thijs Wenker
7b88deef16 Implement UI sounds for virtualKeyboard & notifications 2015-01-13 22:08:35 +01:00
Atlante45
2b48d31cbb Move scripts to correct directory 2015-01-12 17:48:54 -08:00
Thijs Wenker
636073474c Merge branch '20224' of github.com:thoys/hifi into 20224 2015-01-12 09:40:27 +01:00
Chris Collins
9ca0df0796 Small fixes to scripts 
-merge duplicate gun scripts
-fix url of sit
 2015-01-08 16:05:32 -08:00
Thijs Wenker
c791422fab make gamepads and A (select key) and B (delete character) button function 2015-01-08 02:22:08 +01:00
Thijs Wenker
da95d413a0 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-07 23:25:05 +01:00
Thijs Wenker
40b4a17ba8 include globals.js from runnable scripts for now. 2015-01-07 23:14:31 +01:00
Chris Collins
d15ae92e1e Guitar fix 
Guitar position fix
 2015-01-07 13:40:36 -08:00
Thijs Wenker
ff6cae738b fixed library paths 2015-01-07 20:47:59 +01:00
Thijs Wenker
19eec81173 moved goTo.js and virtualKeyboardTextEntityExample.js to the right category folder 2015-01-07 20:46:39 +01:00
Thijs Wenker
2d56070eae Merge branch 'master' of https://github.com/highfidelity/hifi into 20224 
Conflicts:
	examples/controllers/oculus/virtualKeyboard.js
	examples/libraries/virtualKeyboard.js
	examples/virtualKeyboard.js
 2015-01-07 20:45:18 +01:00
Thijs Wenker
0ec25acc9c Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-07 14:39:27 +01:00
Chris Collins
816e369c08 More Script updates 
More Script updates
 2015-01-06 22:32:45 -08:00
Chris Collins
95f8447191 Incremental update to scripts cleanup 
-Moved more of the scripts around
-Fixed up the location on assets on start. e.g. gun.js
-Removed additional Scripts.
 2015-01-06 15:47:25 -08:00