Dante Ruiz
0e83e5da06
minimize diff
2017-02-09 07:13:30 -08:00
Dante Ruiz
580216c3d2
adding tablet-goto.js
2017-02-09 07:13:30 -08:00
Dante Ruiz
5c5ace7c7b
goto in tablet
2017-02-09 07:13:29 -08:00
Philip Rosedale
c9c04a9afc
Merge pull request #9638 from PhilipRosedale/fixRescale
...
Fix rescale avatar bug
2017-02-08 22:09:41 -08:00
Seth Alves
2ec4f118fd
Merge pull request #9639 from hyperlogic/feature/tablet-pal
...
Ported PAL to tablet
2017-02-08 21:17:38 -08:00
Anthony J. Thibault
c2b832fb9c
removed debug prints from pal.js
2017-02-08 18:55:22 -08:00
Brad Hefta-Gaub
41dc498888
add inView simulation stats
2017-02-08 18:32:39 -08:00
Philip Rosedale
e94e41698e
remove debug
2017-02-08 18:04:55 -08:00
Anthony J. Thibault
a209d0372a
First cut of pal on tablet.
2017-02-08 17:34:03 -08:00
Brad Hefta-Gaub
6c41a25032
more stats
2017-02-08 16:51:00 -08:00
Philip Rosedale
dc957d09d8
remove comment
2017-02-08 15:45:29 -08:00
Philip Rosedale
fe92d38b60
Fixed scaling of self
2017-02-08 15:42:10 -08:00
Brad Hefta-Gaub
357cc052e1
first cut at simulation stats
2017-02-08 15:32:48 -08:00
Clément Brisset
91bfa65fe2
Merge pull request #9586 from Triplelexx/21146
...
21146
2017-02-08 11:07:27 -08:00
David Kelly
61e558e568
Entity Edit Filters for zones
...
Part 1 - just put them in the zones entities. Next I'll hook them
up and actually filter...
2017-02-08 09:53:25 -07:00
Seth Alves
47976406fc
Merge pull request #9607 from hyperlogic/bug-fix/better-haptics
...
More consistent haptics on web overlays and entities
2017-02-08 05:47:05 -08:00
Anthony J. Thibault
244437d971
set WANT_DEBUG_STATE back to false
2017-02-07 23:50:06 -08:00
Seth Alves
e1a3b0c551
Merge pull request #9629 from hyperlogic/feature/tablet-2d-window-pos
...
In desktop mode create tablet near mouse click location.
2017-02-07 19:51:05 -08:00
Anthony J. Thibault
cb58c567b8
In desktop mode create tablet near mouse click location.
...
But prevent the tablet from being displayed off screen.
2017-02-07 18:18:34 -08:00
howard-stearns
2e88f1ab1f
conserving audio interval
2017-02-07 16:21:14 -08:00
howard-stearns
23fc9b6fb3
Merge branch 'master' of https://github.com/highfidelity/hifi into pal-performance
2017-02-07 16:00:08 -08:00
howard-stearns
3bd11978aa
low-hanging fruit on pal performance
2017-02-07 15:59:38 -08:00
Seth Alves
90fa8bf572
Merge pull request #9612 from druiz17/users
...
some tweaks to users and menus got tablet
2017-02-07 15:38:43 -08:00
Triplelexx
e7244b47a9
increase LETTER_OFFSET value
...
allow more room for characters, could be improved by detecting each one
2017-02-07 21:55:55 +00:00
howard-stearns
9a44f63b74
update crowd-agent and summon for bubble, avatar-mixin optimizations.
2017-02-07 13:14:15 -08:00
Chris Collins
d2feb4202b
Merge pull request #9621 from sethalves/tablet-ui-track-opens-and-closes
...
send UserActivityLogger events when tablet is opened or closed
2017-02-07 08:23:09 -08:00
Anthony Thibault
2f09be5ead
Merge pull request #9605 from druiz17/tabletClicking
...
enforce more button clicking logic
2017-02-06 20:23:16 -08:00
Seth Alves
e3af5032c0
send UserActivityLogger events when tablet is opened or closed
2017-02-06 16:49:26 -08:00
Seth Alves
68de18a3bb
Merge pull request #9610 from sethalves/tablet-ui-use-models-from-s3-again
...
use tablet models from s3 until relative model urls work
2017-02-03 18:34:28 -08:00
Dante Ruiz
0c28776ea2
some tweaks to users and menus got tablet
2017-02-04 00:13:39 +00:00
Seth Alves
9f04a72a38
Merge pull request #9599 from hyperlogic/feature/tablet-ui-button-sort-order
...
tablet-ui: Added sortOrder property to buttons
2017-02-03 15:20:53 -08:00
Seth Alves
f635cd8a07
use tablet models from s3 until relative model urls work
2017-02-03 15:17:33 -08:00
Anthony J. Thibault
6738c0eade
More consistent haptics on web overlays and entities
2017-02-03 12:05:30 -08:00
Dante Ruiz
2a3d0b6b17
enforce more button clicking logic
2017-02-03 19:13:57 +00: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 J. Thibault
6bef9e888b
Merge branch 'master' into bug-fix/tablet-ui-no-domain
2017-02-02 17:21:20 -08:00
Anthony J. Thibault
85e01e3922
tablet-ui: Added sortOrder property to buttons
...
By default user created buttons will appear after system buttons.
2017-02-02 17:18:22 -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
Dante Ruiz
0ec8071288
better scrolling and fixed button touching
2017-02-02 23:16:39 +00: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
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
2af72f1a50
fixed tablet buliding up when flying fast
2017-02-02 17:03:53 +00:00
Seth Alves
4ae163ac60
hook pal audio meter up again
2017-02-01 19:01:55 -08:00
Triplelexx
05e3acf1a3
Merge remote-tracking branch 'upstream/master' into 21146
2017-02-02 01:16:51 +00:00
Triplelexx
1a58dad3ad
change age check
...
check for equal to -1 instead of < 1, think this would be more suitable
if undefined is returned.
2017-02-02 01:12:55 +00: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
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
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
Faye Li
9a22055c27
initialise the toggle button with correct info
2017-02-01 14:30:16 -08:00
Faye Li
3c3ff908b4
handling the visibility toggle event
2017-02-01 14:22:13 -08:00
Faye Li
6d55b3c82d
visibility toggle drop down
2017-02-01 13:45:17 -08:00
Faye Li
378fdaec8b
the missing commit - fix typo and added user info
2017-02-01 11:27:48 -08:00
Faye Li
d78c274472
Merge branch 'master' into users-jump-to
2017-02-01 10:59:32 -08:00
Faye Li
4e209399da
fix conflict
2017-02-01 10:58:03 -08:00
Faye Li
5946339782
move my changes to a different file
2017-02-01 10:52:37 -08:00
Faye Li
3f84e5778c
jump to the selected user
2017-02-01 10:45:18 -08:00
Faye Li
fc1e588588
sending and recieving jump to event
2017-02-01 10:34:54 -08:00
Seth Alves
ab8be15ce0
Merge pull request #9570 from highfidelity/tablet-ui
...
Tablet ui
2017-02-01 09:38:13 -08:00
Triplelexx
5bf29f4657
improve dimensionsFromName implementation
2017-02-01 12:59:40 +00:00
Triplelexx
b5d2926605
make text entity smaller and allow dynamic resizing based on name length
2017-02-01 12:49:41 +00:00
Anthony J. Thibault
3c04f54e75
more fixes to third person tablet usage.
2017-01-31 18:22:38 -08:00
Anthony J. Thibault
008a58f9d7
Only reposition the tablet when camera mode changes, in HMD mode.
2017-01-31 18:03:48 -08:00
Anthony J. Thibault
c147b9bec0
Fix for tablets in third-person HMD mode.
2017-01-31 18:00:18 -08:00
Faye Li
59aea60be0
fill confirmation modal with data of the selected user
2017-01-31 16:16:40 -08:00
Faye Li
fda20694b3
jump to user confimation modal
2017-01-31 15:47:51 -08:00
Seth Alves
3a6a7bcc8a
put tablet version of users.js into a different file
2017-01-31 14:44:09 -08:00
Faye Li
06d797bb3b
load bootstrao
2017-01-31 14:27:17 -08:00
Triplelexx
be68f84100
update nameTag.js comments
2017-01-31 22:14:39 +00:00
Anthony J. Thibault
e2e19884bb
Tablet should work even when not connected to any domain.
...
handControllerGrab.js and WebTablet.js now parents objects to the
AVATAR_SELF_ID parentID, instead of using MyAvatar.sessionUUID, which
is unavailable when not connected to any domain.
I removed several early returns handControllerGrab.js that prevented
grabbing from working if MyAvatar.sessionUUID was invalid.
There were places in the EntityItem.cpp and EntityScriptingInterface.cpp
C++ that would log an error if parentID was set to AVATAR_SELF_ID.
This was to prevent AVATAR_SELF_ID from ever going over the network.
Instead, we now prevent this by replacing all outgoing references of
AVATAR_SELF_ID with the sessionID of the current node.
2017-01-31 13:52:12 -08:00
Seth Alves
d835de2fec
Merge pull request #9547 from druiz17/tabletBug
...
Grabbing tablet while in edit mode
2017-01-31 13:37:11 -08:00
Seth Alves
ec67cabaf5
Merge pull request #9540 from fayeli/new-users-js
...
Rework Users.js for Tablet
2017-01-31 13:36:53 -08:00
Triplelexx
f159d4c91d
create nameTag.js script
...
Running the script creates a text entity that will hover over the users
head showing their display name.
2017-01-31 20:45:35 +00:00
Brad Hefta-Gaub
cff49ea5f3
Merge pull request #9556 from samcake/blue
...
Adding support for disabling texturing from the material
2017-01-31 10:39:44 -08:00
Dante Ruiz
7a4a769015
fix more editing bugs
2017-01-31 16:53:57 +00:00
samcake
3c56bd2960
Adding support for disabling texturing from the material
2017-01-30 15:03:04 -08:00
Dante Ruiz
b264d84385
minimize git diff
2017-01-30 13:27:25 -08:00
Dante Ruiz
57a9d34cda
minimize git diff
2017-01-30 13:27:25 -08:00
Dante Ruiz
8879727d88
ability to grab tablet in edit mode
2017-01-30 13:27:25 -08:00
Anthony J. Thibault
98b53d1d29
Don't allow mouse dragging the tablet in HMD mode.
2017-01-30 12:07:18 -08:00
Faye Li
8e64de26a9
Merge branch 'tablet-ui' into new-users-js
2017-01-30 11:25:58 -08:00
Anthony J. Thibault
39d68828ab
Disable FXAA on tablet overlay in desktop mode.
...
This introduces the "isAA" property to 3d overlays. When false, the overlay is rendered after
the "Antialiasing" render pass. Ironically, disabling FXAA makes the text more readable, which is
essential in 2D desktop mode.
Two new shaders were introduced.
simple_opaque_web_browser_overlay.slf
simple_transparent_web_browser_overlay.slf
These are tailored to write into the main framebuffer instead of the g-buffer.
2017-01-30 11:24:59 -08:00
Faye Li
ff1c4995af
removed unused code
2017-01-27 15:44:07 -08:00
Faye Li
ea366dd227
removed unused code
2017-01-27 15:38:49 -08:00
Faye Li
8091b0ced4
button style
2017-01-27 13:33:07 -08:00
Dante Ruiz
2c7cbb1bd9
close tablet with mouse in HMD
2017-01-27 20:58:36 +00:00
Faye Li
bf51ba7195
button brings up add/remove friends page
2017-01-27 11:34:38 -08:00
Faye Li
bfbee20f43
display friends
2017-01-27 10:19:20 -08:00
Seth Alves
fa61bbe2a6
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-26 18:21:39 -08:00
Seth Alves
95d5c64e83
put a schmitt trigger in place to de-bounce tablet clicks
2017-01-26 15:09:35 -08:00
Seth Alves
c0f169e242
allow tablet-stabbers to more easily click buttons
2017-01-26 14:54:32 -08:00
ZappoMan
4c80422a73
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-26 14:34:58 -08:00
Seth Alves
e3d4cae515
avoid having the snapshot script be multi-activated by a single button-click
2017-01-26 14:29:49 -08:00
Seth Alves
d85d892057
Merge pull request #9522 from fayeli/PAL-to-PEOPLE
...
Tablet Button name from PAL to PEOPLE
2017-01-26 12:58:16 -08:00
Faye Li
44fc8a5fbf
update button name
2017-01-26 11:23:06 -08:00
Seth Alves
0b51b1d566
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-26 11:00:02 -08:00
Brad Hefta-Gaub
5ada689ab7
Merge pull request #9497 from ctrlaltdavid/fix-clara-download
...
Fix intermittent Clara.io download crashes
2017-01-26 10:58:27 -08:00
Seth Alves
68de5c9757
Users to USERS in button
2017-01-26 10:23:38 -08:00
Seth Alves
e2b1f4b2ab
include tablet fbx with interface distribution rather than get it from s3
2017-01-26 10:20:46 -08:00
ZappoMan
3c3dcbbbaa
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-26 08:20:03 -08:00
Faye Li
6a4a9bcb32
end of day commit
2017-01-25 17:53:32 -08:00
Faye Li
0a3a0e817e
polling users and displaying user count
2017-01-25 17:36:50 -08:00
Seth Alves
9497b2b7c5
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui
2017-01-25 17:16:12 -08:00
Seth Alves
129fe6ea49
dammit, emacs
2017-01-25 17:15:54 -08:00
Faye Li
b5b781f4a5
tab content switching
2017-01-25 16:59:16 -08:00
Anthony J. Thibault
2af59630fb
Better legibility of tablet in 2D with small window sizes.
2017-01-25 16:43:36 -08:00
Seth Alves
204652514e
fix some fallout from toolbar changes
2017-01-25 16:29:36 -08:00
Faye Li
5ad522668a
tabs header for everyone and friends
2017-01-25 16:29:25 -08:00
Seth Alves
c317ba8054
merge from upstream
2017-01-25 15:57:53 -08:00
Seth Alves
f382b541c7
merge from upstream
2017-01-25 15:42:33 -08:00
Seth Alves
ff8d13ecc7
get button-states for toolbar buttons working again
2017-01-25 15:38:54 -08:00
Faye Li
6f46136699
reorder buttons to match mockup
2017-01-25 15:02:55 -08:00
Faye Li
49a8964c4e
reference new users icon art
2017-01-25 14:43:39 -08:00
Faye Li
ce0ee610ea
a test on polling friends
2017-01-25 14:32:36 -08:00
Seth Alves
98f1664a46
use a setting to decide which UI is enabled
2017-01-25 14:17:45 -08:00
Atlante45
f540c94113
Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr
2017-01-25 13:06:49 -08:00
Seth Alves
f18094f565
make use of tablet or HUD depend on a single variable. avoid some duplicated code
2017-01-25 12:00:34 -08:00
Faye Li
f02b2ef40a
auto poll users when page loads
2017-01-25 11:59:31 -08:00
Faye Li
c7a0e609fc
created a friends button for metaverse friends page
2017-01-25 11:41:07 -08:00
Seth Alves
11d01a0c00
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-HUD-ui
2017-01-25 09:42:59 -08:00
Ryan Huffman
2bb7a7a4a6
Remove entity server script status log spam from edit.js
2017-01-25 09:32:25 -08:00
Seth Alves
7d370fb791
Merge pull request #9507 from cozza13/tablet-ui
...
Changes to tablet formatting
2017-01-25 09:29:16 -08:00
Dante Ruiz
c811839163
tablet is not selectable in edit mode
2017-01-25 16:46:17 +00:00
Dante Ruiz
bc75cf5bed
removed tabs
2017-01-25 16:11:37 +00:00
Dante Ruiz
bda8b65e79
fixing spaceing
2017-01-25 16:06:40 +00:00
Dante Ruiz
a147ce3f5f
fixed load script issue
2017-01-25 08:00:41 -08:00
Chris Collins
df9bfa6eff
Changes to tablet formating
...
Changes to QML and .js formating to match style of mockup.
2017-01-25 07:41:04 -08:00
David Rowe
dcd632013f
Better variable name
2017-01-25 16:37:35 +13:00
David Rowe
7e56d0fae6
Fix up Clara.io error handling
2017-01-25 16:36:06 +13:00
Seth Alves
4335bbe4fe
provide a way to switch mostly back to HUD-based ui
2017-01-24 18:48:11 -08:00
Seth Alves
ced1b61b70
close rather than attempt to repair the tablet after a domain change
2017-01-24 16:03:22 -08:00
Seth Alves
827ae7ad4d
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-close-tablet-upon-goto
2017-01-24 15:50:12 -08:00
Seth Alves
601a35a9b6
try a different way of repairing tablet after a domain change
2017-01-24 15:49:49 -08:00
Faye Li
71b6096644
toggle menu item
2017-01-24 15:12:46 -08:00
Faye Li
5bed68ac4c
button toggle
2017-01-24 14:56:58 -08:00
Faye Li
95a92fc5eb
added tablet button
2017-01-24 14:42:28 -08:00
David Rowe
1b05ae8a82
Make handling of Clara.io download-ready state transition more robust
2017-01-25 11:00:07 +13:00
Anthony J. Thibault
432bb27119
The tablet Help button should be active if window is visible
2017-01-23 18:37:08 -08:00
Anthony J. Thibault
e30d77eba1
Tablet goto button now properly tracks address bar shown state
2017-01-23 18:37:07 -08:00
Seth Alves
353b38286a
Merge pull request #9490 from hyperlogic/tablet-ui
...
For for Tablet Tilt and Oculus Touch A B buttons sending UINav events
2017-01-23 18:14:53 -08:00
Seth Alves
3496e4cc7a
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-23 16:50:41 -08:00
ZappoMan
efdc82f194
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-23 16:39:42 -08:00
Anthony J. Thibault
3db8c5b4a7
Fix tilt on tablet for HMD users without hand controllers
2017-01-23 16:36:04 -08:00
Seth Alves
f2ff6fd9e7
allow stylus to work when edit.js is running
2017-01-23 15:52:40 -08:00
Ryan Downe Karpf
3f151cb3d7
Merge pull request #9483 from Atlante45/fix/rescale
...
Fix Edit.js rescale for decimal values
2017-01-23 15:44:10 -08:00
Faye Li Si Fi
f8162970ec
filter out yourself from user list
2017-01-23 15:24:33 -08:00
Ryan Downe Karpf
e080746990
Merge pull request #9481 from huffman/fix/edit-collision-names
...
Update the name of the collision shapes used in edit.js properties
2017-01-23 15:10:01 -08:00
Seth Alves
9d77e9937c
only make the last cm of the stylus active to avoid accidently closing tablet when grabbing base
2017-01-23 14:38:48 -08:00
Atlante45
a1962e274d
Fix rescale for 0.x values
2017-01-23 14:35:16 -08:00
Ryan Huffman
f6d5a59c8a
Fix width of edit.js dropdown to accomodate collision options
2017-01-23 14:18:56 -08:00
Ryan Huffman
d108fabd0b
Update the name of the collision shapes used in edit.js properties
...
Update the names to be consistent with what is shown on the add model
dialog.
2017-01-23 13:56:48 -08:00
Seth Alves
c958314918
merge from upstream
2017-01-23 13:52:01 -08:00
ZappoMan
7ba41c72ef
cleanup debugAvatarMixer
2017-01-23 13:31:06 -08:00
Philip Rosedale
45a4ec349e
Merge pull request #9467 from humbletim/21139
...
Code Review for Job #21139 - Do not allow grab or far-grab or click while editing objects
2017-01-23 13:20:57 -08:00
ZappoMan
29fff2e556
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-23 13:09:59 -08:00
Seth Alves
be8bc9652b
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-23 09:44:04 -08:00
Dante Ruiz
d5427f8722
close tablet bug fix
2017-01-23 17:33:33 +00:00
humbletim
d20ac20ff2
move isInEditMode guard to setState
2017-01-23 01:31:11 -05:00
humbletim
15394056eb
* add isInEditMode to utils.js
...
* update grab.js to use the latest Settings edit mode detection approach
* add edit guards to handControllerGrab.js and grab.js
* update edit.js to consistently initialize Setting's edit flag
2017-01-20 22:29:40 -05:00
Dante Ruiz
5c55b86be6
fix bug
2017-01-21 01:56:06 +00:00
Dante Ruiz
41bf65ed5e
home button improvments
2017-01-20 16:35:41 -08:00
Ryan Huffman
ad70431c26
Fix edit.js server script status getting reset when changing properties
2017-01-20 15:34:38 -08:00
Seth Alves
87ea9161e4
avoid bad interaction between far-grab and equip
2017-01-20 14:49:49 -08:00
Faye Li Si Fi
afc85a3afe
Don't display users who aren't in a domain
2017-01-20 13:53:09 -08:00
Seth Alves
2f08972578
Merge pull request #9460 from druiz17/touchUp
...
Tablet button clickable in desktop mode && correct icons for switch
2017-01-20 12:58:41 -08:00
Anthony J. Thibault
3ebf2ebc9b
Updated tablet dimensions to better reflect mockup and 3d model
2017-01-20 12:27:44 -08:00
Dante Ruiz
58e04f8e35
home button works in desktop mode
2017-01-20 19:43:13 +00:00
Seth Alves
7f25135633
try again on haptics from touching tablet overlay with stylus
2017-01-20 11:06:35 -08:00
Dante Ruiz
672deb903c
correct switch icons
2017-01-20 10:34:09 -08:00
Seth Alves
6641f9bafd
Merge pull request #9444 from druiz17/homeButtonFix
...
Home button is now an overlay
2017-01-20 10:32:31 -08:00
Seth Alves
2d220a557f
unmangle merge
2017-01-20 10:29:18 -08:00
Zach Fox
c83cd4a94a
Complex checkpoint
2017-01-20 10:24:51 -08:00
Seth Alves
c492319be2
merge from upstream
2017-01-20 10:14:11 -08:00
Seth Alves
caae804318
re-enable haptic pulse when stylus touches tablet overlay
2017-01-20 10:12:15 -08:00
Ryan Downe Karpf
03851d4188
Merge pull request #9441 from davidkelly/dk/makeUsSomeAnalytics
...
Some initial analytics for PAL usage
2017-01-20 08:30:46 -08:00
Anthony J. Thibault
4e4545ac00
Updated orientation of tablet when no hand controllers are present.
2017-01-19 20:27:06 -08:00
Anthony J. Thibault
8304aa7b19
Added ability to mouse move the tablet in 2d desktop mode.
2017-01-19 18:04:08 -08:00
David Kelly
5adc2cc593
Couple improvements
...
Only send one message when gain is changed. Eliminated the bool and
now just sending un-personalMute, etc...
2017-01-19 17:22:39 -08:00
Dante Ruiz
e1c2c73e5f
clean up
2017-01-20 01:04:14 +00:00
Dante Ruiz
a319db3cb4
removed duplicate code
2017-01-20 00:57:48 +00:00
Dante Ruiz
1e7e4576cc
comparing with ID instead of strings
2017-01-19 16:38:55 -08:00
Faye Li
763028dad4
refresh icon
2017-01-19 15:46:02 -08:00
Faye Li
5bc0030c8f
hook up event bridge
2017-01-19 15:24:56 -08:00
Ryan Huffman
7cd19192d9
Remove dead code in entityProperties.js
2017-01-19 15:00:30 -08:00
Faye Li
bbed26c8fa
display all online users
2017-01-19 14:34:28 -08:00
Anthony J. Thibault
2c3c96b600
Fix for broken entity scrolling introduced by 23ea65e2
...
this.grabbedEntity was being cleared before entityTouchingExit transition could send the release event.
2017-01-19 14:23:43 -08:00
Seth Alves
47b59ffae3
don't save tablet to Settings when logging out or switching domains
2017-01-19 14:10:48 -08:00
Zach Fox
64ef3d5665
Merge pull request #9426 from zfox23/PAL_AdminLabel
...
PAL: Admin Labels, Updated Letterboxes
2017-01-19 13:48:05 -08:00
Faye Li
23269c2efb
move refresh button to top bar
2017-01-19 13:41:36 -08:00
Ryan Huffman
c015ac1bd5
Add display of server script status to edit.js
2017-01-19 13:27:44 -08:00
Faye Li
193251eb8d
background
2017-01-19 13:11:35 -08:00
Faye Li
450b94f641
load font
2017-01-19 12:55:06 -08:00
Seth Alves
18e9b476c5
Merge pull request #9439 from hyperlogic/tablet-ui
...
Improved stylus and laser input deadspot
2017-01-19 12:43:02 -08:00
Faye Li
53404caccf
top bar css
2017-01-19 12:15:27 -08:00
