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
samcake
edcba1b7c5
Merge branch 'master' of https://github.com/highfidelity/hifi into purple
2017-02-01 10:12:47 -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
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
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
Thijs Wenker
b9ba8b5d80
Readme fix, default AC parameters example
...
Six ACs is minimum required for a full stack, using the --min --max parameters will not out-date the documentation as quick
2017-02-01 01:28:06 +01: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
Triplelexx
be68f84100
update nameTag.js comments
2017-01-31 22:14:39 +00:00
Thijs Wenker
174a7ad5bd
Optimizations and style fixes from code review
2017-01-31 22:54:58 +01: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
645aad7bb0
Merge pull request #9557 from hyperlogic/tablet-ui
...
Fix for one-frame lag in the tablet stylus.
2017-01-31 13:37:56 -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
howard-stearns
18f8c2b866
comment
2017-01-31 13:31:33 -08:00
Brad Hefta-Gaub
2fc6b4b0af
Merge pull request #9544 from humbletim/fix-rightclick-menu
...
Hide webview context menus when clicked
2017-01-31 13:03:50 -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
howard-stearns
8d8b338c66
dry up custom setters, per code review
2017-01-31 12:07:48 -08:00
Thijs Wenker
3608998877
use dedicated bool rather than unreliable dirtyFlags to determine if the entityItem had ever bid for simulation ownership
2017-01-31 21:01:03 +01:00
Thijs Wenker
1a36d9a698
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-01-31 20:59:21 +01:00
samcake
c88d070868
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-01-31 11:49:25 -08:00
samcake
04d5173328
Merge pull request #9530 from AndrewMeadows/computeBoundsOutsideLambda
...
compute Model's local bounds outside pending changes queue
2017-01-31 11:40:21 -08:00
Thijs Wenker
e445af74aa
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-01-31 20:39:39 +01:00
Zach Pomerantz
1f56814714
Merge branch 'master' of https://github.com/highfidelity/hifi into audio/throttle-filter
2017-01-31 19:35:27 +00:00
Brad Hefta-Gaub
3bbb57599b
Merge pull request #9565 from kencooke/cpudetect-gcc-bugfix
...
Fix bug that causes GCC not to detect AVX2
2017-01-31 11:11:35 -08:00
Stephen Birarda
79cb0ba074
fix keyboard behaviour for category tables
2017-01-31 11:05:57 -08:00
howard-stearns
1ddc804e10
Merge branch 'master' of https://github.com/highfidelity/hifi into accept-forced-physics-values
2017-01-31 10:58:49 -08:00
