Anthony J. Thibault
5eeb4ca594
Fix one frame lag controller lag/jitter
...
Move userInputMapper->update() after inputPlugin->pluginUpdate().
2016-03-11 09:28:25 -08:00
Anthony J. Thibault
ab19d3e5a2
Moved animation after physics, hand poses are in world frame.
...
There are still some debug hacks enabled so I can test in the vive room.
2016-03-10 20:44:35 -08:00
Anthony J. Thibault
807d31743c
Removed Hand, HandData & PalmData
...
Instead, we just store two controller::Poses in MyAvatar.
Existing behavior and scripting APIs have been preserved.
The hand controller debug drawing is slightly different, but still works.
2016-03-10 19:33:31 -08:00
Philip Rosedale
e1f91ae8b0
Merge pull request #7311 from hyperlogic/tony/raise-your-hands-in-the-air
...
MyAvatar: Allow user to raise hands directly overhead.
2016-03-10 13:45:15 -08:00
Andrew Meadows
a5e94ec087
Merge pull request #7307 from ctrlaltdavid/update-glyphs
...
Update HiFi glyphs font file
2016-03-10 12:55:32 -08:00
Anthony J. Thibault
4a78300607
MyAvatar: Allow user to raise hands directly overhead.
...
Previously we were using a infinitely tall vertical cylinder
to push hand IK targets out of the body, this had the
side-effect of preventing the hands from being raised over
the head. Now, we collide against the same 3d capsule
used by the physics system for avatar collisions.
2016-03-10 10:20:17 -08:00
Brad Hefta-Gaub
ee727b0632
Merge pull request #7304 from Atlante45/master
...
Fix messed up LogDialog multi-lines
2016-03-10 09:23:35 -08:00
Brad Hefta-Gaub
82ca78b37b
Merge pull request #7300 from sethalves/fix-detach-crash
...
fix removing attachments
2016-03-10 08:23:52 -08:00
David Rowe
4c3f374f02
Update HiFi glyphs font file
...
Has some new, soon to be used characters, but no other changes.
2016-03-10 15:10:44 +13:00
Atlante45
f6e01bbd36
Fix messed up LogDialog multi-lines
2016-03-09 17:31:04 -08:00
Brad Davis
9645ed9120
Update the watchdog heartbeat manually during startup
2016-03-09 17:00:45 -08:00
Howard Stearns
2b576e86f0
Merge pull request #7259 from jherico/crashes
...
Crash fixes
2016-03-09 16:42:36 -08:00
Chris Collins
ddb09ec222
Merge pull request #7285 from hyperlogic/tony/hand-controller-move-improvements
...
Hand controller mouse improvements
2016-03-09 16:34:35 -08:00
Brad Davis
23a89a63d8
Set deadlock thread name
2016-03-09 14:51:19 -08:00
Seth Alves
d95d0f59cb
keep removed attachment models around for one extra call to fixupModelsInScene
2016-03-09 14:36:50 -08:00
Zach Pomerantz
21719b3980
Wait 10m for DEBUG deadlocks
2016-03-09 14:07:36 -08:00
Brad Davis
d428f3b96f
Working on crash bugs
2016-03-09 14:00:05 -08:00
Brad Davis
cac31761c0
Safer shutdown code in deadlock thread
2016-03-09 13:45:01 -08:00
Brad Hefta-Gaub
e038c8a43c
Merge branch 'master' of https://github.com/highfidelity/hifi into bugfixes
2016-03-09 11:47:55 -08:00
Brad Davis
80fdef4348
Ensure the heartbeat has a valid value before the thread starts
2016-03-09 10:53:01 -08:00
Anthony J. Thibault
4691ca1716
Merge branch 'master' into tony/hand-controller-move-improvements
2016-03-09 10:06:28 -08:00
Brad Hefta-Gaub
1c07276501
fix a couple bugs
2016-03-09 09:45:55 -08:00
Brad Hefta-Gaub
5862181e70
Merge pull request #7288 from jherico/watchdog
...
Add a watchdog thread to trigger a crash on detecting a deadlock
2016-03-09 09:18:48 -08:00
Seth Alves
efdef52081
Merge pull request #7269 from ctrlaltdavid/20822
...
Restyle bookmark dialogs
2016-03-09 07:31:15 -08:00
Brad Davis
95f5d82d37
Add a watchdog thread to trigger a crash on detecting a deadlock
2016-03-09 00:32:46 -08:00
Chris Collins
d1401796d8
Merge pull request #7284 from ctrlaltdavid/fix-raleway-semibold
...
Fix case of RalewaySemiBold font name
2016-03-08 21:24:15 -08:00
Brad Hefta-Gaub
cb70c398cd
Merge pull request #7233 from jherico/vive_menu
...
Fix the Vive controllers to support menus
2016-03-08 18:03:32 -08:00
samcake
bfed0304c3
Merge pull request #7218 from zzmp/fix/resort-in-octree
...
Fix item key lookup on updated items in scene
2016-03-08 17:48:51 -08:00
Anthony J. Thibault
deb17e1f93
Merge branch 'master' into tony/hand-controller-move-improvements
2016-03-08 17:45:50 -08:00
David Rowe
973fa28d3f
Fix case of RalewaySemiBold font name
2016-03-09 13:32:37 +13:00
David Rowe
155a084eaa
Temporarily rename file a part of changing case of filename
2016-03-09 13:08:44 +13:00
David Rowe
269936f3ac
Fix typo
2016-03-09 12:20:09 +13:00
Brad Davis
f651adbd24
Correcting vive button naming
2016-03-08 15:12:54 -08:00
Brad Davis
1312901f06
Removing thumb mappings, using start/back for camera and menu
2016-03-08 15:09:45 -08:00
Brad Davis
ac1ab4b5b7
Map the primary thumbs to menu/camera as well as the secondary thumb
2016-03-08 15:09:44 -08:00
David Rowe
edc50f102d
Fix "duplicate bookmark" dialog
2016-03-09 11:55:09 +13:00
Brad Hefta-Gaub
35d6afbe77
Merge branch 'master' of https://github.com/highfidelity/hifi into fixSceneNotStable
2016-03-08 14:53:41 -08:00
Brad Hefta-Gaub
6d211dd4e5
first cut at fixing the scene not stable bug
2016-03-08 14:52:21 -08:00
David Rowe
10e4e5e3a7
Use OffscreenUI icon enum instead of QMessageBox icon enum
2016-03-09 11:33:55 +13:00
David Rowe
03fb6b1444
Add ability to have icons in query dialogs
...
Add icon to bookmark dialogs' titles.
2016-03-09 10:45:14 +13:00
Anthony J. Thibault
e046ba64dd
Properly marshal fakeMouseEvent data from script thread to main thread
2016-03-08 10:58:54 -08:00
Seth Alves
b780fad83f
Merge pull request #7270 from birarda/local-socket-check
...
add a secondary method for local socket check
2016-03-08 10:48:08 -08:00
Brad Hefta-Gaub
19ad4314ca
Merge pull request #7276 from jherico/bookmarks
...
Don't trigger modal dialog from menu handler
2016-03-08 10:29:29 -08:00
Zach Pomerantz
d1324b2e7a
Merge branch 'master' of github.com:highfidelity/hifi into fix/resort-in-octree
2016-03-08 10:22:25 -08:00
Brad Hefta-Gaub
50eb07d465
Merge pull request #7221 from jherico/threaded_compositing2
...
Migrate composition of the overlay and pointer to the present thread
2016-03-08 10:22:02 -08:00
Brad Hefta-Gaub
ed67ef8f14
Merge pull request #7247 from jherico/qml_script_messaging
...
Allow message passing from a script to a QML window
2016-03-08 10:21:09 -08:00
Brad Davis
f08f54fd22
Don't trigger modal dialog from menu handler
2016-03-07 21:48:07 -08:00
James B. Pollack
2e9ebfb178
remove avatar head and body from pacakage model selections
2016-03-07 21:03:11 -08:00
David Rowe
2aaf9ff0d0
Update message dialogs to use HiFi-Glyphs icons
2016-03-08 17:13:05 +13:00
Anthony J. Thibault
3d71226f72
Crash fix for moving reticle via script.
...
sendMessage is not thread-safe, use invokeMethod to call into application thread instead.
2016-03-07 18:33:09 -08:00
