Brad Davis
bea6fdd890
Working on JSON parsing and cleanup
...
Conflicts:
libraries/controllers/src/controllers/Route.cpp
libraries/controllers/src/controllers/ScriptingInterface.cpp
libraries/controllers/src/controllers/StandardController.cpp
libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
2015-10-20 10:20:28 -07:00
Brad Davis
5a0bb4c31b
Fixing line endings
2015-10-19 16:51:31 -07:00
Brad Davis
57be59935d
Move controller test to app
2015-10-17 19:13:38 -07:00
Brad Hefta-Gaub
293b7c12e1
change join to makeAxis, fix some warnings
2015-10-17 12:46:05 -07:00
Brad Davis
db0fa6b8ed
Update hydra mappings and test code
2015-10-16 17:23:09 -07:00
samcake
cdfe9788d1
Merging
2015-10-15 10:49:08 -07:00
Brad Davis
195045a4ec
Next time remember to hit build all before commiting
2015-10-14 17:20:30 -07:00
Brad Davis
0063f9ae1d
Merging old and new controller interfaces
2015-10-14 15:16:54 -07:00
samcake
3d5bf9aa1a
merging with current upstrem
2015-10-14 09:41:11 -07:00
samcake
fb4ff240ef
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
2015-10-13 09:16:00 -07:00
Brad Davis
8a0540234c
Find the joystick controller dynamically
2015-10-12 18:50:19 -07:00
samcake
dc32d5ae8d
Current status of my code for json
2015-10-12 18:03:21 -07:00
Brad Davis
58d3578fb1
Making anonymous mappings work
2015-10-12 17:59:01 -07:00
Brad Davis
f77878ee79
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-12 11:05:28 -07:00
Brad Davis
14f511350d
Working on refactoring the xbox hardware access and wiring up test code
2015-10-12 10:47:23 -07:00
Brad Davis
6f5f6450df
Cleanup CMake files
2015-10-11 00:01:03 -07:00
Brad Davis
14f33258ae
Working on test code, new controller interface
2015-10-10 16:08:44 -07:00
Brad Davis
52c65b917f
Merge remote-tracking branch 'upstream/master' into controllers
2015-10-10 12:48:49 -07:00
Brad Davis
9e4a7a6226
Working on controller refactoring
2015-10-10 03:05:42 -07:00
Brad Davis
c3775623aa
Splitting files, adding test skeleton
2015-10-09 17:23:52 -07:00
Atlante45
3e71c4cc4e
CR
2015-10-09 13:18:05 -07:00
Stephen Birarda
7bd98354d8
add override to supress warnings in ui-test
2015-10-05 15:53:52 -07:00
Brad Hefta-Gaub
430cbcca7e
first cut at adding surface normals to ray intersection
2015-09-27 21:57:50 -07:00
Brad Hefta-Gaub
5a80c4d0e7
Merge pull request #5886 from samcake/calvin
...
Expose multi Draw Indirect in Batch (Hijack Austin's work...)
2015-09-23 19:13:28 -07:00
samcake
7d8f3661ad
coding standard
2015-09-23 17:49:03 -07:00
samcake
b8e630a7a7
Less Warnigns
2015-09-23 17:46:10 -07:00
samcake
9c44c3e4a4
Removing warnings
2015-09-23 16:19:34 -07:00
samcake
83116fdd85
Fixed the code path with tseparate vertex format, still broken otherwise in the case of primitive instanced
2015-09-23 15:20:39 -07:00
samcake
8735aa8003
Merging Austin pr that adds the multi draw indirect and also fix the seprate vertex format feature for windows and linux
2015-09-23 12:19:17 -07:00
Anthony J. Thibault
a9848cd157
Merge branch 'master' into tony/lean-threshold
2015-09-23 10:54:12 -07:00
Brad Hefta-Gaub
9436d2922f
more warnings fixes
2015-09-22 21:18:04 -07:00
Brad Hefta-Gaub
52842cb287
more warnings fixes
2015-09-22 20:34:40 -07:00
Anthony J. Thibault
9ce43a57f1
Better head IK when in an HMD.
...
Because the current IK system doesn't quite handle what we need
for the head and neck IK, we do it procedurally in the rig, and
manually set both neck and head IK targets.
2015-09-22 19:58:21 -07:00
Brad Hefta-Gaub
7536fed09a
more warning fixes
2015-09-22 17:22:09 -07:00
Brad Davis
deaa4a747b
Batch side implementation of multi-draw indirect
2015-09-22 15:56:58 -07:00
samcake
910038cf82
Merging
2015-09-21 17:47:23 -07:00
Bradley Austin Davis
e024d23366
Instancing work, second pass
2015-09-21 13:27:02 -07:00
samcake
d3b1bcb86d
Redistributing the files to create the model-networking lib and separate that from the redner-utils
2015-09-21 13:21:35 -07:00
Anthony J. Thibault
eadf212418
Updated avatar.json with talking idle animation.
2015-09-18 18:31:53 -07:00
Anthony J. Thibault
5aeebba90e
Renamed AnimController to AnimManipulator, Removed offsets on IK targets
2015-09-16 15:49:47 -07:00
Anthony J. Thibault
70f5835278
Updated left hand point and grab State Machine and animations
2015-09-15 18:00:13 -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
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
Anthony J. Thibault
90f46ba2c8
Added hand state machines to AnimGraph.
...
* Application: Forward trigger values to the MyAvatar's PalmData
* SkeletonModel: Pass PalmData to Rig via updateRigFromHandData() this is more explicit then
the Rig::inverseKinematics methods.
* AnimNodeLoader & AnimOverlay: add support for LeftHand and RightHand bone sets
* Rig::updateRigFromHandData() read the triggers and set stateMachine trigger vars
* avatar.json - udpated with new hand state machine with temporary animations
2015-09-14 18:54:12 -07:00
Andrew Meadows
75ec142827
fix animation-tests
2015-09-14 16:42:57 -07:00
Seth Alves
61c9da1d27
minimize diff
2015-09-12 10:43:20 -07:00
Seth Alves
49ee251238
quiet compiler
2015-09-12 09:59:25 -07:00
Anthony J. Thibault
7996a02bd8
Added head target to AnimGraph IK node.
...
* In HMD mode head orientation and position is set.
* When not in HMD only orientation is set, position should
default to the underlying pose position.
2015-09-11 09:48:48 -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
