ericrius1
55c68e0509
Merge branch 'master' into whiteboard
2015-10-15 10:08: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
Howard Stearns
2b32b23299
Merge pull request #6052 from thoys/JS_Rotation_FIX
...
Fix avatar joint rotations / translations to be set by script
2015-10-15 07:09:02 -07:00
Thijs Wenker
c99573ea64
Fixed support for calling setJointMumblers with joint name. Walk.js runs smooth now!
2015-10-15 15:35:35 +02: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
ericrius1
87439a049e
Made color indicator thinner
2015-10-14 17:22:46 -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
ericrius1
5082ac4583
Added color status bar
2015-10-14 16:46:23 -07:00
ericrius1
4c709cba35
Fixed color indicator position
2015-10-14 16:17:57 -07:00
ericrius1
cfca0fe8c0
Adding a color indicator to whiteboard
2015-10-14 15:58:18 -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
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
ericrius1
db5f7cac8d
Fixed name of whiteboard entity script URL
2015-10-14 12:03:10 -07: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
ericrius1
6cd9bf407f
Reverted handControllerGrab
2015-10-14 11:40:06 -07: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
Anthony J. Thibault
1c1221597d
Merge branch 'master' into tony/turn-hips-while-moving
2015-10-13 18:38:27 -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
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
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
Andrew Meadows
a331edcee9
Merge pull request #6073 from ZappoMan/comfortModeHack
...
implement comfort mode hack
2015-10-13 16:47:45 -07:00
Stephen Birarda
d22c602041
use categorized logging in ATPAssetMigrator
2015-10-13 16:44:13 -07:00
ericrius1
e42bbbc10d
Adding erase board feature to whiteboard
2015-10-13 16:41:05 -07:00
Stephen Birarda
cc93767077
remove some extra spaces
2015-10-13 16:38:00 -07:00
Stephen Birarda
76bfc6218a
add back block removed in merge
2015-10-13 16:36:10 -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
ericrius1
2c8b85bb5c
Displaying overlay laser pointer, user must past threshold to paint
2015-10-13 16:13:24 -07:00
Stephen Birarda
fc82ea8541
resolve conflicts on merge with upstream/master
2015-10-13 16:12:54 -07:00
Stephen Birarda
c328941b9d
Merge pull request #6074 from huffman/fix-empty-hash
...
Fix crash when atp url is empty
2015-10-13 16:02:28 -07:00
ericrius1
4c877e8204
Changing color when grabbing colored boxes
2015-10-13 15:46:10 -07:00
ericrius1
b54b488b9e
Adding in color selecting
2015-10-13 15:23:02 -07:00
Stephen Birarda
549043f255
add an option to bulk upload assets in ATPAssetMigrator
2015-10-13 15:20:37 -07:00
Ryan Huffman
c468cabe7e
Fix crash when atp url is empty
2015-10-13 15:12:01 -07:00
Brad Hefta-Gaub
ad96d76921
implement comfort mode hack
2015-10-13 15:06:11 -07:00
ericrius1
a3f948acf8
Adding entity script to each color box
2015-10-13 15:00:38 -07:00
ericrius1
ad61b89abd
setting up colors, adding some functions to utils.js
2015-10-13 14:16:28 -07:00
