Seth Alves
8505d1eeed
avoid a bootstrap
2016-09-01 17:51:02 -07:00
Seth Alves
da35281941
don't assume collides-with-dynamic during a multi-grab
2016-09-01 16:57:23 -07:00
Seth Alves
b1eb4c361d
if a hand is disabled while holding something, release it
2016-09-01 15:02:41 -07:00
Seth Alves
dd7e25441c
include which hand in grab messages
2016-09-01 14:58:37 -07:00
Seth Alves
045042a9c6
don't disable grabbing when teleporting
2016-09-01 14:15:49 -07:00
Seth Alves
a35e527128
try to fix far-trigger
2016-09-01 11:46:08 -07:00
Seth Alves
53ba190ca6
don't do auto-release test unless the hand is equipping
2016-09-01 09:57:46 -07:00
Anthony J. Thibault
823420ae0a
Working web entity keyboard
...
* Missing many keys
* Does not dynamically appear and disappear
2016-08-31 17:57:13 -07:00
elisa-lj11
bebf9c5890
Added error feature when user tries to download a non fbx file
2016-08-31 17:46:35 -07:00
Seth Alves
47259ee053
find equip-points with controller position rather than hand
2016-08-31 16:52:46 -07:00
Seth Alves
21b4759b6d
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-08-31 10:27:44 -07:00
Ryan Downe Karpf
6c853ec77d
Merge pull request #8538 from AndrewMeadows/workaround-resolvePath
...
workaround for Script.resolvePath() bug
2016-08-31 08:59:14 -07:00
Andrew Meadows
12e6920a8d
fix syntax error
2016-08-31 08:15:00 -07:00
elisa-lj11
d16ef521f4
fixed merge conflicts from Howard's webview fix
2016-08-30 15:33:59 -07:00
elisa-lj11
aceddb0cf8
merge with james repo
2016-08-30 15:07:01 -07:00
Seth Alves
78f54a7f33
get rid of some jitter in equipped items. do a better job of deciding when something equipped has been torn-away
2016-08-30 14:39:11 -07:00
Seth Alves
617880479a
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-08-30 11:19:40 -07:00
Seth Alves
3a5f92d7a2
ignoreIK for equipping. change how auto-unequip searches
2016-08-30 11:16:13 -07:00
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
elisa-lj11
37cc50a14a
Merge remote-tracking branch 'highfidelity/master' into marketplaces_html
2016-08-30 10:45:26 -07:00
elisa-lj11
fa941e4a1b
Merge remote-tracking branch 'origin' into marketplaces_html
2016-08-30 10:42:56 -07:00
Seth Alves
f4eee8d480
Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers
2016-08-30 09:12:53 -07:00
elisa-lj11
f2e61aa504
added status bar to marketplace
2016-08-29 18:43:32 -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
James B. Pollack
2b2b2ecbac
caps
2016-08-29 17:44:33 -07:00
James B. Pollack
d3aad53e0e
cleanup
2016-08-29 17:43:32 -07:00
Andrew Meadows
2d8bb54b93
fix typo
2016-08-29 17:37:24 -07:00
James B. Pollack
2a12f2feae
marketplaces html
2016-08-29 17:27:39 -07:00
Andrew Meadows
b50d24fb00
don't use Script.resolvePath() in local functions
2016-08-29 17:11:29 -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
James B. Pollack
95c627aa71
dev
2016-08-29 14:24:36 -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
Anthony J. Thibault
dcd91d4398
removed debug flag
2016-08-29 12:04:48 -07:00
Anthony J. Thibault
0f42943bfb
Marketplace tablet is a bit larger and lower DPI.
...
Bug fix for grabbing/equipping large objects, they no longer will drop immediately
if your grab point is too far away from the grabbed entity position.
2016-08-29 11:55:04 -07:00
Seth Alves
be1332532f
disable debugging prints
2016-08-29 03:39:52 -07:00
Seth Alves
5daf334a0e
avoid extra grab-point spheres when resetting scripts
2016-08-27 20:42:03 -07:00
Seth Alves
d69e712bef
keep near-grab radius small but still allow large equip hotspots
2016-08-27 20:23:19 -07:00
Seth Alves
2a5d686a76
don't show grab-point sphere when near grabbing or equipping
2016-08-27 20:11:16 -07:00
Seth Alves
3355097bd0
handle another type of abandoned grab
2016-08-27 19:46:15 -07:00
Seth Alves
7dad303ce7
don't leave stray blue search sphere when near-grabbing
2016-08-27 19:25:05 -07:00
Seth Alves
765cd72e0e
fix code that prints relative offsets of an equipped entity after it's been adjusted by the other hand
2016-08-27 19:13:32 -07:00
Seth Alves
cfca32e0b4
fix code that notices and fixes an abandoned grab
2016-08-27 16:00:27 -07:00
Seth Alves
e4b2b7158f
hotspots with large radius work correctly, again
2016-08-27 09:30:26 -07:00
Seth Alves
76b72e32f0
Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers
2016-08-27 09:06:45 -07:00
David Rowe
06f0e76647
Merge branch 'master' into 21040
2016-08-27 14:31:28 +12:00
David Rowe
0d1daecf12
Provide count of textures for entity items
2016-08-27 12:13:34 +12:00
James B. Pollack
264176dac6
css
2016-08-26 14:21:32 -07:00
James B. Pollack
382cbd0a73
start
2016-08-26 14:16:37 -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
David Rowe
a0691a581c
Fix sense of column sort order indicators
2016-08-26 18:18:52 +12:00
David Rowe
f55d1f7ce7
Make new columns sortable
2016-08-26 17:56:23 +12:00
David Rowe
6de335e1b1
Column heading text and glyphs
2016-08-26 17:24:25 +12:00
David Rowe
1147adae78
Add columns in entity list for render performance information
2016-08-26 15:16:23 +12:00
Seth Alves
acb04a0bc9
don't add children of controller joints until we know our avatar ID
2016-08-25 19:09:10 -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
Seth Alves
7c5b8cb75d
send faux joints to the avatar-mixer
2016-08-25 15:21:29 -07:00
Seth Alves
948b4b7a15
in search, consider distance from grab-point rather than from avatar-hand when selecting the closest entity
2016-08-25 13:46:52 -07:00
Seth Alves
0783629cde
grab-point sphere is a child of controller joint, so it doesn't jitter
2016-08-25 13:31:07 -07:00
Seth Alves
cab30651d0
cleanups
2016-08-25 09:47:14 -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
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
Seth Alves
18852137b5
cleanups, avoid pop when grabbing
2016-08-23 17:06:53 -07:00
Seth Alves
dbe65df90b
merge from upstream
2016-08-23 16:42:02 -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
