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
Howard Stearns
0870c5ed87
Merge pull request #5768 from hyperlogic/tony/ik-and-controllers
...
AnimInverseKinematics and AnimController node
2015-09-10 15:38:53 -07:00
Howard Stearns
23431efdeb
Merge pull request #5771 from ctrlaltdavid/20671-tidy
...
Stop DDE and EyeTracker early but don't destroy until later in shutdown
2015-09-10 15:38:16 -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
David Rowe
4aa553c183
Stop DDE and EyeTracker early but don't destroy until later in shutdown
2015-09-10 14:53:56 -07:00
Seth Alves
a6a61d7e2f
Merge pull request #5770 from birarda/master
...
repair to packing of octree query from headless viewer
2015-09-10 14:53:27 -07:00
Stephen Birarda
f58804a30e
repair to packing of query data from headless viewer
2015-09-10 14:35:44 -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
Brad Hefta-Gaub
5a4a75f4cc
Merge pull request #5767 from jherico/lisa
...
Eliminate excessive debug logging from procedural setup
2015-09-10 12:25:41 -07:00
Anthony J. Thibault
9a9838fd0d
Clean up of AnimNodeLoader after merge from master.
2015-09-10 11:47:41 -07:00
Anthony J. Thibault
663e37da66
Merge branch 'master' into tony/ik-and-controllers
2015-09-10 11:37:47 -07:00
Anthony Thibault
e8ede3ad00
Merge pull request #5731 from ChristophHaag/master
...
build fixes
2015-09-10 11:36:45 -07:00
Anthony J. Thibault
3149baeefc
Merge branch 'master' into tony/ik-and-controllers
2015-09-10 11:04:31 -07:00
Brad Davis
48bd54f81b
Eliminate excessive debug logging from procedural setup
2015-09-10 10:57:37 -07:00
Anthony J. Thibault
68076ccf45
updated anim graph url to use ik-avatar.json
2015-09-10 10:57:30 -07:00
Brad Davis
6bc59341eb
Merge pull request #5766 from samcake/punk
...
FIx bad relative path for Flashlight.js
2015-09-10 09:57:57 -07:00
Sam Gateau
38fcb80135
FIx bad relative path
2015-09-10 09:52:52 -07:00
Seth Alves
4e629b6254
Merge pull request #5764 from birarda/master
...
don't have polyvox build bindings
2015-09-10 09:23:25 -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
Stephen Birarda
710e369b70
don't have polyvox build bindings
2015-09-10 08:52:24 -07:00
Andrew Meadows
35b894872d
Merge pull request #5753 from ctrlaltdavid/20671
...
Terminate DDE earlier during shut-down and always at start-up
2015-09-10 07:46:53 -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
David Rowe
fdcfa9657c
Rework and clarify stopping an existing DDE process
2015-09-09 21:06:50 -07:00
Brad Hefta-Gaub
f29bcd8b6a
Merge pull request #5755 from jherico/lisa
...
Fix possible hang when switching out of Oculus mode
2015-09-09 19:24:00 -07:00
Anthony Thibault
855fd1ccea
Merge pull request #5759 from howard-stearns/animGraph-cleanup
...
Anim graph cleanup
2015-09-09 18:57:38 -07:00
Anthony J. Thibault
09b2d8e4a4
Seed AnimGraph with hand controller position and orientation.
2015-09-09 18:16:57 -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
Brad Hefta-Gaub
ede0a39b5b
prevent Script.include() from including the same file multiple times
2015-09-09 17:54:09 -07:00
Stephen Birarda
e8fca7f6ae
Merge pull request #5760 from ZappoMan/fixLocalFileIncludes
...
fix degenerative url scheme case
2015-09-09 17:40:12 -07:00
Brad Hefta-Gaub
626fcb867b
CR feedback
2015-09-09 17:27:39 -07:00
Brad Hefta-Gaub
f710afbfd1
CR feedback
2015-09-09 17:26:01 -07:00
Sam Gateau
6aebda86f4
Creating the flashlight script files
2015-09-09 17:24:20 -07:00
Brad Hefta-Gaub
d62945c6bf
fix degenerative url scheme case
2015-09-09 17:13:16 -07:00
Howard Stearns
da6444a776
Start anim graph in the right saved state on startup.
2015-09-09 17:02:55 -07:00
Ryan Huffman
08ce09a89b
Merge pull request #5758 from birarda/master
...
fix for supression of packet from unknown nodes
2015-09-09 16:16:39 -07:00
Anthony J. Thibault
ad49d0dd59
AnimInverseKinematics: update _maxTargetIndex correctly.
2015-09-09 16:09:38 -07:00
Howard Stearns
bcf16e52af
Merge branch 'master' of https://github.com/highfidelity/hifi into animGraph-cleanup
2015-09-09 16:04:15 -07:00
Howard Stearns
745872f914
More variants tests.
2015-09-09 15:45:23 -07:00
Andrew Meadows
155d9e422a
Merge pull request #5587 from howard-stearns/decouple-avatar-updates
...
Decouple Avatar Update
2015-09-09 15:36:19 -07:00
Anthony J. Thibault
756eb54a0a
AnimNodeLoader support for InverseKinematics node.
2015-09-09 15:28:21 -07:00
