ericrius1
f6c888599e
Fixed a bug where particles weren't moving with can.
2015-10-02 10:22:48 -07:00
James Pollack
ea20fc9786
hack for it to work as a tool window
2015-10-02 10:08:10 -07:00
ericrius1
9f5a3066b8
changed masterResetEntity back to masterReset
2015-10-02 10:07:43 -07:00
ericrius1
71fe9b216c
Removed extraneous masterReset script, and extra call to lightSwitches in correct script
2015-10-02 10:02:28 -07:00
Andrew Meadows
e9c71f3867
cleanup comments
2015-10-02 10:02:12 -07:00
ericrius1
a6df6c53f1
fixed more syntax errors
2015-10-02 09:55:41 -07:00
ericrius1
36f7bba87e
Fixed some syntax errors, tweaked cat script so doesn't meow while it's already meowing
2015-10-02 09:53:30 -07:00
Andrew Meadows
50b2c8ae37
remove warnings in linux
2015-10-02 09:39:34 -07:00
Andrew Meadows
940b8eb529
improve some variable names
2015-10-02 09:39:13 -07:00
Andrew Meadows
98fe06be57
cleanup sixense/hydra calibration
2015-10-02 09:30:18 -07:00
Brad Davis
aa8979570c
Working on 2D overlay mouse interaction
2015-10-02 00:35:37 -07:00
James B. Pollack
7c9d7ffefd
single sysytem particle explorer with one way bindings is feature complete
2015-10-01 23:49:33 -07:00
James B. Pollack
d1432c51d5
Merge branch 'master' into particle_explorer
2015-10-01 21:21:52 -07:00
James B. Pollack
679fc1b5ad
Merge branch 'master' of https://github.com/imgntn/hifi
2015-10-01 21:21:32 -07:00
Ken Cooke
3555e90cf6
Improved random generator for SIMD dither
2015-10-01 20:32:48 -07:00
Ken Cooke
e1e34b2ce5
Fix to allow arbitrary input/output buffers from caller. SIMD padding is no longer required.
2015-10-01 20:17:04 -07:00
samcake
71ad6195f2
Merge branch 'master' of https://github.com/highfidelity/hifi into calvin
2015-10-01 19:25:25 -07:00
samcake
690620d74d
Cleaning code
2015-10-01 19:23:32 -07:00
James Pollack
4b1b53e189
end of dat
2015-10-01 19:01:10 -07:00
James B. Pollack
a3c91b12b9
Update cat.js
2015-10-01 18:56:38 -07:00
James B. Pollack
0ce6a305bd
Update cat.js
2015-10-01 18:52:08 -07:00
James B. Pollack
d0e079ee9d
Update cat.js
...
add globals, lint the code
2015-10-01 18:46:32 -07:00
samcake
3490e08521
Little improvments on the performance side to get the Stencil pass and the masking of the background under reasonable performances
2015-10-01 18:42:09 -07:00
James B. Pollack
55d20e9d4c
Update cat.js
2015-10-01 18:41:24 -07:00
James B. Pollack
59c1c7ee6a
Update masterReset.js
...
remove file versioning
2015-10-01 18:40:12 -07:00
James B. Pollack
f200fcdfa2
Update cat.js
2015-10-01 18:35:34 -07:00
James B. Pollack
6cc2df9052
Update cat.js
...
hook into isPlaying for sounds
2015-10-01 18:34:22 -07:00
Seth Alves
9f27e5ff1f
back out a couple other unneeded changes
2015-10-01 18:21:53 -07:00
James B. Pollack
3565d96ffb
Update sprayPaintCan.js
...
add a header, cleanup
2015-10-01 18:21:15 -07:00
James B. Pollack
54a51e6b8b
Update and rename masterResetEntity.js to masterReset.js
...
remove reference to 'entities' in the file name since this script does more than that. also update the header file.
2015-10-01 18:19:36 -07:00
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
Seth Alves
40c5103d2f
back out change where actino data caches were split into in/out
2015-10-01 17:15:20 -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
Seth Alves
e90b156b7b
avoid: add an action, immediately receive an update to that entities action, delete the just-added action because it wasn't in the packet
2015-10-01 17:02:02 -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
Seth Alves
f2ebba9863
separate out the inbound and outbound caches of serialized action data
2015-10-01 16:16:23 -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
