James B. Pollack
6523a057a8
Update lightSwitchHall.js
...
fix header file
2015-10-01 18:18:27 -07:00
James B. Pollack
cfb9728fdb
Update doll.js
...
remove some unused code
2015-10-01 18:17:35 -07:00
James B. Pollack
9098585e2f
Update cat.js
...
remove a lot of unused code and add flag for whether cat is already meowing so that it doesn't start another one until its done. unfortunately i dont know how to read the audio isplaying state so we have to use a lame timeout
2015-10-01 18:14:08 -07:00
James B. Pollack
b352ab4736
Update lightSwitchGarage.js
...
fix header and spacing issues
2015-10-01 18:04:37 -07:00
ericrius1
09f7dcb5e9
Merge branch 'imgntn-ericrius1-toybox' into toybox
2015-10-01 17:22:44 -07:00
ericrius1
d0be47bae9
fix merge
2015-10-01 17:22:12 -07:00
ericrius1
bf9a948ca9
Merge branch 'master' into toybox
2015-10-01 17:17:12 -07:00
Brad Hefta-Gaub
454a86d7ff
Merge pull request #5934 from imgntn/hand_grab
...
[Scripts] Prevent mouse grab from moving 'ungrabbable' objects
2015-10-01 17:03:44 -07:00
Anthony J. Thibault
fa864d29f9
Merge branch 'master' into transmit-joint-translation
2015-10-01 16:55:24 -07:00
Howard Stearns
53e7d5fd7c
Merge pull request #5975 from AndrewMeadows/cleanup-legacy-constraints
...
remove cruft relating to old verlet avatar skeleton simulation
2015-10-01 16:48:33 -07:00
Andrew Meadows
8bde78a4e8
Merge pull request #5954 from ctrlaltdavid/particle-interpolation
...
Improve particle property interpolation
2015-10-01 16:13:18 -07:00
Anthony J. Thibault
fe5ea471a1
AnimClip: read in translations from fbx file and pre-process them
...
Do the following things to the translations
1. scale by the model offset, this should move the translations into the correct units (meters).
2. compute the ratio between the bone length in the animation and the skeleton.
3. subtract the anim translation from the first translation frame in the animation
effectively turning it into a bind pose delta translation.
4. apply bone length ratio to the resulting delta.
5. set the final translation to be the skeleton rel bind pose + this scaled delta translation
2015-10-01 16:10:33 -07:00
ericrius1
407b6b8158
Fixed bug in spray paint where sometimes would not spray
2015-10-01 16:10:29 -07:00
ericrius1
0fb51a6777
got rid of unneeded light test code
2015-10-01 15:56:16 -07:00
ericrius1
cdb249c6ff
original master script
2015-10-01 15:53:28 -07:00
James Pollack
32d9dc72d2
Merge branch 'master' into particle_explorer
2015-10-01 15:52:49 -07:00
David Rowe
e56d2d9b43
Add asserts
2015-10-01 15:48:37 -07:00
James Pollack
edbc2cc2c3
Merge remote-tracking branch 'upstream/master'
2015-10-01 15:46:51 -07:00
ericrius1
25e25726d5
only lights
2015-10-01 15:43:25 -07:00
Clément Brisset
fafcef9a6c
Merge pull request #5925 from sethalves/fix-obj-materials
...
Fix obj materials
2015-10-01 15:34:15 -07:00
James Pollack
dfab1fc685
Fix merge conflicts and lint the conflict code
2015-10-01 15:32:22 -07:00
James Pollack
8e2c1a6b17
Add ping pong ball gun, add basketball hoop, reduce gate gravity, lint code
2015-10-01 15:22:45 -07:00
ericrius1
e1b720d338
Moved some functions to utils, fixed formatting
2015-10-01 15:18:44 -07:00
Seth Alves
716ebf487f
Merge pull request #5952 from imgntn/ping_pong_gun
...
[Scripts] Ping Pong Gun
2015-10-01 15:06:48 -07:00
James B. Pollack
4a7e3c66bd
Update createPingPongGun.js
...
use relative paths
2015-10-01 15:05:25 -07:00
James Pollack
7bcb4e4ae3
Merge branch 'master' into ericrius1-toybox
2015-10-01 14:59:54 -07:00
James Pollack
97fb189fc0
Merge remote-tracking branch 'upstream/master'
2015-10-01 14:58:18 -07:00
ericrius1
55c6b9d9c4
Added collision sound to blocks
2015-10-01 14:57:03 -07:00
Seth Alves
44e4f4dc63
merge from upstraem
2015-10-01 14:55:56 -07:00
Brad Hefta-Gaub
5e8e15091a
Merge pull request #5970 from sethalves/allow-double-near-grab
...
allow more than one near-grab on an object
2015-10-01 14:47:03 -07:00
ericrius1
5aef7475d6
Sound position updates every frame based on new position of can
2015-10-01 14:42:51 -07:00
Brad Hefta-Gaub
521aaa0998
Merge pull request #5974 from Atlante45/extra_debug
...
Remove extra debug
2015-10-01 14:42:45 -07:00
Brad Hefta-Gaub
a2463cbf68
Merge pull request #5972 from Atlante45/fix_currentAPI
...
Fix currentAPI.js
2015-10-01 14:41:56 -07:00
Brad Hefta-Gaub
afe5075e10
Merge pull request #5971 from howard-stearns/AnimVariant-warning-squash
...
Squash compiler warning in AnimVariant.
2015-10-01 14:41:40 -07:00
Brad Hefta-Gaub
17402c697a
Merge pull request #5935 from imgntn/basketball_hoop
...
[Scripts] Basketball hoop
2015-10-01 14:40:55 -07:00
Brad Hefta-Gaub
f2e65f5a98
Merge pull request #5936 from birarda/tv-es-lockup
...
fix a timer leak, line width in PacketList
2015-10-01 14:39:40 -07:00
Howard Stearns
739545794f
Merge pull request #5944 from AndrewMeadows/ik-repairs-007
...
fix bug: IK attenuates fast underpose animations
2015-10-01 14:27:21 -07:00
ericrius1
7ee26c5d4a
tweaked settings
2015-10-01 14:26:22 -07:00
Anthony J. Thibault
8bfd38ce7c
FBXReader: When the animation has no animation curve use the joint's default position.
2015-10-01 14:15:02 -07:00
Andrew Meadows
09ac01a5e7
remove cruft from old verlet avatar simulation
2015-10-01 13:44:50 -07:00
Seth Alves
25cbebb66c
Merge branch 'transmit-joint-translation' of github.com:sethalves/hifi into transmit-joint-translation
2015-10-01 13:24:04 -07:00
Seth Alves
8453043038
remove unused variable
2015-10-01 13:23:51 -07:00
Atlante45
b37bf2b1b6
Remove extra debug
2015-10-01 13:18:22 -07:00
James Pollack
861aa91572
shoot out of the right end of the gun
2015-10-01 12:27:45 -07:00
James Pollack
d2f4b6e9f0
add / remove controller listener methods
2015-10-01 12:21:56 -07:00
ericrius1
290659b9f6
increased lifetime
2015-10-01 11:46:37 -07:00
James Pollack
a4105eb321
add color pickers
2015-10-01 11:34:02 -07:00
Atlante45
d0bec38603
Fix currentAPI.js
2015-10-01 11:30:50 -07:00
ericrius1
ef5ad9eeb3
Laser stays visible when further away from surfaces
2015-10-01 11:02:22 -07:00
Howard Stearns
335d87134b
Squash compiler warning in AnimVariant.
2015-10-01 10:58:31 -07:00
