howard-stearns
1b42c5a172
Make MyAvatar.get/setAnimGraphUrl take a url(!), and make setting it
...
actually do something.
2015-12-03 16:16:01 -08:00
Anthony Thibault
e0ca1c0f4c
Merge pull request #6496 from PhilipRosedale/master
...
Improved audio-driven mouth shapes
2015-12-02 14:20:20 -08:00
Howard Stearns
38182bfd9d
Merge pull request #6523 from hyperlogic/tony/avatar-reset-improvements
...
MyAvatar::reset() improvements
2015-12-02 11:40:46 -08:00
Anthony J. Thibault
0b05a341a8
MyAvatar::reset() improvements
...
Body should not orient under the HMD body without changing the HMD view point.
It's more predictable and less likely to make you sick.
It also should reset the height of the character to cancel out squatting, if the HMD position is low.
2015-12-02 10:18:02 -08:00
Philip Rosedale
be2f14cae5
Review fix
2015-12-01 21:50:01 -08:00
Anthony J. Thibault
99065f10fa
Avatar Warning fixes on linux
2015-12-01 18:12:01 -08:00
James B. Pollack
52d6fdac1a
Merge pull request #6487 from ctrlaltdavid/20740
...
Get the Leap Motion working again
2015-12-01 15:40:48 -08:00
Howard Stearns
455927204e
Merge pull request #6511 from hyperlogic/tony/avatar-sim-rate-display-fix
...
Avatar Sim Rate Display fix
2015-12-01 12:09:07 -08:00
Seth Alves
7f95e1eec6
make sure observed held objects are active in bullet, disable equip spring action
2015-12-01 10:49:07 -08:00
Anthony J. Thibault
71f1be2b38
Avatar Sim Rate Display fix
...
Division by zero on first update was causing the displayed
avatar simulation rate to be incorrect.
2015-12-01 10:46:04 -08:00
Seth Alves
11f18c3ada
also make sure the holder doesn't end up with a static-in-bullet held object
2015-12-01 09:52:51 -08:00
Howard Stearns
6f50d91208
Merge pull request #6461 from hyperlogic/tony/remove-joint-states
...
Refactor of Rig and MyAvatar animation JavaScript interface
2015-11-30 16:28:15 -08:00
Anthony J. Thibault
31cecdc174
Menu: removed Enable Avatar Threading option.
...
To re-enable, you can set ENABLE_AVATAR_UPDATE_THREADING to true on line 2552 of Application.cpp.
Also, removed other unused strings.
2015-11-30 15:45:23 -08:00
Clément Brisset
e168966b87
Merge pull request #6409 from birarda/injector-hybrid
...
more efficient threading of networked AudioInjector objects
2015-11-30 15:36:41 -08:00
Anthony J. Thibault
f922f61c3d
AvatarUpdate: fix for very large dt
...
This was affecting threaded avatar update when enabled.
2015-11-30 15:21:04 -08:00
Anthony J. Thibault
11bfed4185
Merge branch 'master' into tony/remove-joint-states
2015-11-30 11:21:44 -08:00
James B. Pollack
85b8266537
Merge pull request #6494 from ctrlaltdavid/20744
...
Fix menu shortcuts created in JavaScript not working
2015-11-30 11:20:10 -08:00
Andrew Meadows
49a6f63663
remove whitespace and fix warning (unused var)
2015-11-30 10:00:05 -08:00
Philip Rosedale
2377875623
Tabs to spaces v2
2015-11-30 08:05:25 -08:00
Philip Rosedale
ba379e8830
Tabs to spaces
2015-11-30 08:00:12 -08:00
David Rowe
ce100dbbc5
Fix crash in WebWindowClass in debug build setTitle on open WebWindow
2015-11-30 15:10:51 +13:00
David Rowe
866037ec7c
Fix menu shortcut keys set by JavaScript not working
2015-11-30 08:33:38 +13:00
Anthony Thibault
a9e25c51e5
Fix for linker warning LNK4075 on Windows
...
Specifcally, this warning:
LINK : warning LNK4075: ignoring '/INCREMENTAL' due to '/OPT:ICF' specification
The fix is to set /OPT:NOREF and /OPT:NOICF on debug builds.
2015-11-27 20:56:57 -08:00
Philip Rosedale
eccca218f0
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-11-25 20:47:01 -08:00
Philip Rosedale
a40ead077f
Mouth animation improvements
2015-11-25 20:37:51 -08:00
Anthony J. Thibault
549a8f7130
Fix for avatars with no eyes
...
For example:
https://hifi-public.s3.amazonaws.com/ozan/avatars/hifi_team/howard/howard.fst
https://hifi-public.s3.amazonaws.com/ozan/avatars/hifi_team/tony/tony.fst
2015-11-25 17:24:55 -08:00
Anthony J. Thibault
7c9cb97783
Merge branch 'master' into tony/remove-joint-states
2015-11-25 15:48:51 -08:00
Howard Stearns
6c7099a5f7
Coordinate with other uses of setVisibleInScene.
2015-11-25 15:18:32 -08:00
Anthony J. Thibault
23def8d173
Merge branch 'master' into tony/remove-joint-states
2015-11-25 13:55:23 -08:00
Anthony J. Thibault
c0d108e6f6
Better avatar bounding shape debug rendering.
2015-11-25 13:51:08 -08:00
howard-stearns
546f09c0b1
Restore rendering of one's own avatar.
2015-11-25 13:30:54 -08:00
Anthony J. Thibault
868cf83b48
Fix for attachments and MyAvatar::getDefaultEyePosition()
2015-11-25 10:07:29 -08:00
Andrew Meadows
bc20b72645
Merge pull request #6453 from howard-stearns/avatar-render-controller2
...
Survive Flash Mobs Without Making Everyone Sick
2015-11-25 09:52:28 -08:00
Anthony Thibault
527199bc69
Merge pull request #1 from AndrewMeadows/fix-avatar-capsule
...
compute bounding capsule of avatars
2015-11-25 09:39:18 -08:00
Andrew Meadows
3ae082f09c
compute bounding capsule of avatars
2015-11-24 20:28:39 -08:00
Anthony J. Thibault
76034d62d5
Eye tracking fixes
2015-11-24 16:57:26 -08:00
Anthony J. Thibault
f120e10ff4
Merge branch 'master' into tony/remove-joint-states
2015-11-24 15:00:05 -08:00
David Rowe
5ecbaa5b93
Fix InputController (Leap Motion) not being updated
2015-11-25 09:43:55 +13:00
David Rowe
e25d4c17e8
Fix InputController (Leap Motion) not able to be created
2015-11-25 09:29:40 +13:00
Andrew Meadows
5135c9dded
whitespace cleanup
2015-11-24 10:20:19 -08:00
Brad Hefta-Gaub
d32e500464
Merge pull request #6462 from jherico/rec5
...
Blendshapes and attachments in recordings, plus other minor fixes.
2015-11-24 10:01:17 -08:00
Stephen Birarda
ab7cbc0b76
Merge branch 'master' of https://github.com/highfidelity/hifi into injector-hybrid
2015-11-24 10:45:00 -06:00
Brad Davis
5c2b980a45
Fixing avatar facial blendshapes and attachments in recordings
2015-11-23 22:36:07 -08:00
Anthony J. Thibault
14189ac909
Move Y_180 flip rotation out of Rig
...
This Y_180 flip is defined in skeletonModel not in the rig.
This is important if we wish to use the Rig for both Avatars (180 flip) and Entity models (no 180 flip).
We can hide this 180 flip from script, if we wish, by including it in all the accessors to and from
MyAvatar -> skeletalModel -> Rig.
Added Quaternions::Y_180 to GLMHelpers.
2015-11-23 19:31:27 -08:00
James B. Pollack
5ffc1f150d
Merge pull request #6467 from ctrlaltdavid/20742
...
Fix avatar rotation with keyboard depending on frame rate
2015-11-23 18:19:46 -08:00
Brad Hefta-Gaub
82ff0af05c
Merge pull request #6472 from murillodigital/stack-manager
...
Stack manager - integration checkpoint
2015-11-23 16:53:53 -08:00
Stephen Birarda
905e11faa3
use MIN_AVATAR_SCALE to ensure avatar fades complete
2015-11-23 16:54:17 -06:00
Stephen Birarda
0997d3dcae
resolve conflicts on merge with upstream/master
2015-11-23 16:15:15 -06:00
David Rowe
d73e3a5490
Fix avatar pitch rate depending on FPS
2015-11-24 09:48:37 +13:00
David Rowe
f5d66bbf2e
Fix avatar rotation rate depending on FPS
2015-11-24 09:42:12 +13:00
