Commit graph

33497 commits

Author SHA1 Message Date
ericrius1
cfca0fe8c0 Adding a color indicator to whiteboard 2015-10-14 15:58:18 -07:00
James B. Pollack
536351e9d5 move set tab position to constructor 2015-10-14 15:10:04 -07:00
Andrew Meadows
982476d02b Merge pull request #6076 from hyperlogic/tony/turn-hips-while-moving
Rotate the avatar to align with the HMD while moving
2015-10-14 15:09:39 -07:00
samcake
4554d65230 Merge pull request #6077 from ZappoMan/monoOculusPreview
basic mono preview for the oculus display plugin
2015-10-14 15:07:46 -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
Seth Alves
9a2aa9a337 locking 2015-10-14 13:40:20 -07:00
James B. Pollack
815b263954 convert tabs to spaces 2015-10-14 13:26:19 -07:00
Eric Levin
0b92bc11f6 fixed spacing 2015-10-14 13:26:10 -07:00
ericrius1
eb7b720945 got rid of whitespace 2015-10-14 13:24:22 -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
ericrius1
db5f7cac8d Fixed name of whiteboard entity script URL 2015-10-14 12:03:10 -07:00
Thijs Wenker
c585647f10 ScriptEditor Improvements:
- fixed run icon
2015-10-14 21:00:50 +02:00
ericrius1
c63ef10c67 got rid of query string 2015-10-14 11:50:35 -07:00
ericrius1
0991be3255 got rid of printing statements 2015-10-14 11:44:47 -07:00
ericrius1
22615dae07 Don't delete board on script close 2015-10-14 11:43:05 -07:00
Seth Alves
fa2bf2b2d9 tighten up locking in actions 2015-10-14 11:43:03 -07:00
ericrius1
6cd9bf407f Reverted handControllerGrab 2015-10-14 11:40:06 -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
ericrius1
7fb6b7e272 Reverted hand controller 2015-10-14 11:31:09 -07:00
ericrius1
d072a2efd3 laser pointer now showing up all the time 2015-10-14 11:26:38 -07:00
ericrius1
1a9c1110c0 Fixed gap between strokes 2015-10-14 11:17:54 -07:00
ericrius1
20d1a2440c Ignoring unknown types in collision 2015-10-14 11:15:49 -07:00
ericrius1
caacbcbe78 Adjust erase box position 2015-10-14 10:40:55 -07:00
Seth Alves
9a9e5b962e make edit logging terse vs not a domain-server setting 2015-10-14 09:45:35 -07:00
Seth Alves
77bb11675d terse entity-edit logging 2015-10-14 09:31:44 -07:00
Seth Alves
2a9b1c0fc3 fix refresh of hold action 2015-10-14 09:31:29 -07: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
Thijs Wenker
c9312803bd Merge branch 'master' of https://github.com/worklist/hifi 2015-10-14 14:12:42 +02:00
Anthony J. Thibault
1c1221597d Merge branch 'master' into tony/turn-hips-while-moving 2015-10-13 18:38:27 -07:00
Seth Alves
f61a005ebc cleanups 2015-10-13 17:47:41 -07:00
Brad Hefta-Gaub
c4af4c7b10 basic mono preview for the oculus display plugin 2015-10-13 17:45:29 -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
Seth Alves
74ced250c1 don't compress joint rotations 2015-10-13 17:18:28 -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
Seth Alves
644076214e fix hang 2015-10-13 16:55:04 -07:00
ericrius1
8e21999e44 erasing board 2015-10-13 16:54:37 -07:00
Stephen Birarda
574089530a make sure request is not nullptr before using it 2015-10-13 16:49:12 -07:00