ericrius1
035ca25b48
arc ball finds other balls
2015-12-17 13:31:27 -08:00
ericrius1
6f82d680b9
removed unwanted file
2015-12-17 12:38:25 -08:00
ericrius1
5b52b5e5e7
Merge branch 'master' into polylineOptimizations
2015-12-17 11:41:34 -08:00
ericrius1
8d25a666d1
fixed bug where trail would remain after user released rave stick
2015-12-17 11:40:06 -08:00
ericrius1
2aaefbcfcb
refactoring, adding headers
2015-12-17 11:32:48 -08:00
ericrius1
d4481818b2
lightsaber oriented right
2015-12-17 10:50:58 -08:00
ericrius1
57e51afd46
light stick
2015-12-17 10:35:20 -08:00
ericrius1
f7811cf5dc
light trails from rave stick
2015-12-17 10:25:51 -08:00
ericrius1
064c05e98c
light trails
2015-12-17 10:04:51 -08:00
ericrius1
b127b6a9e8
separating out rave stick
2015-12-17 08:55:57 -08:00
ericrius1
bb67ca87e2
lightsabers
2015-12-16 17:52:39 -08:00
ericrius1
f9f496ef5a
adding beam effect
2015-12-16 17:32:30 -08:00
ericrius1
d8c8778316
rave stick in right orientation
2015-12-16 16:50:27 -08:00
ericrius1
263557cc1a
setting dimensions for rave stick
2015-12-16 16:18:57 -08:00
ericrius1
6a77ae5db2
adding rave stick
2015-12-16 15:47:34 -08:00
ericrius1
4155e3af71
refactoring
2015-12-16 15:22:56 -08:00
ericrius1
b29a6b16a9
modularizing flow art tools
2015-12-16 14:40:56 -08:00
ericrius1
fcfa396912
syntax tweak
2015-12-16 13:58:55 -08:00
Clément Brisset
7c8f019507
Merge pull request #6663 from birarda/baseball
...
update link to bat script in createBatButton.js
2015-12-15 19:26:33 -08:00
ericrius1
61bad36d5c
tweaks
2015-12-15 18:49:04 -08:00
ericrius1
d9c93130e5
In a state where non uniform random vals are clear
2015-12-15 18:02:11 -08:00
Stephen Birarda
13c83bb262
update link to bat script in createBatButton.js
2015-12-15 17:23:29 -08:00
Brad Davis
29516619ee
Merge pull request #6661 from ZappoMan/rightClickMenu
...
first cut at simulating mouse/reticle behavior with input contorllers
2015-12-15 16:08:59 -08:00
Brad Hefta-Gaub
3dcdfbc0f1
first cut at simulating mouse/reticle behavior with input contorllers
2015-12-15 13:59:22 -08:00
ericrius1
dca83a054e
Changed additiveBlending to emitterShouldTrail
2015-12-15 10:30:57 -08:00
ericrius1
c561a53f7c
Going to change additive blending to world position prop
2015-12-15 09:56:28 -08:00
ericrius1
761dfeaccd
2 balls
2015-12-14 14:53:08 -08:00
ericrius1
8d691f2132
light ball
2015-12-14 11:44:42 -08:00
Anthony J. Thibault
3f0cdb3c02
Merge branch 'master' into tony/js-avatar-default-pose
2015-12-14 11:19:24 -08:00
ericrius1
3d782f1307
fixed merge conflicts
2015-12-14 10:11:49 -08:00
ericrius1
ab5b783cb7
zone tweal
2015-12-14 09:01:45 -08:00
Brad Hefta-Gaub
2815cb0fef
first cut at adding advanced and developer menu groupings
2015-12-12 18:12:36 -08:00
Brad Hefta-Gaub
64dd36d140
Merge pull request #6503 from imgntn/ratsteer
...
Add rats to Drylake environment
2015-12-11 13:08:03 -08:00
James B. Pollack
35da54fc6c
dead code and print statements
2015-12-11 11:51:32 -08:00
James B. Pollack
a31ba089c1
semicolons and print statements
2015-12-11 11:49:00 -08:00
Howard Stearns
e8ffa598a2
Merge branch 'master' of https://github.com/highfidelity/hifi into scriptable-anim-var-triggers
2015-12-10 20:40:42 -08:00
Howard Stearns
dfec222c81
Report animation triggers to normal javascript animationStateHandlers, and update away.js as an example.
2015-12-10 20:39:01 -08:00
James B. Pollack
99bc47867a
cleanup
2015-12-10 18:16:01 -08:00
James B. Pollack
c463e36ce6
make particle explorer visible
2015-12-10 14:02:52 -08:00
Anthony J. Thibault
020836f536
Fixed date on tPose.js
2015-12-10 14:00:22 -08:00
Anthony J. Thibault
652ce5501f
Expose Avatar default pose to JavaScript
...
New JavaScript API to get the avatar's default pose.
MyAvatar.getDefaultJointRotation(index);
MyAvatar.getDefaultJointTranslation(index);
See `examples/tPose.js` for example usage
2015-12-10 13:57:31 -08:00
Brad Hefta-Gaub
92d1038871
Merge pull request #6590 from imgntn/particle_explorer_updates
...
Update Particle Explorer to Ignore New Parenting Properties
2015-12-10 07:43:40 -08:00
Brad Hefta-Gaub
27d28900a4
Merge pull request #6580 from imgntn/parented_flashlight
...
Update Flashlight to use Parenting
2015-12-10 07:43:10 -08:00
Brad Hefta-Gaub
1512703182
Merge pull request #6593 from Atlante45/master
...
Update toys relativeRotation/Position
2015-12-10 07:37:08 -08:00
Brad Hefta-Gaub
bd1ab418a4
Merge pull request #6606 from hyperlogic/tony/remove-animation-start-automatically-property
...
[PROTOCOL CHANGE] Entities: Removed Start Automatically property from Animation Group
2015-12-10 07:35:55 -08:00
James B. Pollack
b16822ed8a
swap sound file
2015-12-09 18:41:06 -08:00
Anthony J. Thibault
e9f529bf12
Entities: Removed Start Automatically property from Animation Group
...
There is an issue when startAutomatically was set to true and animationPlaying was set to false.
This would cause clients to play the animation when they connected to the entity server, even though the server was not.
2015-12-09 17:59:56 -08:00
Atlante45
17daff920c
Fix all entities using relative grab pos/rot
2015-12-09 14:25:18 -08:00
Atlante45
4ee5bf316a
Fix bow offsets
2015-12-09 14:25:18 -08:00
Atlante45
65bc6aa371
Fix left hand grab
2015-12-09 14:25:18 -08:00