Andrzej Kapolka
2a50b5451f
Script commands to start/stop animations by role.
2014-05-22 16:41:51 -07:00
Andrzej Kapolka
8458477b9f
Fixed a compile warning, provide means to start/stop animations.
2014-05-22 16:15:34 -07:00
Andrzej Kapolka
083543419d
More priority bits.
2014-05-22 15:00:36 -07:00
Andrzej Kapolka
d4af39a9f5
Working on handling animation priorities to prevent Hydra move/restore from
...
interfering with scripted animations.
2014-05-22 14:41:46 -07:00
Andrzej Kapolka
e81e6f3cb2
Merge branch 'master' of https://github.com/highfidelity/hifi into animenu
2014-05-21 18:00:57 -07:00
barnold1953
5b366fe714
Merge branch 'master' of https://github.com/highfidelity/hifi
...
Conflicts:
interface/src/Application.cpp
2014-05-21 16:01:28 -07:00
Andrzej Kapolka
de7c05cb2d
More animation controls.
2014-05-21 15:30:50 -07:00
Andrzej Kapolka
709a9d75f6
Provide an option for the masked joints in the scriptable method, fix a couple
...
of annoying warnings.
2014-05-21 12:03:47 -07:00
Andrzej Kapolka
0e15c82e49
Allow setting masked joints for each animation.
2014-05-21 11:58:20 -07:00
barnold1953
b5ad295756
Fixed improper coding style in previous pull request
2014-05-21 11:24:39 -07:00
Andrzej Kapolka
6797d1ad81
Merge branch 'master' of https://github.com/highfidelity/hifi into animenu
2014-05-21 11:02:05 -07:00
Andrzej Kapolka
0dfd787034
Added some basic method to allow scripts to run/stop animations on the avatar.
2014-05-21 10:44:51 -07:00
Andrzej Kapolka
1022f1bec4
Added a priority setting so that we can control the order in which animations
...
are applied.
2014-05-21 09:40:49 -07:00
barnold1953
742543317c
Stopped magnifying FOV when wearing Oculus.
2014-05-21 09:12:28 -07:00
Andrzej Kapolka
49a0645677
Animation bits.
2014-05-20 15:23:15 -07:00
Andrzej Kapolka
62e7a31602
More work on animation configuration.
2014-05-19 18:09:33 -07:00
Andrzej Kapolka
5da656e3f5
Working on animation dialog.
2014-05-19 16:55:33 -07:00
Philip Rosedale
074a6b7f38
Merge pull request #2861 from birarda/master
...
send an updated address to data-server with domain (when changed)
2014-05-15 14:01:39 -07:00
Stephen Birarda
8e9defad3e
send an updated address to data-server with domain (when changed)
2014-05-15 12:18:24 -07:00
Andrzej Kapolka
f28ba72f75
When PrioVR is connected but head rotation is unavailable, use Faceshift
...
rotation.
2014-05-15 11:37:58 -07:00
Andrzej Kapolka
95c05a720d
Tabs -> spaces.
2014-05-14 13:48:03 -07:00
Andrzej Kapolka
cf230d1cc3
PrioVR tweaks.
2014-05-14 13:36:26 -07:00
Andrzej Kapolka
498f9e73ac
Merge branch 'master' of https://github.com/highfidelity/hifi into priority
...
Conflicts:
interface/src/avatar/SkeletonModel.cpp
2014-05-14 10:23:44 -07:00
Kai Ludwig
b01b144854
No more hand movement when clicking with the mouse.
2014-05-14 07:36:27 +02:00
Andrzej Kapolka
eceb600de7
More work on PrioVR integration.
2014-05-13 14:44:24 -07:00
Andrzej Kapolka
0321821b55
More work on PrioVR integration.
2014-05-13 11:38:24 -07:00
Andrzej Kapolka
8541df9c32
Remember attachment parameters per joint (as well as the last joint used) so
...
that the gun script correctly allows both guns' positions to be tweaked.
2014-05-12 12:16:30 -07:00
Andrzej Kapolka
47268fef32
Fixed kooky conditional.
2014-05-12 11:06:14 -07:00
Andrzej Kapolka
0474375a39
Don't render head attachments in first person mode.
2014-05-09 15:13:58 -07:00
Andrew Meadows
217080fe1d
cleanup - remove unused leap fingers
2014-05-09 10:27:01 -07:00
Philip Rosedale
8c5a1c7bc8
Merge pull request #2822 from ey6es/master
...
Save attachment data for skeleton/attachment combinations so that they persist even when the attachment isn't present, and users can tweak script-attached models.
2014-05-08 19:42:57 -07:00
Philip Rosedale
14bab0adbc
Merge pull request #2821 from AndrewMeadows/inertia
...
avatar walks up ledges
2014-05-08 19:40:09 -07:00
Andrzej Kapolka
c424f6ce69
Save attachment data for attachment model/skeleton model combinations, let
...
scripts use those saved parameters so that you can tweak the location of
(for example) the gun and have it saved appropriately.
2014-05-08 18:00:41 -07:00
Andrew Meadows
d725be37d0
merge upstream/master into andrew/inertia
2014-05-08 17:11:55 -07:00
Andrew Meadows
f019e2366e
Add lift for walking up stairs
...
Also some fixes for freeing avatars trapped in voxel collisions
2014-05-08 17:10:02 -07:00
Andrzej Kapolka
acab09b89a
Update billboard when attachments change.
2014-05-08 16:23:15 -07:00
Philip Rosedale
2c6c57eec2
increase hand restoration rate, improve function name clarity
2014-05-08 00:28:02 -07:00
Philip Rosedale
2797d0ab3b
removed hand trying to follow mouse and other cruft
2014-05-08 00:09:07 -07:00
Philip Rosedale
e439694d72
reset only pitch and roll on spacebar so that you don’t turn away from someone
2014-05-07 22:56:06 -07:00
Philip Rosedale
538e785208
Merge pull request #2815 from ZappoMan/modelserver
...
More Model Improvements & some other tweaks
2014-05-07 20:59:04 -07:00
Philip Rosedale
c6b4b7c250
Merge pull request #2811 from AndrewMeadows/inertia
...
prevent avatar from getting trapped in voxel collisions
2014-05-07 16:54:28 -07:00
Andrew Meadows
a11b996a51
cleaner way to achieve the last commit
2014-05-07 16:00:39 -07:00
Andrew Meadows
2d3592e367
avoid resolving penetration twice
2014-05-07 15:58:00 -07:00
Andrew Meadows
b92bbafc26
prevent avatar from getting trapped in voxels
2014-05-07 15:21:12 -07:00
ZappoMan
37ca6efc7c
correctly handle SHADOW_RENDER_MODE in a bunch of places that were drawing shadows when they shouldn't
2014-05-07 11:48:32 -07:00
Andrew Meadows
80ed8e7cf0
disable environment gravity when not set in menu
2014-05-06 14:56:16 -07:00
Andrew Meadows
68b0e91630
gravity disabled by default
2014-05-06 11:09:13 -07:00
Andrew Meadows
8a630a148e
fix copy-n-paste typo
2014-05-06 11:03:51 -07:00
Andrew Meadows
2d0e4fb94f
use START_LOCATION as default settings
2014-05-06 10:55:30 -07:00
Andrew Meadows
d1a262bb56
maintenance: replace implicit casts with explicit
2014-05-06 10:02:41 -07:00
