Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 18:11:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
37352 commits 25 branches 0 tags 1.1 GiB
Commit graph

733 commits

Author SHA1 Message Date
Anthony J. Thibault
55adedcec8 Merge branch 'master' into tony/remove-joint-states 2015-11-16 11:22:44 -08:00
Seth Alves
715a46ee82 show actions in status icons 2015-11-11 16:35:04 -08:00
Anthony J. Thibault
56e96ed24c Merge branch 'master' into tony/script-start-stop-anim 2015-11-11 11:33:24 -08:00
Seth Alves
b38c1cb30f add icons 2015-11-11 08:01:21 -08:00
Anthony J. Thibault
a0f21228f6 AnimGraph support for start and stop animation from JavaScript 
Follows the same model as the existing startAnimation and stopAnimation calls.
See kneel.js for an example.
 2015-11-09 12:19:01 -08:00
samcake
b1d5a36dc6 removing useless differences 2015-11-06 16:40:46 -08:00
samcake
bc852d8eab removing useless differences 2015-11-06 16:39:23 -08:00
samcake
5fb2c3ccd1 resolve merge conflict 2015-11-06 16:27:47 -08:00
AlessandroSigna
6d3a79af83 changed the behaviour of Standard.LY input 2015-11-06 12:46:08 -08:00
samcake
2f9c33dbfb Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-06 09:35:48 -08:00
Howard Stearns
aef8b7639d Merge branch 'master' of https://github.com/highfidelity/hifi into away 2015-11-05 11:58:08 -08:00
samcake
bc5e0b7b96 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-05 09:57:11 -08:00
samcake
00797b4dea Merge pull request #6314 from jherico/homer 
Fixing step yaw to move by consistent amounts, be 'tappable'
 2015-11-04 23:33:45 -08:00
Brad Davis
86b852231e Merge pull request #6286 from EdgarPironti/master 
Spacemouse migration
 2015-11-04 19:15:35 -08:00
samcake
f4c610a0f4 Tuning the standard mapping for tbringin vertical axis 2015-11-04 18:21:04 -08:00
Brad Davis
20d1035821 Fixing step yaw to move by consistent amounts, be 'tappable' 2015-11-04 15:54:50 -08:00
samcake
d4259931b2 Setting the step yaw to 22.5 degrees 2015-11-04 10:57:39 -08:00
samcake
ce5e89ce66 removing the pulsing mechanism in MyAvatar and making a new stadnard.json mapping file 2015-11-04 10:53:53 -08:00
Howard Stearns
7b9245022c Merge branch 'away' of https://github.com/howard-stearns/hifi into away 2015-11-04 10:46:16 -08:00
EdgarPironti
ade0862948 Spacemouse fixes 2015-11-04 00:49:40 -08:00
EdgarPironti
1ab683643c Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-04 00:36:38 -08:00
EdgarPironti
7adf38f781 Spacemouse migration 2015-11-03 18:22:55 -08:00
Howard Stearns
4a54f2052e Merge branch 'master' of https://github.com/highfidelity/hifi into away 2015-11-03 17:42:38 -08:00
samcake
4d62c532f5 Removing dead config files 2015-11-03 15:35:13 -08:00
howard-stearns
a7162eefbe Add alphaVar for ik. 2015-11-03 13:10:25 -08:00
EdgarPironti
d99838de9c Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-03 12:25:19 -08:00
samcake
78e3f8ebbc Merge pull request #6281 from AlessandroSigna/master 
Vive - fix input drifting
 2015-11-03 10:19:59 -08:00
EdgarPironti
5d695da630 Do not merge - Spacemouse 2015-11-02 23:31:10 -08:00
Howard Stearns
b74ed36883 Fix outro start times, and introduce away states (which are not used in C++ code, but are used in script). 2015-11-02 20:39:31 -08:00
AlessandroSigna
b77945d430 Vive - fix input drifting 
Conflicts:
	libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp
 2015-11-02 16:06:17 -08:00
Brad Hefta-Gaub
d359aa3b65 more tweaks 2015-11-02 13:41:16 -08:00
Brad Hefta-Gaub
46bedf7667 more tweaks to hydra mappings 2015-11-02 13:35:49 -08:00
Anthony J. Thibault
2236573a9d Merge branch 'master' into tony/anim-sync-blend 2015-11-02 12:18:11 -08:00
Brad Hefta-Gaub
b00f572e1a add mouseClicked inputs vs mouseButton inputs, make right-click work without right button drag 2015-11-02 09:21:15 -08:00
Anthony J. Thibault
e3e759248f Merge branch 'master' into tony/anim-sync-blend 2015-11-02 08:37:10 -08:00
Brad Hefta-Gaub
70b9aa5ff1 remove right click context menu until we can make it work with camera move better 2015-11-02 07:42:52 -08:00
Brad Hefta-Gaub
e899229cde tweaks to how VrMenu is shown 2015-11-01 09:55:30 -08:00
Brad Hefta-Gaub
77816d818a make RY map to jump 2015-10-31 16:00:22 -07:00
Brad Hefta-Gaub
05dea847be add Actions.CycleCamera and wire up secondary thumb buttons to Actions.CycleCamera and Actions.ContextMenu 2015-10-31 15:47:40 -07:00
Brad Hefta-Gaub
22324eb281 more tweaking of keyboard input routes 2015-10-30 14:55:33 -07:00
Brad Hefta-Gaub
ce7fed2292 fix json 2015-10-30 13:16:31 -07:00
Brad Hefta-Gaub
b2f27054f4 Merge pull request #6239 from AlessandroSigna/controllers 
ViveController - input mapping
 2015-10-30 10:39:26 -07:00
Brad Davis
49e7d42c2c Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-30 10:07:40 -07:00
Brad Hefta-Gaub
70f3156328 make sure CompositeEndpoints properly report readability more axis based keyboard inputs 2015-10-29 22:37:12 -07:00
Brad Hefta-Gaub
8a03383adc use makeAxis for some keyboard support 2015-10-29 22:19:33 -07:00
AlessandroSigna
01d3805148 ViveController - mapping of buttons 2015-10-29 18:44:43 -07:00
Anthony J. Thibault
047614b2eb New left and right grab animations. 2015-10-29 16:18:39 -07:00
Brad Hefta-Gaub
b070306c2c tweak comfort mode filters 2015-10-29 15:53:17 -07:00
Brad Hefta-Gaub
c962697b18 Merge pull request #6230 from samcake/controllers 
Controllers : Comfort mode is working through the stanadrd mapping
 2015-10-29 14:59:42 -07:00
samcake
d73eafddd1 COmfort mode working with the COntroller system observing the menu state 2015-10-29 13:48:16 -07:00
AlessandroSigna
ffd2b39874 Fix vive controller - update to new input plugin register 2015-10-29 13:18:37 -07:00
samcake
8f908f9877 Adding the stepYaw to the Standard mapping 2015-10-29 12:08:11 -07:00
EdgarPironti
596b315286 Fixed standard.json 2015-10-27 11:35:30 -07:00
AlessandroSigna
5bce95189b fix keyboard mapping (keyboardMouse.js) 2015-10-26 18:14:57 -07:00
Brad Davis
f38303a9a5 Adding vive default mapping 2015-10-26 10:36:31 -07:00
Anthony J. Thibault
8689170415 Removed sync and timescale from AnimBlendLinear node. 
AnimBlendLinearMove will now be used instead.
 2015-10-22 16:40:53 -07:00
Anthony J. Thibault
a66f31bb20 Added AnimBlendLinearMove node 
AnimBlendLinearMove is now in use by forward, backward and strafe movements.
Tuned rig moving average speeds to be more sensitive.
 2015-10-22 16:33:31 -07:00
Brad Davis
a9aea9b477 Working on TestController display 2015-10-22 15:53:19 -07:00
Brad Davis
8c163a52e9 Attempting to fix log graphs 2015-10-22 15:49:58 -07:00
samcake
2ebf862da9 Merge pull request #6148 from jherico/controllerFunctions 
Fixing controller functions & makeAxis
 2015-10-22 11:56:58 -07:00
Brad Davis
7ed9ed8500 Merge pull request #6149 from ZappoMan/exposeMyAvatarHandsToJS 
make handControllerGrab.js work with new API
 2015-10-22 11:40:48 -07:00
Brad Hefta-Gaub
67f2a0c6c8 CR feedback on mappings 2015-10-22 11:39:51 -07:00
Brad Davis
5d4cbfdacb Resolving ambiguity between functions and inputs differently 2015-10-22 09:50:24 -07:00
Brad Davis
4938e5ea84 Fixing function based routes, makeAxis 2015-10-22 09:50:23 -07:00
Brad Hefta-Gaub
3e7364608b make handControllerGrab.js work with new API 2015-10-22 09:17:29 -07:00
Brad Davis
afcec347ff Wiring yaw action to avatar 2015-10-21 21:35:19 -07:00
Brad Davis
044a28212d Wiring step yaw to the avatar 2015-10-21 20:44:38 -07:00
Brad Davis
637654adea Wiring up step yaw 2015-10-21 18:46:09 -07:00
Anthony J. Thibault
c83af43d0e Added strafe and backward blending 2015-10-21 17:34:09 -07:00
Brad Davis
4a1df286fd Cleanup of enums and JS names 2015-10-21 15:57:37 -07:00
Brad Davis
b9b03bd842 Working on conditional and filter parsing 2015-10-21 14:40:33 -07:00
Brad Davis
de57c3b4d6 Merge remote-tracking branch 'upstream/controllers' into controllers 
Conflicts:
	libraries/controllers/src/controllers/UserInputMapper.cpp
 2015-10-20 21:59:00 -07:00
samcake
da26d0dee1 Adding the hand poses channels in the controller mapping files 2015-10-20 18:19:44 -07:00
Brad Davis
cd940325c2 Merge remote-tracking branch 'upstream/controllers' into controllers 2015-10-20 17:48:29 -07:00
Brad Davis
0e419e3fbb Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-20 17:47:37 -07:00
Anthony J. Thibault
41cce4320a Merge branch 'tony/anim-sync-blend' into test 2015-10-20 17:39:13 -07:00
Anthony J. Thibault
5cd2786c1d First pass at Rig timeScaling and blending between slow, walk and run. 2015-10-20 16:37:05 -07:00
Brad Davis
eacd6af032 Get conditional routes working 2015-10-20 16:32:00 -07:00
Andrew Meadows
d02fe784a9 css and cfg filetypes are text in .gitattributes 2015-10-20 13:58:44 -07:00
Anthony J. Thibault
11f2d29bf8 AnimBlendLinear: bugfixes for sync flag added timeScale 2015-10-20 10:36:37 -07:00
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
ef6c4f6f66 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:15:36 -07:00
Brad Hefta-Gaub
56f625d376 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-19 16:53:25 -07:00
Anthony J. Thibault
0c36180e2f avatar-animation.json: Adjustment to sidestep endFrame, to prevent stalling at end 2015-10-19 15:49:53 -07:00
Anthony J. Thibault
2b4788929f AnimBlendLinear: Untested implementation of sync flag. 
Move accumulateTime into AnimUtil.
 2015-10-19 15:49:49 -07:00
Brad Hefta-Gaub
110adc5c22 fix model LOD behavior 2015-10-19 15:21:25 -07:00
Brad Davis
22602fb6f6 Fixing line endings 2015-10-19 10:00:16 -07:00
Brad Davis
184303d3c9 Using JS mappings for joystick, updating test code 2015-10-18 20:44:32 -07:00
Brad Davis
734a39f962 Breaking up UserInputMapper, restoring some mappings 2015-10-18 18:58:03 -07:00
Brad Davis
57be59935d Move controller test to app 2015-10-17 19:13:38 -07:00
samcake
f675035fd1 Merge pull request #6101 from jherico/controllers 
Hydra controller updates and test code
 2015-10-16 17:43:44 -07:00
Brad Davis
5bac1aae2d Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-16 17:23:30 -07:00
Brad Davis
db0fa6b8ed Update hydra mappings and test code 2015-10-16 17:23:09 -07:00
Brad Davis
4f8e2c9f6b Fix JSON format errors 2015-10-15 13:18:04 -07:00
Thijs Wenker
9d2ae661e1 removed some XML from start-script button which possible caused an error before 2015-10-14 21:10:52 +02:00
Thijs Wenker
c585647f10 ScriptEditor Improvements: 
- fixed run icon
 2015-10-14 21:00:50 +02:00
Brad Davis
910629c287 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-13 13:32:05 -07:00
Andrew Meadows
22786dea7d cleanup 2015-10-12 13:35:26 -07:00
U-GAPOS\andrew
f01847de14 experimental HMD hips tracking 2015-10-12 11:39:54 -07:00
Andrew Meadows
03eaa95258 initial hip translation from IK 
works for 2D 3rd person but probably not well for HMD
 2015-10-12 11:39:54 -07:00