Brad Davis
eb0a8db0af
Merge pull request #8539 from hyperlogic/bug-fix/snappy-search-beam
...
When trigger is pulled, snap search beam to correct length instead of animating
2016-08-30 11:13:58 -07:00
Seth Alves
314b7617ac
Merge pull request #8543 from hyperlogic/bug-fix/entity-pointer-events
...
Bug fix for click events received by entity scripts
2016-08-29 17:57:56 -07:00
Anthony J. Thibault
e34aecde49
Bug fix for click events received by entity scripts
...
PointerEvent.isLeftButton should be true even on left button release events.
in a previous PR this behavior was changed. isLeftButton was used as a flag indicating the button state, which would be false on left button release events.
Because we have scripts that rely on the old behavior, I've changed it back to the original and introduced isPrimaryHeld properties instead.
2016-08-29 16:21:39 -07:00
James B. Pollack
cceae50b90
no more delete with backspace
2016-08-29 14:28:05 -07:00
Anthony J. Thibault
3ed11d2e5f
When trigger is pulled, snap search beam to correct length instead of animating.
...
This improves interaction on web browser tablets. Instead of the beam shooting
through the tablet and animating back to the surface, it starts at the correct length.
2016-08-29 13:22:57 -07:00
James B. Pollack
44d102d723
Merge pull request #8529 from imgntn/edit_fix
...
Fix some edit.js bugs
2016-08-26 15:43:14 -07:00
James B. Pollack
53a2281918
better
2016-08-26 11:57:15 -07:00
James B. Pollack
f6bd04780d
add a print to catch errors
2016-08-26 11:56:40 -07:00
James B. Pollack
4c63ad1ac8
code cleanup
2016-08-26 10:19:31 -07:00
James B. Pollack
ee190db5eb
some comments
2016-08-25 16:27:58 -07:00
James B. Pollack
9be073cc12
handle some more cases
2016-08-25 16:03:12 -07:00
samcake
9669234f9c
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-08-25 12:36:01 -07:00
Andrew Meadows
da387a958a
fix typo
2016-08-25 10:26:05 -07:00
Andrew Meadows
a0911d2b9d
add local scope wrappers to new default scripts
2016-08-25 09:04:06 -07:00
Andrew Meadows
fefe5e30ec
don't use globals and remove double definitions
2016-08-25 08:57:06 -07:00
Andrew Meadows
6f6a7bcc44
wrap default scripts with local scope
2016-08-25 08:57:06 -07:00
Andrew Meadows
3690b38c65
fix warnings found by eslint in defaultScripts.js
2016-08-25 08:56:22 -07:00
Andrew Meadows
13a12a2a13
Script.include() default scripts not Script.load()
2016-08-25 08:56:22 -07:00
Anthony J. Thibault
c234f1b65d
marketplace.js: merge fix for WebTablet.js path
2016-08-24 16:26:53 -07:00
Anthony J. Thibault
c2af948e25
Merge branch 'master' into feature/handheld-marketplace
2016-08-24 16:07:04 -07:00
James B. Pollack
d9ebad7976
Merge pull request #8372 from elisa-lj11/zip_project
...
Added Clara.io to the marketplace
2016-08-24 15:53:58 -07:00
Ryan Huffman
4897d721c3
Merge pull request #8505 from imgntn/json_editor
...
New Editor for UserData JSON
2016-08-24 15:49:32 -07:00
Anthony J. Thibault
fce207ba5d
eslint fix
2016-08-24 15:31:13 -07:00
James B. Pollack
af2fb5d7ed
beautify more html
2016-08-24 14:54:00 -07:00
James B. Pollack
5305ec7feb
html beautify
2016-08-24 14:51:15 -07:00
James B. Pollack
384c3dd543
cleanup and handle a bug when changing from normal text userdata to another field
2016-08-24 14:49:41 -07:00
James B. Pollack
45e3f926a1
removed unused prints and cleanup
2016-08-24 14:19:27 -07:00
Anthony J. Thibault
1939c6915a
Bug-fixes for marketplace toggling
2016-08-24 10:05:27 -07:00
James B. Pollack
2f4617cd5e
quiet some prints
2016-08-23 18:20:33 -07:00
James B. Pollack
a5054487ba
save on no selections, select another entity, etc
2016-08-23 18:18:43 -07:00
James B. Pollack
3abbc98857
save when focus on inputs
2016-08-23 15:48:04 -07:00
James B. Pollack
477ed88284
remove autosave, disable save button until change
2016-08-23 14:34:28 -07:00
Howard Stearns
89b00883dd
Merge pull request #8428 from highfidelity/discovery
...
Snapshot of Snapshot-Discovery to master
2016-08-23 14:32:10 -07:00
James B. Pollack
fb6fa687e8
in the right place... thanks howard!
2016-08-23 12:07:59 -07:00
James B. Pollack
fcf459645d
center after teleport
2016-08-23 12:02:57 -07:00
James B. Pollack
5166a33370
autosave after 1.5 s no changes
2016-08-23 11:53:20 -07:00
elisa-lj11
2d38d47bcc
separated clara.js from marketplace.js
2016-08-23 11:24:03 -07:00
elisa-lj11
cdc5dde40e
Merge remote-tracking branch 'highfidelity/master' into zip_project
2016-08-23 11:22:43 -07:00
elisa-lj11
137f795f29
Made clara marketplace its own .js
2016-08-23 11:22:01 -07:00
Anthony J. Thibault
b2dff8aa77
Easier to click buttons on web entities with shaky hand controllers
...
There is an angular and time dead spot on webEntity for scrolling vs clicking.
Currently, it's 150 ms and 3 degrees. See POINTER_PRESS_TO_MOVE_DELAY and POINTER_PRESS_TO_MOVE_DEADSPOT_ANGLE
* Fix for warnings when clicking on window.open() links in WebEntity
2016-08-23 10:19:49 -07:00
Anthony J. Thibault
c6ea64926c
Sensor space entity support
...
You can do this by parenting an entity to an avatar's -2 joint index.
This will mean that the entity will follow the avatar as it moves in the world, but
will not follow the avatar's position as it moves in sensor space. Essentially, this
gives you the ability to place objects in the user's physical room.
WebTablets now are located in this feature and no longer jitter.
2016-08-23 10:13:06 -07:00
Anthony J. Thibault
e7dd9c4478
handheld marketplace should work for hydras
2016-08-23 10:10:30 -07:00
Anthony J. Thibault
af2c31f29b
Renamed WebBuddy to WebTablet
2016-08-23 10:10:29 -07:00
Anthony J. Thibault
eafae1fcf3
Added tablet shell around web-buddy
2016-08-23 10:10:28 -07:00
Anthony J. Thibault
d607abc8f7
Add dpi to edit.js
...
Also, cap the maximum webEntity texture size to 4096
2016-08-23 10:10:27 -07:00
Anthony J. Thibault
31ed378dbf
Added dpi entity property for web-entities
2016-08-23 10:10:26 -07:00
Anthony J. Thibault
6704ae9ad4
Added dpi parameter to userData (this is temporary)
2016-08-23 10:09:17 -07:00
Anthony J. Thibault
9bafd82b2c
marketplace now pops up a marketplace web entity
2016-08-23 10:09:16 -07:00
Brad Hefta-Gaub
21bc06f154
Merge pull request #8335 from hyperlogic/feature/hand-controller-web-entity-integration
...
handControllerGrab and web entity input integration
2016-08-23 09:59:25 -07:00
James B. Pollack
6ec429fa0b
remove unused event listeners
2016-08-23 00:19:03 -07:00
