sam
|
2ecda8b64e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
|
2017-02-01 18:03:07 -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 |
|
samcake
|
6bdf50f2db
|
moving mip map gen to cpu
|
2017-02-01 15:16:37 -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 |
|
Anthony J. Thibault
|
ffaf7a10e8
|
tablet-ui: Added 6 pixel deadspot for bringing up the tablet in desktop mode.
|
2017-02-01 14:44:14 -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 |
|
Anthony J. Thibault
|
2760065ee1
|
Bug fix for previous commit
|
2017-02-01 13:51:31 -08:00 |
|
Faye Li
|
6d55b3c82d
|
visibility toggle drop down
|
2017-02-01 13:45:17 -08:00 |
|
Anthony J. Thibault
|
9be6fe2192
|
tablet-ui: Fix for keyboard focus box still being visible sometimes
|
2017-02-01 13:44:12 -08:00 |
|
David Kelly
|
82efb97654
|
Merge pull request #9580 from zfox23/PAL_VirtualKeyboard
PAL: Raise virtual keyboard when editing DisplayName in HMD
|
2017-02-01 14:16:03 -07:00 |
|
Zach Fox
|
8b1161b0b0
|
Fix it
|
2017-02-01 12:32:30 -08:00 |
|
Faye Li
|
378fdaec8b
|
the missing commit - fix typo and added user info
|
2017-02-01 11:27:48 -08:00 |
|
Anthony J. Thibault
|
ca79397ee8
|
tablet-ui: Fix for keyboard focus
Don't allow clicks on non-web entities from stealing focus away from web overlays.
|
2017-02-01 11:22:17 -08:00 |
|
Ryan Huffman
|
d0393aeea0
|
Merge pull request #9577 from birarda/bug/domain-settings-save-row
only check if keys are empty, not all fields in DS settings
|
2017-02-01 10:59:52 -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 |
|
Zach Fox
|
cf0b6e1da8
|
Merge pull request #9560 from howard-stearns/accept-forced-physics-values
accept forced physics results from entity server (e.g., when filtered)
|
2017-02-01 10:40:26 -08:00 |
|
Faye Li
|
fc1e588588
|
sending and recieving jump to event
|
2017-02-01 10:34:54 -08:00 |
|
Stephen Birarda
|
5bd8e46510
|
only check if keys are empty, not all fields
|
2017-02-01 10:33:29 -08:00 |
|
howard-stearns
|
6f4441028d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into accept-forced-physics-values
|
2017-02-01 09:41:08 -08:00 |
|
Seth Alves
|
ab8be15ce0
|
Merge pull request #9570 from highfidelity/tablet-ui
Tablet ui
|
2017-02-01 09:38:13 -08:00 |
|
samcake
|
23af56c41f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
|
2017-02-01 09:27:21 -08:00 |
|
David Kelly
|
f25bbc9649
|
Merge pull request #9574 from howard-stearns/delete-failed-entity-adds
cleanly log failed entity adds, and tell the client to delete his copy
|
2017-02-01 10:12:17 -07:00 |
|
Brad Hefta-Gaub
|
0c7a181d33
|
Merge pull request #9573 from birarda/bug/whitelist-starts-with
drop empty parts when splitting script whitelist
|
2017-02-01 07:38:02 -08:00 |
|
Brad Hefta-Gaub
|
0f4bc1a7c1
|
Merge pull request #9554 from birarda/bug/domain-settings-save-row
make table additions in DS settings more obvious
|
2017-02-01 07:10:19 -08:00 |
|
Seth Alves
|
e7ec651bb1
|
Merge pull request #9576 from hyperlogic/bug-fix/tablet-ui-image-urls
tablet-ui: button icon images now work with http urls.
|
2017-01-31 21:03:05 -08:00 |
|
Chris Collins
|
42098edbeb
|
Merge pull request #9561 from thoys/entity-simulation-owner-fixes
Fix simulation owned entities not to go to origin after cache reload (+ small priority fix)
|
2017-01-31 20:54:52 -08:00 |
|
Chris Collins
|
8b94e64082
|
Merge pull request #9539 from huffman/feat/tealight-entity-server
Add tealight.js entity server script
|
2017-01-31 20:51:19 -08: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 |
|
Stephen Birarda
|
f03d2988c1
|
fix for checkbox name setting
|
2017-01-31 17:30:45 -08:00 |
|
Anthony J. Thibault
|
cf855391af
|
Added jsdocs for all button properties
|
2017-01-31 16:54:15 -08:00 |
|
Anthony J. Thibault
|
8f362861eb
|
tablet-ui: button icon images now work with http urls.
|
2017-01-31 16:53:25 -08:00 |
|
Faye Li
|
59aea60be0
|
fill confirmation modal with data of the selected user
|
2017-01-31 16:16:40 -08:00 |
|
howard-stearns
|
e42853a96c
|
cleanly log failed entity adds, and tell the client to delete his copy
|
2017-01-31 16:05:38 -08:00 |
|
Faye Li
|
fda20694b3
|
jump to user confimation modal
|
2017-01-31 15:47:51 -08:00 |
|
Stephen Birarda
|
d4a161041e
|
drop empty parts when splitting script whitelist
|
2017-01-31 15:32:47 -08:00 |
|
Seth Alves
|
1f01a7d276
|
Merge pull request #9572 from sethalves/tablet-ui
put tablet version of users.js into a different file
|
2017-01-31 14:45:12 -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 |
|