Andrew Meadows
3d17c57910
Merge pull request #6083 from sethalves/groundwork-for-hold-action-changes
...
Groundwork for hold action changes
2015-10-15 13:30:02 -07:00
James B. Pollack
e63ed5cf84
Merge pull request #6087 from thoys/20708
...
CR for Job #20708 - Script Editor Improvements
2015-10-15 12:28:32 -07:00
Seth Alves
64c5cde2d2
further unmangle branch split
2015-10-15 10:33:58 -07:00
Seth Alves
a78728c96b
further unmangle branch split
2015-10-15 10:29:25 -07:00
Seth Alves
8195145dc7
further unmangle branch split
2015-10-15 10:13:00 -07:00
Seth Alves
d833fb08d7
further unmangle branch split
2015-10-15 10:03:32 -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
Seth Alves
c96f7562f2
Merge branch 'master' of github.com:highfidelity/hifi into groundwork-for-hold-action-changes
2015-10-15 09:28:57 -07:00
Seth Alves
7ef5fc9613
remove line that leaked over from other branch
2015-10-15 09:19:47 -07:00
Seth Alves
9f40c7bf8c
fix up AvatarActionHold
2015-10-15 09:13:06 -07:00
Seth Alves
5ebefadda1
remove some debugging
2015-10-15 09:07:35 -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
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
Seth Alves
21519c6418
debugging
2015-10-14 14:13:08 -07:00
Seth Alves
5ce39b74fd
debugging
2015-10-14 13:58:19 -07:00
Thijs Wenker
7df5ba01e6
JSConsole:
...
executeCommand works async now
2015-10-14 22:21:51 +02:00
Seth Alves
9937b6a3ef
quiet some debugging
2015-10-14 13:12:11 -07:00
Seth Alves
d72152da87
more locking
2015-10-14 13:01:56 -07:00
Seth Alves
07a4dc3a7f
more lock fixing
2015-10-14 12:49:06 -07:00
Thijs Wenker
9d2ae661e1
removed some XML from start-script button which possible caused an error before
2015-10-14 21:10:52 +02:00
Thijs Wenker
c585647f10
ScriptEditor Improvements:
...
- fixed run icon
2015-10-14 21:00:50 +02:00
Seth Alves
fa2bf2b2d9
tighten up locking in actions
2015-10-14 11:43:03 -07:00
Thijs Wenker
96b6067d88
ScriptEditor Improvements:
...
- Script restart works proper again
- Fixed on and off icon switch
- Replaced regular script output box with fully functional JSConsole!
2015-10-14 20:37:47 +02:00
Thijs Wenker
880d34d483
JSConsole improvements
...
- ability to set Script Engine
- clear function for clearing the output
- only show evaluation output for executeCommand, print() and error output is still being printed
2015-10-14 20:35:15 +02:00
Seth Alves
698a4001a8
Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes
2015-10-14 06:18:02 -07:00
Seth Alves
742cc0f511
rename a function
2015-10-14 06:17:55 -07:00
Thijs Wenker
660bf6b3ea
ScriptEditor: single quotes support and spelling fix
2015-10-14 14:47:29 +02: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
Seth Alves
4402242c3c
allow an action to suppress sending of physics related edits to the entity-server
2015-10-13 16:27:40 -07:00
Brad Hefta-Gaub
8a2e23cae4
CR feedback
2015-10-13 16:20:52 -07:00
Seth Alves
2ecb7e8d29
fix bug that was making action deletes fail
2015-10-13 16:19:12 -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
Seth Alves
4fa85441b8
tweak
2015-10-13 15:14:34 -07:00
Brad Hefta-Gaub
ad96d76921
implement comfort mode hack
2015-10-13 15:06:11 -07:00
Seth Alves
257e3845de
get action type correct
2015-10-13 14:45:20 -07:00
Seth Alves
fcbb107bc0
tweak
2015-10-13 14:13:53 -07:00
Seth Alves
8b72f6e7c6
tweak
2015-10-13 13:50:43 -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
Seth Alves
7c52849740
change how hold action works
2015-10-13 11:36:58 -07:00
Stephen Birarda
65976f7891
add saving of entity file to ATPAssetMigrator
2015-10-13 10:51:57 -07:00
