Brad Davis
80c962a4cc
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-15 12:27:53 -07:00
Andrew Meadows
2ae62de84e
Merge pull request #6026 from birarda/qt-polling-env
...
set bearer poll timeout env for wlan scan in Qt 5.5
2015-10-15 09:58:32 -07:00
Thijs Wenker
8111432088
Merge branch 'master' of https://github.com/worklist/hifi into JS_Rotation_FIX
2015-10-15 14:50:20 +02:00
Clément Brisset
efd106e68c
Merge pull request #6075 from birarda/default-asset-server
...
add a migrator to move assets to ATP
2015-10-14 17:02:10 -07:00
Brad Davis
e39219c2b5
Fixes and PR comments
2015-10-14 16:51:52 -07:00
Brad Davis
0063f9ae1d
Merging old and new controller interfaces
2015-10-14 15:16:54 -07:00
Anthony J. Thibault
3e7a6fd490
Change to boom offset for 3rd person HMD camera.
...
Previously the boom offset was computed in HMD sensor space instead of
world space, so it did not play well with the vive, or the oculus
if you weren't facing the camera directly.
Now it is computed in world space, and is always behind the character's
position/orientation. This can cause the boom to swing if the character
rotation changes but now the avatar rotation in HMD uses comfort mode.
It's not that disorienting.
2015-10-14 14:43:59 -07:00
Brad Davis
f051a84dc6
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-14 10:54:32 -07:00
Brad Davis
0c31fb1b1b
Merge pull request #6069 from ZappoMan/controllers
...
Hack in NewControllers into the JS layer of interface to allow testing
2015-10-13 19:08:26 -07:00
Anthony J. Thibault
1c1221597d
Merge branch 'master' into tony/turn-hips-while-moving
2015-10-13 18:38:27 -07:00
Anthony J. Thibault
e484a904a2
Rotate the avatar to align with the HMD while moving
...
MyAvatar: refactored updateFromHMDSensorMatrix() a bit by splitting it into several methods, because
it was getting quite large and becoming hard to follow.
* beginStraighteningLean() - can be called when we would like to trigger a re-centering action.
* shouldBeginStraighteningLean() - contains some of the logic to decide if we should begin a re-centering action.
for now it encapulates the capsule check.
* processStraighteningLean() - performs the actual re-centering calculation.
New code was added to MyAvatar::updateFromHMDSensorMatrix() to trigger re-centering when the avatar speed rises
over a threshold.
Secondly the Rig::computeMotionAnimationState() state machine for animGraph added a state change hysteresis
of 100ms. This hysteresis should help smooth over two issues.
1) When the delta position is 0, because the physics timestep was not evaluated.
2) During re-centering due to desired motion, the avatar velocity can fluctuate causing undesired animation state fluctuation.
2015-10-13 17:36:00 -07:00
Andrew Meadows
073b019458
Merge pull request #6072 from howard-stearns/skip-some-reload-recenter-on-startup
...
Don't reload/recenter some avatar data on startup
2015-10-13 17:08:00 -07:00
Stephen Birarda
d84994d8e0
fix casing for ubuntu include failure
2015-10-13 17:04:45 -07:00
Stephen Birarda
2caa7f6d64
change getUrl to getATPUrl, use in ATPAssetMigrator
2015-10-13 16:56:20 -07:00
Stephen Birarda
574089530a
make sure request is not nullptr before using it
2015-10-13 16:49:12 -07:00
Stephen Birarda
d22c602041
use categorized logging in ATPAssetMigrator
2015-10-13 16:44:13 -07:00
Stephen Birarda
cc93767077
remove some extra spaces
2015-10-13 16:38:00 -07:00
Brad Hefta-Gaub
8a2e23cae4
CR feedback
2015-10-13 16:20:52 -07:00
Stephen Birarda
1450305390
fix ATP url scheme constant
2015-10-13 16:13:47 -07:00
Stephen Birarda
fc82ea8541
resolve conflicts on merge with upstream/master
2015-10-13 16:12:54 -07:00
Stephen Birarda
549043f255
add an option to bulk upload assets in ATPAssetMigrator
2015-10-13 15:20:37 -07:00
Brad Hefta-Gaub
ad96d76921
implement comfort mode hack
2015-10-13 15:06:11 -07:00
Brad Davis
910629c287
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-13 13:32:05 -07:00
Howard Stearns
93e908a592
Don't reload/recenter some avatar data on startup, when we don't necessarilly have all the required data initialized.
2015-10-13 12:15:13 -07:00
Stephen Birarda
65976f7891
add saving of entity file to ATPAssetMigrator
2015-10-13 10:51:57 -07:00
Stephen Birarda
cf74cfb50e
add an ATPAssetMigrator for bulk ATP migration
2015-10-13 10:38:52 -07:00
James B. Pollack
8d9bcbd793
Merge pull request #6067 from hyperlogic/tony/remove-middle-mouse-overlay-toggle
...
Remove overlay hiding from middle mouse button.
2015-10-13 10:14:15 -07:00
Brad Hefta-Gaub
8e8ba15aaa
Merge pull request #6065 from sethalves/reorder-sims
...
grab changes
2015-10-13 08:35:38 -07:00
Andrew Meadows
25685f97eb
Merge pull request #6062 from howard-stearns/fix-startup-position-failure
...
fix-startup-position-failure
2015-10-13 08:34:33 -07:00
Ryan Huffman
9a9bdbbc44
hack in mappings to interface
2015-10-12 17:59:58 -07:00
Anthony J. Thibault
6a8ff676ed
Remove overlay hiding from middle mouse button.
...
Because it conflicts with edit.js camera panning.
You can still toggle the overlay via the O key.
2015-10-12 17:33:27 -07:00
Howard Stearns
e8b074c85c
Merge pull request #6031 from AndrewMeadows/ik-moves-hips
...
IK moves hips
2015-10-12 17:03:33 -07:00
Seth Alves
ed9907ce66
do avatar simulation before physics simulation so that physics actions can update based on avatar
2015-10-12 16:23:12 -07:00
Howard Stearns
6cbeb6e7c3
Fix my bug, introduced in PR#6012, in which startup position goto got
...
cancelled out.
2015-10-12 15:40:16 -07:00
Atlante45
cfba5752ce
Change checkbox text
2015-10-12 15:03:37 -07:00
Atlante45
51acf07c15
Factor couple methods in AssetUtils
2015-10-12 15:03:37 -07:00
Atlante45
eea89ba010
CR - Rename method
2015-10-12 14:26:28 -07:00
Andrew Meadows
22786dea7d
cleanup
2015-10-12 13:35:26 -07:00
Atlante45
7b41efcf86
All file types eligible for upload to asset server
2015-10-12 13:35:21 -07:00
Andrew Meadows
e1a5afcff3
re-enable avatar position update when moving HMD
2015-10-12 11:42:03 -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
Brad Davis
f77878ee79
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-12 11:05:28 -07:00
Thijs Wenker
309b381bab
Merge branch 'master' of https://github.com/worklist/hifi into JS_Rotation_FIX
2015-10-12 18:51:18 +02:00
Brad Hefta-Gaub
f8956a853b
Merge pull request #6051 from jherico/marge
...
Cleanup CMake files
2015-10-11 16:22:56 -07:00
Brad Davis
d29c7ef267
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-11 16:12:51 -07:00
Brad Hefta-Gaub
0986f86c34
implement StandardController and expose it to JS as Controller.Standard.*
2015-10-11 14:55:07 -07:00
Thijs Wenker
7d3b300037
Fix set avatar rotations from scripts (different tread)
2015-10-11 14:51:12 +02:00
Brad Davis
6f5f6450df
Cleanup CMake files
2015-10-11 00:01:03 -07:00
Brad Davis
52c65b917f
Merge remote-tracking branch 'upstream/master' into controllers
2015-10-10 12:48:49 -07:00
