Commit graph

12663 commits

Author SHA1 Message Date
Howard Stearns
5eef0e21ad Merge pull request #5826 from AndrewMeadows/ik-repairs-000
prevent initial bad IK targets for hands
2015-09-16 18:49:46 -07:00
Seth Alves
da74d4b1e1 Merge pull request #5830 from ZappoMan/entityScriptsReload
add reload all support for entity scripts
2015-09-16 17:09:07 -07:00
Brad Hefta-Gaub
b645d99412 CR feedback 2015-09-16 17:07:12 -07:00
Andrew Meadows
e1fc1900ab remove IK 'flutter' bug 2015-09-16 17:02:12 -07:00
Andrew Meadows
d4ea661aca cleanup whitespace 2015-09-16 17:02:12 -07:00
Andrew Meadows
9a86fc2e62 build local list of IK targets every frame 2015-09-16 17:02:12 -07:00
Andrew Meadows
089c719612 minor cleanup 2015-09-16 17:02:12 -07:00
Howard Stearns
e9265ebec2 Merge pull request #5828 from hyperlogic/tony/anim-bug-fixes
AnimController bug fixes and rename to AnimManipulator
2015-09-16 16:59:41 -07:00
Brad Hefta-Gaub
2021a15527 fix white space 2015-09-16 16:54:21 -07:00
Brad Hefta-Gaub
fa6396bbfa fix white space 2015-09-16 16:53:20 -07:00
Brad Hefta-Gaub
7840f122dc add reload all support for entity scripts 2015-09-16 16:46:46 -07:00
Brad Hefta-Gaub
009633f281 Merge pull request #5829 from samcake/HMDLightingBug
Fixing the disappearing local lights
2015-09-16 16:19:21 -07:00
Sam Gateau
882ca5d6c0 Fix the lights not rendering roperly 2015-09-16 15:57:35 -07:00
Anthony J. Thibault
5aeebba90e Renamed AnimController to AnimManipulator, Removed offsets on IK targets 2015-09-16 15:49:47 -07:00
Brad Hefta-Gaub
0a41ab2f41 Merge pull request #5827 from jherico/homer
fix ScriptEngine location property
2015-09-16 15:19:54 -07:00
Anthony J. Thibault
fae4b08eb0 AnimController Node Bug fixes
AnimController: proper support for alpha
AnimController: bug fix for translation.
AnimOverlay: renamed local var when building hand boneSets from head to hand.
2015-09-16 15:11:53 -07:00
Brad Davis
cbb8bee962 Trying to fix ScriptEngine location property 2015-09-16 15:00:24 -07:00
Stephen Birarda
5df7ce7424 fix for missing jurisdiction listener in Agent 2015-09-16 11:43:54 -07:00
Philip Rosedale
b968911fcc Merge pull request #5820 from kencooke/audio-fix
fix audio int16_t to float scaling
2015-09-16 10:26:36 -07:00
Stephen Birarda
13728a7a96 Merge pull request #5806 from Atlante45/as_caching
Asset Server caching
2015-09-16 10:06:40 -07:00
Anthony Thibault
2141eadfa8 Merge pull request #5816 from howard-stearns/stability
Get rid of avatar tilt
2015-09-16 10:05:15 -07:00
Ken Cooke
def24a15ad fix audio int16_t to float scaling 2015-09-16 09:00:41 -07:00
Atlante45
88d073b4ac More disk cache debug info 2015-09-16 15:20:48 +02:00
Atlante45
dd0244b15d Added a couple comments 2015-09-16 15:17:15 +02:00
Atlante45
9678e70444 Asset caching 2015-09-16 15:17:15 +02:00
Atlante45
eabee9857a Enum coding standard 2015-09-16 15:17:14 +02:00
Brad Davis
f35ffd2ab7 Merge pull request #5814 from samcake/HMDLightingBug
Fixing HMD and stereo lighting bug
2015-09-15 18:10:26 -07:00
Sam Gateau
80d25a68b6 Bringing back the eyeView per side to the deferred transform stack 2015-09-15 18:05:15 -07:00
Sam Gateau
5410bc0945 FIx the review comment and trying to fix the simple stereo display plugin projection and eye view matrix 2015-09-15 17:48:55 -07:00
Brad Hefta-Gaub
54972515dc make sure timer is owned 2015-09-15 17:04:40 -07:00
Sam Gateau
8ab96fe907 Bringin back full screen for stereo mode 2015-09-15 17:02:30 -07:00
Sam Gateau
f00e3829f1 Cleaning for PR 2015-09-15 16:54:04 -07:00
Howard Stearns
f6b5f3925a Place head at requested position in all modes. (At least, until we can figure out how to get underpose position cleanly without tilt.) 2015-09-15 16:43:52 -07:00
Howard Stearns
848bb4fccb Merge pull request #5813 from hyperlogic/tony/anim-hand-state-machines
Added point and grab support to the AnimGraph
2015-09-15 15:47:19 -07:00
Ryan Huffman
8c3d8bc7de Merge pull request #5809 from birarda/phrc
timing fixes for default time_point on windows
2015-09-15 15:29:30 -07:00
Sam Gateau
7b8e11e01c Debugging, looking good, no ready for final lighting 2015-09-15 15:22:45 -07:00
Stephen Birarda
8454cb916c avoid branching by using %= operator 2015-09-15 15:15:26 -07:00
Anthony J. Thibault
1948829ca8 Improved state machine for right hand.
The hand state machine has the following features

* There's a idle to point animation, followed by a looping point hold state.
* There's a point to idle animation.
* The grab state is composed of a linear blend between an open and closed pose.

Additionally the C++ code will ramp on the left and right hand overlays,
This allows the fingers to be animated normally when the user is not actively
pointing or grabbing.
2015-09-15 15:09:08 -07:00
Sam Gateau
dc8756e465 Need to pull master, just updated all the deferred shaders to use scribe func declare blocks to avoid long shaders... didn;t validate the current clip to eye position evaluation 2015-09-15 14:40:23 -07:00
Brad Davis
4c0a21f3d2 Merge pull request #5811 from ZappoMan/scriptEngineCleanup
Rework the ScriptEngine shutdown process, Fix crash in AC Scripts
2015-09-15 13:23:40 -07:00
Brad Hefta-Gaub
016a5e5f0a cleanup comments 2015-09-15 11:52:07 -07:00
Brad Hefta-Gaub
41caa36038 removed some debug code 2015-09-15 11:50:10 -07:00
Brad Hefta-Gaub
6521de8163 rework ScriptEngine and worker thread shutdown 2015-09-15 11:00:05 -07:00
Ken Cooke
ffe3fcf4ce Replace repeated division with multiply by inverse 2015-09-15 10:18:53 -07:00
Stephen Birarda
6756d5364b sensible defaults for other time_point uses 2015-09-15 10:11:05 -07:00
Ken Cooke
5045f8558e Fix incorrect scale factor for converting int16_t to/from float 2015-09-15 10:08:24 -07:00
Stephen Birarda
6a186ad1fe ensure a handshake goes out the first time 2015-09-15 09:48:17 -07:00
Clément Brisset
cb1b70820a Merge pull request #5801 from AndrewMeadows/fix-animation-tests
fix animation unit tests
2015-09-15 17:53:06 +02:00
Brad Davis
4ce1db16f4 Merge pull request #5804 from ZappoMan/scriptEngineCleanup
ScriptEngine Threading Repairs
2015-09-15 08:47:11 -07:00
Sam Gateau
9f8d6a78cc Merge branch 'master' of https://github.com/highfidelity/hifi into HMDLightingBug 2015-09-15 08:35:42 -07:00