Chris Collins
4ae46c7cd7
Merge pull request #9600 from highfidelity/RC-33
...
Beta Release 33 - Includes up to Developer Release 5990
2017-02-07 10:55:13 -08:00
Andrew Meadows
6d1d36e0f0
fix for bad merge around cauterizedClusterMatrices
2017-02-07 10:22:43 -08:00
Brad Davis
d1fc30435b
Merge remote-tracking branch 'upstream/stable' into RC-33
...
Conflicts:
libraries/render-utils/src/MeshPartPayload.cpp
libraries/render-utils/src/MeshPartPayload.h
scripts/system/controllers/handControllerGrab.js
2017-02-07 09:31:41 -08:00
Seth Alves
725917af0d
send UserActivityLogger events when tablet is opened or closed
2017-02-07 09:12:30 -08:00
Seth Alves
40730c1d19
avoid bootstrapping self with something that has someone else as simulation owner
2017-02-06 17:05:16 -08:00
Seth Alves
f68fcbb9cd
when the parentID is changed by a network update, set physics flags
2017-02-06 17:05:07 -08:00
Seth Alves
0dc7152dcc
if an entity has an avatar parent but ends up in EntityMotionState::setWorldTransform, ignore the update from bullet
2017-02-06 17:04:58 -08:00
Seth Alves
b90d7e2689
another AVATAR_SELF_ID adjustment
2017-02-06 17:04:27 -08:00
Seth Alves
f13fdf2a4c
make findAncestorOfType understand AVATAR_SELF_ID
2017-02-06 17:04:14 -08:00
Seth Alves
933aed4719
don't call stepKinematicMotion on kinematic entities when they are children of avatars
2017-02-06 17:04:04 -08:00
Seth Alves
c0e313830c
make hasAncestorOfType understand AVATAR_SELF_ID
2017-02-06 17:03:53 -08:00
Seth Alves
6b4c800c2e
don't call stepKinematicMotion on kinematic entities
2017-02-06 17:03:42 -08:00
Seth Alves
ec93a663e7
don't send AVATAR_SELF_ID over wire
2017-02-06 17:01:45 -08:00
Chris Collins
bac5bd5c0e
Merge pull request #9595 from hyperlogic/bug-fix/tablet-ui-bugfixes
...
tablet-ui: Bug fixes
2017-02-02 17:53:47 -08:00
Anthony Thibault
3a36410f7c
Merge pull request #9571 from hyperlogic/bug-fix/tablet-ui-no-domain
...
Tablet should work even when not connected to any domain.
2017-02-02 17:49:40 -08:00
Anthony J. Thibault
6bef9e888b
Merge branch 'master' into bug-fix/tablet-ui-no-domain
2017-02-02 17:21:20 -08:00
Seth Alves
f40285c688
Merge pull request #9597 from druiz17/tabletStylus
...
better scrolling and fixed button touching
2017-02-02 16:56:13 -08:00
Anthony Thibault
be4fbb63cf
Merge pull request #9583 from sethalves/fix-post-tablet-edit-buttons
...
fix the edit.js toolbar buttons so they don't vanish when moused-over or clicked
2017-02-02 16:01:56 -08:00
Anthony Thibault
59b33bbc53
Merge pull request #9585 from sethalves/use-local-tablet-model
...
use tablet model from distribution rather than from s3
2017-02-02 16:01:15 -08:00
Seth Alves
998fbfb909
Merge pull request #9596 from sethalves/fix-equip-from-other-pov
...
fix -- don't honor gravity in simple extrapolation on entities equipped by others
2017-02-02 15:49:10 -08:00
David Kelly
72153f6b3e
Merge pull request #9593 from howard-stearns/filter-gets-isAdd-argument
...
filter gets isAdd argument
2017-02-02 16:41:17 -07:00
Seth Alves
9dfaf3026b
Merge pull request #9591 from druiz17/master
...
fixed issue of tablets buliding up when flying fast
2017-02-02 15:21:29 -08:00
Dante Ruiz
0ec8071288
better scrolling and fixed button touching
2017-02-02 23:16:39 +00:00
Seth Alves
6b44f62982
don't honor gravity in simple extrapolation on entities equipped by others
2017-02-02 14:20:21 -08:00
Anthony J. Thibault
b44e5b5a1f
tablet-ui: preferences for tablet ui scaling
...
One for the tablet in HMD mode, one for desktop mode.
The default desktop mode scaling factor is now 75%, which should
reduce the size of the for users with low resolution monitors,
while still being somewhat readable.
2017-02-02 14:05:07 -08:00
howard-stearns
4499a92a82
filter gets isAdd argument
2017-02-02 13:07:08 -08:00
Anthony J. Thibault
5890503ec0
Can now grab tablet in 2d mode even when it embedded in geometry
2017-02-02 10:56:56 -08:00
Anthony J. Thibault
9df887de2a
You can no longer scale the tablet with double-grab
2017-02-02 10:16:02 -08:00
Dante Ruiz
2cc1ee008d
added clicking sounds to tablet menus
2017-02-02 17:46:42 +00:00
Dante Ruiz
2af72f1a50
fixed tablet buliding up when flying fast
2017-02-02 17:03:53 +00:00
Seth Alves
f4e57898c6
Merge pull request #9575 from thoys/patch-9
...
Readme fix, default AC parameters example
2017-02-01 20:25:51 -08:00
Howard Stearns
49af783553
Merge pull request #9590 from sethalves/fix-pal-audio-meter
...
hook pal audio meter up again
2017-02-01 20:23:56 -08:00
Howard Stearns
4c9d8199b7
Merge pull request #9588 from zfox23/PAL_FixIdentityChangeSpam
...
PAL: Fix Spam upon Identity Change
2017-02-01 20:23:03 -08:00
Seth Alves
f907af1b9b
Merge pull request #9587 from hyperlogic/bug-fix/tablet-ui-network-2d-tablet
...
Tablet-ui: fix tablet orientation for users in 2d desktop mode
2017-02-01 20:17:40 -08:00
Seth Alves
0dead3b458
Merge pull request #9589 from hyperlogic/bug-fix/tablet-ui-button-click-volume
...
tablet-ui: reduced volume of button click
2017-02-01 20:16:38 -08:00
Seth Alves
4ae163ac60
hook pal audio meter up again
2017-02-01 19:01:55 -08:00
Anthony J. Thibault
de55a5dfe6
tablet-ui: reduced volume of button click
2017-02-01 18:47:50 -08:00
Zach Fox
5ea3c5dffd
Skipped this line
2017-02-01 18:13:24 -08:00
Anthony J. Thibault
9d124983a6
Tablet-ui: fix tablet orientation for users in 2d desktop mode
...
Double 180 flip. Once before to account for -z forward of camera.
Once after to account for avatar 180 flip.
2017-02-01 17:48:28 -08:00
Zach Fox
4af5118654
First pass
2017-02-01 17:04:21 -08:00
Seth Alves
d9bdbb92ef
use tablet model from distribution rather than from s3
2017-02-01 16:55:29 -08:00
Seth Alves
6671324a33
fix the edit.js toolbar buttons so they don't vanish when moused-over or clicked
2017-02-01 16:29:12 -08:00
Faye Li
3e165d5fbb
Merge pull request #9578 from fayeli/users-jump-to
...
Rework users.js for Tablet: better jump to user & who can find me toggle
2017-02-01 16:23:58 -08:00
Chris Collins
b585699540
Merge pull request #9582 from hyperlogic/feature/tablet-ui-2d-desktop-deadspot
...
tablet-ui: Added 6 pixel deadspot for bringing up the tablet in desktop mode.
2017-02-01 16:04:33 -08:00
Faye Li
4f04865963
load tablet users in default scripts
2017-02-01 15:37:54 -08:00
Faye Li
80c8748046
Revert "replace old user.js"
...
This reverts commit 2340f56b53
2017-02-01 15:37:01 -08:00
Faye Li
2340f56b53
replace old user.js
2017-02-01 15:26:40 -08:00
Chris Collins
eabd41d0e9
Merge pull request #9579 from hyperlogic/bug-fix/tablet-ui-keyboard-focus
...
tablet-ui: Fix for keyboard focus
2017-02-01 15:26:02 -08:00
Faye Li
c24b6e5e5e
missing words
2017-02-01 15:13:52 -08:00
Faye Li
c16a9a955e
display correct username
2017-02-01 14:53:03 -08:00
