Ryan Huffman
af3b2a9d0f
Update LocationManager::goTo to use new addresses API
...
The new API address is now used for goTo when # or @ isn't present
Fixed the multiple locations popup to show when multiple locations are
found
2014-06-16 10:43:13 -07:00
Andrew Meadows
7807388b08
merge upstream/master into andrew/inertia
...
Conflicts:
interface/src/renderer/Model.cpp
2014-06-04 14:28:23 -07:00
Andrzej Kapolka
74afcf5626
Allow floating point start/end frames and negative play speeds.
2014-06-04 11:47:53 -07:00
Andrew Meadows
14e782e439
remove some JointState::getHybridTransform() calls
2014-06-04 10:42:04 -07:00
Andrzej Kapolka
b93b009cd8
Merge pull request #2953 from PhilipRosedale/master
...
Fixes having large yaw movements get head and body out of alignment with oculus
2014-05-29 19:00:37 -07:00
ZappoMan
ac22cebde1
more performance stats debugging
2014-05-29 17:41:40 -07:00
Philip Rosedale
d17eeaf35b
remove old oculus yaw offset, expand limit on head yaw
2014-05-29 16:50:13 -07:00
Andrew Meadows
afc7660d74
merge upstream/master into andrew/inertia
2014-05-27 14:57:44 -07:00
Andrew Meadows
f7b8c4f0a0
remove unused Head::_gravity data memeber
2014-05-27 14:50:17 -07:00
Andrzej Kapolka
edaa251e5f
Provide option to disable avatar shadowing.
2014-05-27 11:43:34 -07:00
Andrew Meadows
51850076e4
more correct detection of floor surfaces
2014-05-26 16:24:47 -07:00
Andrew Meadows
8d660c76cc
merge upstream/master into andrew/inertia
2014-05-23 16:00:55 -07:00
Andrew Meadows
d425b5b322
Enable local gravity when there is a floor nearby.
2014-05-23 15:59:27 -07:00
Andrew Meadows
b875144e2d
Don't repeat check for non-zero collision groups
2014-05-23 09:55:45 -07:00
Andrew Meadows
08b525ef91
prevent walking avatar from bouncing on floor
2014-05-22 17:54:32 -07:00
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
