Commit graph

14394 commits

Author SHA1 Message Date
Seth Alves
a78f2a9577 have avatar make use of SpatiallyNestable 2015-10-18 09:48:46 -07:00
Seth Alves
275e77d29e remove old-style avatar referentials 2015-10-18 07:51:00 -07:00
Brad Hefta-Gaub
88a66d3c52 Merge pull request #6088 from hyperlogic/tony/regen-english-translation-strings
Updated english translation file
2015-10-16 10:59:26 -07:00
Seth Alves
b18bb1e076 Merge pull request #6084 from AndrewMeadows/physics-cleanup
move DIRTY_FLAGS out of EntityItem namespace
2015-10-16 07:22:40 -07:00
Stephen Birarda
e5825daa57 Merge pull request #6090 from ZappoMan/fixStat
Add some additional stats for debugging edit lags
2015-10-15 16:00:29 -07:00
Ryan Huffman
421e2a6c21 Merge pull request #6078 from imgntn/top_tool_tabs
Move  Edit.js Tool Window Tabs to the Top
2015-10-15 15:40:42 -07:00
James B. Pollack
aee11d4c06 cleanup merge 2015-10-15 15:05:34 -07:00
James B. Pollack
112007e5a9 cleanup 2015-10-15 14:58:05 -07:00
James B. Pollack
8b57b3c0ff fix memory leak 2015-10-15 14:13:07 -07:00
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
Brad Hefta-Gaub
923e1ed208 add more processing stats 2015-10-15 12:21:36 -07:00
Anthony J. Thibault
605da499c8 Updated english translation file
Generated using the following command:

    ~/code/hifi > lupdate interface -ts interface/i18n/interface_en.ts
    Scanning directory 'interface'...
    Updating 'interface/i18n/interface_en.ts'...
        Found 146 source text(s) (130 new and 16 already existing)
        Kept 28 obsolete entries

NOTE: this translation file is far from complete, many menu strings from Menu.h do not show up in this list.
2015-10-15 11:15:06 -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
Andrew Meadows
fa17b77d70 move DIRTY_FLAGS out of EntityItem namespace 2015-10-15 09:34:09 -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
James B. Pollack
c8b6fed0e0 Update ToolWindow.cpp 2015-10-14 21:18:17 -07:00
James B. Pollack
84973c590d Update ToolWindow.h 2015-10-14 21:17:19 -07:00
James B. Pollack
c18aeef6b3 remove redundant call 2015-10-14 17:29:38 -07:00
James B. Pollack
a1e2292e62 remove title bar from docked tool widgets 2015-10-14 17:27:45 -07: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
James B. Pollack
536351e9d5 move set tab position to constructor 2015-10-14 15:10:04 -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
James B. Pollack
d45f48c8cd fixbug 2015-10-14 13:55:04 -07:00
James B. Pollack
815b263954 convert tabs to spaces 2015-10-14 13:26: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
James Pollack
7a8db803eb move toolwindow tabs to the top 2015-10-14 19:35:37 +01: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