Anthony J. Thibault
0c02a338f2
Added support for setting Variants in the json file.
...
For example: the avatar.json file was updated to use the "sine" Variant
to drive the Overlay alpha parameter.
2015-08-25 20:57:01 -07:00
Anthony J. Thibault
4abf0cbd63
AnimVariantMap is used in eval, MyAvatar loads avatar.json via url
2015-08-25 20:28:17 -07:00
Anthony J. Thibault
496c706bba
Added AnimVariantMap argument to evaluate.
2015-08-25 11:59:24 -07:00
Anthony J. Thibault
62f86e6a46
Added AnimVariant, renamed AnimClipTests to AnimTests.
...
* Added test for AnimVariant.
2015-08-25 11:33:57 -07:00
Anthony J. Thibault
4bdb00bbc5
Added setCurrentFrame interface to AnimClip.
...
This will recurse the tree and call setCurrentFrameInternal on each node.
This method can be overriden, currently the only meaningful implementation is AnimClip.
2015-08-25 09:58:36 -07:00
Anthony J. Thibault
7a2ca047cb
Added network resource download support to AnimNodeLoader.
2015-08-24 19:00:12 -07:00
Anthony J. Thibault
bde75e9e51
AnimDebugDraw rendering works again.
...
I had to port AnimDebugDraw shader to GLSL 4.1.
2015-08-24 17:36:21 -07:00
Anthony J. Thibault
5a73aef1f8
AnimSkeleton more accurate bind pose generation.
2015-08-24 16:19:16 -07:00
Anthony J. Thibault
9457794d9e
fix whitespace offset due to merge conflict
2015-08-24 14:50:02 -07:00
Anthony J. Thibault
fa5256eefd
Merge branch 'master' into ajt/new-anim-system
2015-08-24 14:32:28 -07:00
Brad Hefta-Gaub
275cdf9d8f
Merge pull request #5581 from larsnaesbye/master
...
Preliminary da_DK translation of Interface
2015-08-24 10:36:30 -07:00
Brad Davis
78a08ed7c7
Merge pull request #5641 from thoys/20660
...
CR for Job #20660 - Render the world Axis markers into negative space, add view option
2015-08-24 10:16:56 -07:00
Howard Stearns
bb91b17314
Merge pull request #5634 from hyperlogic/tony/animation-resource-fix
...
Fix for animation resources
2015-08-24 08:13:33 -07:00
Nex Pro
8d8a9535a0
Merge branch '20660' of github.com:thoys/hifi into 20660
2015-08-24 16:07:38 +01:00
Nex Pro
3f4323e084
Added overload for renderDashedLine
2015-08-24 16:07:07 +01:00
Andrew Meadows
1d7d5071ae
Merge pull request #5633 from howard-stearns/restore-body-indicators
...
Restore body indicators (e.g., lookAt vectors).
2015-08-23 15:46:57 -07:00
Brad Hefta-Gaub
0eaeb99064
Merge pull request #5640 from jherico/maggie
...
Fixing build problem with 3d connexion
2015-08-23 13:46:49 -07:00
Thijs Wenker
bbd6f25ff7
style fixes
2015-08-23 20:01:58 +02:00
Thijs Wenker
0f8cf80d45
Merge branch 'master' of https://github.com/worklist/hifi into 20660
2015-08-23 19:53:50 +02:00
Thijs Wenker
63f0173665
extend world boundaries
2015-08-23 19:52:29 +02:00
Brad Davis
b7237fb5ca
Fixing build problem with 3d connexion
2015-08-23 09:32:58 -07:00
Nex Pro
53a63fed79
Changed constants red, green, blue and grey to uppercase as per style guide.
2015-08-23 17:16:23 +01:00
Thijs Wenker
748625399e
"View -> World Axes" menu option
2015-08-23 17:59:58 +02:00
Thijs Wenker
b7f9bc13da
Merge branch '20660' of github.com:thoys/hifi into 20660
2015-08-23 17:52:51 +02:00
Nex Pro
0ef2def56e
changed default DASH_LENGTH and GAP_LENGTH to 1.0f
2015-08-23 16:52:12 +01:00
Thijs Wenker
9de35511fc
Merge branch '20660' of github.com:thoys/hifi into 20660
2015-08-23 17:50:28 +02:00
Nex Pro
3e8970cc1e
corrected declaration of float constants DASH_LENGTH and GAP_LENGTH as per style guide.
2015-08-23 16:49:39 +01:00
Thijs Wenker
90c8200d66
Merge branch '20660' of github.com:thoys/hifi into 20660
2015-08-23 17:44:43 +02:00
Nex Pro
ad315cf68a
Merge branch '20660' of github.com:thoys/hifi into 20660
...
Conflicts:
interface/src/Util.cpp
2015-08-23 16:30:46 +01:00
Nex Pro
1f08444369
Modified the world box to render axes in negative space
...
Also Modified renderDashedLine to accept params for dash len and gap len so we can display negative axes as dashed lines with 500mm dashes and gaps.
2015-08-23 16:21:20 +01:00
Brad Hefta-Gaub
53f9815f69
Merge pull request #5639 from jherico/maggie
...
Stereo rendering work
2015-08-22 20:48:54 -07:00
Brad Davis
d3135dcfa6
Stereo rendering work
2015-08-22 16:15:10 -07:00
Brad Hefta-Gaub
62d8b14b8b
Merge pull request #5635 from samcake/punk
...
Improve the light attenuation formulae
2015-08-22 15:49:59 -07:00
Brad Hefta-Gaub
2bca05fb2e
Merge pull request #5629 from ctrlaltdavid/displayname-assert
...
More temporary logging to track down cause of assert
2015-08-22 15:48:58 -07:00
Brad Hefta-Gaub
fe44442ffe
Merge pull request #5577 from vastcharade/horizAmbOcclPerf
...
Horiz amb occl performance updates
2015-08-22 12:39:51 -07:00
Philip Rosedale
2bfa121925
Merge pull request #5637 from hyperlogic/tony/fbx-texture-fix
...
Resource fix for textures in FBX files.
2015-08-21 22:20:18 -07:00
Anthony J. Thibault
80d3ae68c2
Removed redundant ends with ‘fbx’ check.
2015-08-21 22:11:53 -07:00
Anthony J. Thibault
04e7084743
Resource fix for textures in FBX files.
...
The baseTexturePath url for textures in FBXGeometry
should default to the same base url as the fbx file itself.
This error was introduced in my recent refactoring.
Textures embedded in FBXGeometries should be un-affected
by this change.
2015-08-21 21:44:15 -07:00
Ryan Huffman
e9517ef929
Merge pull request #5594 from thoys/20638
...
CR for Job #20638 - Scripting: WebSocket Implementation
2015-08-21 19:13:43 -07:00
Thijs Wenker
67e945b884
fix unit test
2015-08-22 03:32:53 +02:00
Thijs Wenker
d84cf1859c
hook up the WebSocket error event directly
2015-08-22 02:18:21 +02:00
Thijs Wenker
0e255f4f3e
properly exposed WebSocketClass::ReadyState to the ScriptEngine
2015-08-22 01:59:44 +02:00
Seth Alves
90483e7c97
Merge pull request #5632 from birarda/master
...
force the HTTPManager to listen on IPv4
2015-08-21 16:56:55 -07:00
Anthony J. Thibault
5e31d423b9
Removed some debugging statements
2015-08-21 16:55:08 -07:00
Thijs Wenker
9edba451eb
- remove webSockets from List after disconnect.
...
- leave it up to the QtScript to delete the WebSocket / WebSocketServer objects
2015-08-22 01:33:22 +02:00
Thijs Wenker
f512205f6f
add ability to include scripts from a relative path in assignment-client (for persistent scripts only)
2015-08-22 01:30:07 +02:00
Sam Gateau
518cf3be15
Improve the light attenuation formulae
2015-08-21 16:28:38 -07:00
Anthony J. Thibault
b7009b4631
Fix for animation resources
...
The problem was that the invokeMethod between the AnimationReader thread
and the main thread was failing, because FBXGeometry* wasn't a registered meta type.
So, I ended up normalizing the AnimationReader class to be more like GeometryReader,
in that it uses singles and slots to communicate success and failure, rather then
invokeMethod.
2015-08-21 16:09:06 -07:00
Andrew Meadows
e9047ac891
Merge pull request #5631 from howard-stearns/sixense-dev-build
...
Make sixense work in dev builds
2015-08-21 15:26:26 -07:00
Howard Stearns
b579b996c3
There was a hidden (and inappropriate) dependency on face model loading.
2015-08-21 15:07:39 -07:00
