Anthony J. Thibault
244437d971
set WANT_DEBUG_STATE back to false
2017-02-07 23:50:06 -08:00
Anthony J. Thibault
6738c0eade
More consistent haptics on web overlays and entities
2017-02-03 12:05:30 -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 J. Thibault
6bef9e888b
Merge branch 'master' into bug-fix/tablet-ui-no-domain
2017-02-02 17:21:20 -08:00
Dante Ruiz
0ec8071288
better scrolling and fixed button touching
2017-02-02 23:16:39 +00:00
Anthony J. Thibault
9df887de2a
You can no longer scale the tablet with double-grab
2017-02-02 10:16:02 -08: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
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
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
Seth Alves
f2ff6fd9e7
allow stylus to work when edit.js is running
2017-01-23 15:52:40 -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
Seth Alves
c958314918
merge from upstream
2017-01-23 13:52:01 -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
Seth Alves
87ea9161e4
avoid bad interaction between far-grab and equip
2017-01-20 14:49:49 -08:00
Seth Alves
7f25135633
try again on haptics from touching tablet overlay with stylus
2017-01-20 11:06:35 -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
caae804318
re-enable haptic pulse when stylus touches tablet overlay
2017-01-20 10:12:15 -08: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
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
18e9b476c5
Merge pull request #9439 from hyperlogic/tablet-ui
...
Improved stylus and laser input deadspot
2017-01-19 12:43:02 -08:00
Seth Alves
41ddfbfd27
clean up grab.js. provide a way to delete old tablets that got saved into Settings on exit
2017-01-19 11:34:38 -08:00
Anthony J. Thibault
2fd691d844
Improved stylus and laser input deadspot
2017-01-18 18:23:00 -08:00
Seth Alves
7c938728e5
don't do constant haptics if stylus touches tablet frame. home button triggers only once per click
2017-01-18 16:56:39 -08:00
Anthony J. Thibault
56c897cc2f
Process the tablet stylus even when reticle is over 2d HUD overlay.
2017-01-18 15:36:09 -08:00
Anthony J. Thibault
fc5c2c8def
Fix for glitchy scrolling
2017-01-18 15:32:38 -08:00
Anthony J. Thibault
28dac9d802
Lasers now interact with the tablet in edit mode.
2017-01-18 15:32:36 -08:00
Seth Alves
a8038ce64e
cleanups
2017-01-18 10:50:02 -08:00
Seth Alves
1f92b57bf2
switch to model stylus
2017-01-18 10:46:18 -08:00
Seth Alves
89d7b8bfc6
call releaseEquip when an equipped entity is dropped with a secondary press
2017-01-17 13:27:01 -08:00
Seth Alves
5c205f5800
avoid an unhook loop if two different hands have passed something back and forth more than once
2017-01-17 10:24:30 -08:00
Seth Alves
6bace4f451
merge from upstream
2017-01-17 09:29:30 -08:00
howard-stearns
0a3236dcc9
handControllerGrab update loop change
2017-01-16 14:54:32 -08:00
Seth Alves
23ea65e2b5
more changes to handle camera-relative-controller joints.
2017-01-16 10:26:16 -08:00
Seth Alves
b617b3a114
put code to delete prim-stylus tip back in
2017-01-16 07:50:36 -08:00
Seth Alves
756d96c368
fix search ray getting left on. started adding stylus models
2017-01-16 07:46:12 -08:00
Seth Alves
4a451e95dc
don't call release when off state is entered. don't attempt to unhook stylus as a stray child
2017-01-15 11:29:29 -08:00
Seth Alves
b8234ad75c
try a different way of keeping track of original parentIDs of grabbed entities
2017-01-15 10:16:28 -08:00
Seth Alves
e00814dd53
auto-end a near-grab if the parentID is changed to something else
2017-01-13 14:21:44 -08:00
Seth Alves
611a926894
if something dynamic is release and it's not moving, give it a little velocity so that it doesn't end up non-active in bullet
2017-01-12 13:45:03 -08:00
Seth Alves
c93d83dadd
update lasers when distance-scrolling a web entity/overlay
2017-01-10 16:41:07 -08:00
Dante Ruiz
0b3a7d90f1
removed committed code
2017-01-10 23:26:37 +00:00
Dante Ruiz
d0baa0e303
home button works with the stylus
2017-01-10 14:51:46 -08:00
Seth Alves
0fc1abc068
remember previous parentID in the script and try to put it back when releasing
2017-01-10 13:00:49 -08:00
