David Rowe
03194437f5
Merge branch 'master' into 20681
...
Conflicts:
examples/entityScripts/sprayPaintCan.js
2015-09-18 12:04:02 -07:00
David Rowe
68874eed96
Update particle scripts
2015-09-18 11:34:26 -07:00
David Rowe
8634b59914
Make able to emit from within portion of ellipsoid volume
2015-09-17 23:49:57 -07:00
David Rowe
9e2b5b75b6
Make able to emit in specified range of directions
...
Controlled by polar and azimuth start and finish angles, around point or
from specified part of spheroid surface.
2015-09-17 22:40:49 -07:00
David Rowe
f647dcf147
Change emitter radiuses to dimensions to match sphere properties
2015-09-17 21:06:40 -07:00
David Rowe
12e2cf3ce9
Emit in all directions from a point or the surface of a spheroid
2015-09-17 17:14:35 -07:00
Brad Hefta-Gaub
5549f4ec40
Merge pull request #5821 from ericrius1/paintCan
...
Paint can tweaks
2015-09-17 11:37:44 -07:00
David Rowe
d51cab3e3d
Replace particle velocity with speed and orientation
2015-09-16 14:51:08 -07:00
ericrius1
bbf6e8b599
using relative paths for entity scripts
2015-09-16 13:52:29 -07:00
ericrius1
0b21cc1777
paint can tweaks
2015-09-16 09:59:35 -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
ericrius1
da208526cc
spray can tweaks
2015-09-15 16:48:28 -07:00
ericrius1
9648f56062
some fixups to spray paint script
2015-09-15 15:48:21 -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
Brad Davis
9b81842850
Merge branch 'master' into homer
...
Conflicts:
assignment-client/src/octree/OctreeSendThread.cpp
interface/src/Application.cpp
libraries/entities-renderer/src/EntityTreeRenderer.cpp
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityTree.cpp
libraries/entities/src/EntityTreeElement.cpp
libraries/entities/src/EntityTreeElement.h
libraries/entities/src/EntityTreeHeadlessViewer.cpp
libraries/entities/src/RecurseOctreeToMapOperator.cpp
libraries/octree/src/Octree.h
libraries/physics/src/EntityMotionState.cpp
2015-09-11 16:31:18 -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
ericrius1
eabdd1f4d9
quick fix for particles hanging around
2015-09-11 11:33:21 -07:00
ericrius1
6e46e3d3b6
cleanup for paintcan
2015-09-11 11:24:53 -07:00
ericrius1
1991ba0eba
absolute path for now- just for testing purposes before merge
2015-09-11 09:37:03 -07:00
Brad Davis
92eeb564fe
PR comments
2015-09-10 20:57:43 -07:00
Brad Davis
aa989c3687
Fixing some entity race condition crashes
2015-09-10 20:53:17 -07:00
Brad Davis
3bc9e8c98d
Fixing some entity race condition crashes
2015-09-10 20:43:41 -07:00
ericrius1
7969fb64ce
tweaking distance threshold
2015-09-10 17:08:52 -07:00
Seth Alves
94dc86833f
Revert "edit.js adjustment"
2015-09-10 17:01:11 -07:00
ericrius1
a1fd867c09
timer fix for reset
2015-09-10 16:46:25 -07:00
ericrius1
510e253575
switching to hosted script for testing
2015-09-10 16:26:57 -07:00
ericrius1
66e4acf651
trying to move to instant reset
2015-09-10 16:21:57 -07:00
Sam Gateau
ae03d32a84
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-09-10 15:55:42 -07:00
Sam Gateau
3bf0f388eb
Make the flashlight grab frame work correctly
2015-09-10 15:39:54 -07:00
Philip Rosedale
5955228652
Merge pull request #5769 from sethalves/edit-js-adjustment
...
edit.js adjustment
2015-09-10 15:36:35 -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
Sam Gateau
d0592d562c
Make the flashlight grab frame work correctly
2015-09-10 15:30:50 -07:00
Seth Alves
698ccc6fb0
don't change camera when edit.js is activated. don't highlight entites I mouse-hover over.
2015-09-10 13:48:36 -07:00
Sam Gateau
38fcb80135
FIx bad relative path
2015-09-10 09:52:52 -07:00
Howard Stearns
d7c1c7593a
Merge pull request #5761 from ZappoMan/preventIncludeRecusion
...
prevent Script.include() from including the same file multiple times
2015-09-10 09:22:55 -07:00
Brad Hefta-Gaub
1aa3c746a6
Merge pull request #5762 from samcake/punk
...
Adding the flashlight toy script
2015-09-10 09:15:22 -07:00
Brad Hefta-Gaub
edf889a4c8
Merge pull request #5756 from ericrius1/grabChanges
...
added lifetime to pointer, default grab behavior now honors objects i…
2015-09-10 09:14:11 -07:00
Brad Hefta-Gaub
f45e182d33
fix CR feedback, add examples
2015-09-10 09:06:56 -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
samcake
e647bfc19b
Update flashlight.js
...
modify the path to be relative
2015-09-09 22:41:09 -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
Sam Gateau
0a0a9805f6
Fixing the url behavior
2015-09-09 18:11:00 -07:00
Sam Gateau
8360fceadf
Fixing the url behavior
2015-09-09 18:09:52 -07:00
Sam Gateau
6aebda86f4
Creating the flashlight script files
2015-09-09 17:24:20 -07:00
