David Rowe
5e842843c6
Set alphabetic/numeric keyboard per field entered
2016-09-30 11:54:32 +13:00
Menithal
a6040197eb
Fixed HandcontrollerGrab unequip.
...
Will now use deltaTime and a second instead of instantly disconnecting on
if more than 0.1 off. This is to avoid accidental disconnection due to
acceleration and latency
2016-09-29 22:24:07 +03:00
David Rowe
e3be34528f
Fix keyboard flickering when select entities
...
Fix entities list footer count of selected entities in the process.
2016-09-29 16:53:20 +13:00
David Rowe
8e44096981
Fix last entities properties not scrolling when keyboard raised
2016-09-29 15:59:24 +13:00
David Rowe
f8572096b1
Merge branch 'master' into 21055
2016-09-28 20:00:04 +13:00
David Rowe
b60f649e0a
Scroll HTML window if necessary when raise keyboard
2016-09-28 19:27:16 +13:00
David Rowe
a94d77ee12
Raise and lower keyboard in entities editor
2016-09-28 17:57:53 +13:00
Zach Pomerantz
247fad5bfe
clean up jitter stats
2016-09-27 17:24:34 -07:00
Zach Pomerantz
c391c26805
improve contrast by changing plotperf opacity
2016-09-27 10:29:35 -07:00
Zach Pomerantz
6cee473376
format and color audio stats
2016-09-27 10:22:32 -07:00
Zach Pomerantz
239b0c2181
fix PlotPerf reset
2016-09-26 19:27:03 -07:00
Zach Pomerantz
f40e46ac92
limit percentages to two decimals
2016-09-26 19:26:54 -07:00
Brad Hefta-Gaub
f7228993a5
go into away if the application starts in HMD mode but it's not mounted
2016-09-26 17:29:37 -07:00
Zach Pomerantz
6035374004
add graphs to audio stats
2016-09-26 16:37:11 -07:00
Zach Pomerantz
e6c0baa1ff
remake audio stats in qml
2016-09-26 15:35:45 -07:00
Brad Hefta-Gaub
c4a80996d5
fix away HMD unmouted logic
2016-09-23 16:17:28 -07:00
Seth Alves
785e187a27
edit.js uses notification.js to indicate errors instead of a modal dialog. in HMD, notification messages no longer jitter around
2016-09-21 11:39:25 -07:00
Brad Hefta-Gaub
2b01c60a55
Merge pull request #8615 from davidkelly/dk/1264
...
Make the equip sphere emissive
2016-09-19 16:33:55 -07:00
Anthony J. Thibault
aefe224215
Fix for jittery far-grab at low update rates
...
Clamp the blendFactor used to smooth out the motion of the far-grabbed object.
This prevents the newTargetPosition from over shooting it's goal.
2016-09-19 10:51:46 -07:00
David Kelly
22d80914e2
whitespace
2016-09-16 14:17:44 -07:00
David Kelly
ade17e6456
PR feedback
2016-09-16 14:15:14 -07:00
David Kelly
2ddd46f30b
Switch to the cool looking model instead
2016-09-16 10:56:59 -07:00
David Kelly
1acfe017e1
Make the equip sphere emissive
...
maybe this will make it visible in low ambient light situations?
2016-09-15 17:12:35 -07:00
Chris Collins
84ffda5281
Merge pull request #8608 from huffman/fix/particle_explorer
...
Fix eventBridgeLoader path in particle explorer
2016-09-15 16:51:41 -07:00
Ryan Huffman
6a32ef29dc
Fix eventBridgeLoader path in particle explorer
2016-09-15 13:07:00 -07:00
howard-stearns
03a8af76e3
don't do hand-controller edit object-selection when pointed at a HUD
...
element
2016-09-14 12:02:33 -07:00
Seth Alves
e5e9bb0052
Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments
2016-09-14 11:28:10 -07:00
David Rowe
fa0aeb4563
Display render info values only when valid provided
2016-09-13 13:03:47 +12:00
David Rowe
d61e4c5c11
Display textures size in MB
2016-09-13 10:52:19 +12:00
David Rowe
fe8b3b4d0d
Merge branch 'master' into 21040
2016-09-13 09:12:47 +12:00
David Rowe
44282499c5
New glyph for "has transparent"
2016-09-10 14:37:09 +12:00
David Rowe
a06f49f791
Fix footer entities count not being updated when change filter value
2016-09-10 11:14:23 +12:00
David Rowe
487cb7d893
Use findInFrustum in entities list and filter results per search radius
2016-09-09 18:58:38 +12:00
Brad Hefta-Gaub
b56ad737d4
Merge pull request #8567 from hyperlogic/feature/tablet-ui-foundation
...
Web Entities Virtual Keyboard + Event Bridge support
2016-09-08 18:36:46 -07:00
Seth Alves
8c45c115b8
Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments
2016-09-08 17:02:40 -07:00
Seth Alves
ecb0669972
try to keep far grab from getting stuck if the entity is brought very near to the grab-point
2016-09-08 17:02:29 -07:00
Seth Alves
0f98c51d89
distance-grabbed things collide with static entities
2016-09-08 16:13:22 -07:00
Clément Brisset
4437b1b5d6
Merge pull request #8573 from Atlante45/master
...
Fix toolBar.js relative path
2016-09-08 14:22:18 -07:00
Seth Alves
9e99cc1f78
fix mod.js
2016-09-08 07:35:52 -07:00
David Rowe
28cfca993f
Add and wire up "search in view" JavaScript API stub
2016-09-08 14:58:48 +12:00
David Rowe
a4b5f5395d
Add "in view" button
2016-09-08 12:56:41 +12:00
Seth Alves
9c96ffc9cb
don't show grab-point spheres if controller poses aren't valid
2016-09-07 16:31:02 -07:00
David Rowe
7d6ab77c16
Merge branch 'master' into 21040
2016-09-08 11:30:19 +12:00
Seth Alves
746d0cd91c
get various hand lasers to all line up with grab-point sphere
2016-09-07 16:10:37 -07:00
Seth Alves
b45181ea92
don't back up pick-ray from hand
2016-09-07 13:32:26 -07:00
Anthony J. Thibault
7b4b98971e
Merge branch 'master' into feature/tablet-ui-foundation
2016-09-07 12:49:13 -07:00
Anthony J. Thibault
9f0550ea7e
Raised dpi of WebTablet to fit 480 width keyboard
2016-09-07 10:59:54 -07:00
Seth Alves
332c2127b4
Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments
2016-09-07 09:53:26 -07:00
Anthony J. Thibault
dc0d0c2d5c
Merge branch 'master' into feature/tablet-ui-foundation
2016-09-07 09:49:55 -07:00
Seth Alves
5303488f52
Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments
2016-09-07 09:40:51 -07:00
David Rowe
db30e36b3b
Implement expand/collapse action to show/hide table columns
2016-09-07 19:11:53 +12:00
David Rowe
b372f82f78
Ensure that the expand/collapse icon is always visible
2016-09-07 17:09:56 +12:00
Ken Cooke
9457d49103
Merge branch 'master' of https://github.com/highfidelity/hifi into low-latency-audio
2016-09-06 20:56:20 -07:00
David Rowe
dba3efd857
Add expand/collapse extra info toggle icon to entities table header
2016-09-07 15:04:27 +12:00
SamGondelman
88d0aa3737
removed showButtonDown, which didn't exist
2016-09-06 17:36:55 -07:00
Atlante45
e7ebcc0467
Fix toolBar.js relative path
2016-09-06 17:08:23 -07:00
Seth Alves
616b094111
experimenting with position of grab sphere
2016-09-06 16:16:09 -07:00
David Rowe
156866f835
Fix "has script" entities list icon
2016-09-07 11:12:04 +12:00
David Rowe
83593087b6
Resize table headers after filter value changed
2016-09-07 11:08:06 +12:00
Seth Alves
34e4b4ae19
move haptic-pulse for when grab-point enters a grabbable entity to the right section of code
2016-09-06 15:37:37 -07:00
Seth Alves
215fd4ddfd
fix grab-point sphere for right hand
2016-09-06 15:15:46 -07:00
David Rowe
f83599f855
Merge branch 'master' into 21040
2016-09-07 10:08:51 +12:00
Seth Alves
43c98b3f1e
attempt to avoid a very-still far-grab leaving something non-dynamic in bullet upon release. adjust position of grab-point sphere
2016-09-06 14:42:53 -07:00
Seth Alves
37db1cba26
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-09-06 09:38:44 -07:00
David Rowe
c44bd902c3
Display render info values only if provided
2016-09-03 13:07:40 +12:00
Andrew Meadows
0a55afda69
Merge pull request #8554 from elisa-lj11/marketplaces_html
...
Include a marketplace status bar and access to "marketplace" of marketplaces
2016-09-02 17:12:05 -07:00
David Rowe
980df19db1
Merge branch 'master' into 21040
...
Conflicts:
libraries/entities/src/EntityItemProperties.cpp
2016-09-03 11:38:27 +12:00
Seth Alves
b8b1127d55
merge from upstream
2016-09-02 15:11:21 -07:00
Brad Hefta-Gaub
861cf468a3
Merge pull request #8547 from imgntn/save_default_scripts_settings
...
Remember setting for 'debug defaultScripts.js'
2016-09-02 13:08:19 -07:00
Anthony J. Thibault
0128d7c61b
Merge branch 'master' into feature/tablet-ui-foundation
2016-09-02 12:16:25 -07:00
Anthony J. Thibault
3d5e8fc213
First pass of keyboard raising and lowering
2016-09-02 12:15:30 -07:00
Brad Hefta-Gaub
8ec5798b7a
Merge pull request #8548 from samcake/blue
...
Exposing GPU & Batch running time to Engine gpu jobs
2016-09-02 09:31:09 -07:00
Brad Hefta-Gaub
cf242eca9f
Merge pull request #8537 from hyperlogic/feature/larger-marketplace-tablet
...
Marketplace tablet is a bit larger and lower DPI.
2016-09-02 08:45:29 -07:00
Seth Alves
9ef03b1205
avoid having auto-unequip code trigger during a teleport
2016-09-01 19:13:08 -07:00
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
James B. Pollack
a8a9577866
actually remove the math.random
2016-08-31 21:14:50 -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
288ba96795
reverted default scripts to load marketplace.js
2016-08-31 17:47:16 -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
James B. Pollack
2acf316d1c
fix
2016-08-31 13:45:58 -07:00
Ken Cooke
72535ce237
Fix reverbTest.js which was broken due to missing helper script
2016-08-31 13:09:06 -07:00
James B. Pollack
193065eb05
remove auto toggle
2016-08-31 12:36:28 -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
samcake
2a5ee5d6b1
Fixing the unit for the cpuTIme feed and the titles for the GPU PERf Plots
2016-08-30 14:28:52 -07:00
James B. Pollack
e4bdc2e86c
cleanup
2016-08-30 14:17:27 -07:00
James B. Pollack
a6a834f2c7
remember and work on toggle
2016-08-30 13:58:28 -07:00
samcake
c553e5f2fe
fine tune the scripts for proper presentation of the timing values
2016-08-30 13:57:47 -07:00
samcake
faef8a9930
Adding the timing for GPU support with a simpelr JobConfig
2016-08-30 12:22:21 -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
99acc9045d
disable defaultScripts.js debugging by default
2016-08-29 17:15:01 -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
Andrew Meadows
b1d472c9ba
workaround for Script.resolvePath() bug
2016-08-29 12:28:59 -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
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
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
Seth Alves
3b278adba3
Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers
2016-08-25 17:28:18 -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
samcake
9669234f9c
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-08-25 12:36:01 -07:00
Seth Alves
7b1db2c8a9
Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers
2016-08-25 10:41:53 -07:00
Andrew Meadows
da387a958a
fix typo
2016-08-25 10:26:05 -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
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
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
James B. Pollack
d9a39553bd
style edits and saved message
2016-08-23 00:14:53 -07:00
James B. Pollack
d0a25e7783
fix switching entities
2016-08-22 23:51:35 -07:00
Seth Alves
6c80a35c4b
Merge pull request #8477 from sethalves/fix-grab-ignore-ik-1
...
ignoreIK flag on action-grabbable objects works again
2016-08-22 18:48:39 -07:00
James B. Pollack
e2a6c08f19
cleanup prints
2016-08-22 17:44:22 -07:00
James B. Pollack
4b61cc9f5f
new user data editor
2016-08-22 17:30:08 -07:00
howard-stearns
bc90b0bc43
pr review
2016-08-22 16:09:09 -07:00
elisa-lj11
2d2cb45c5d
Merge remote-tracking branch 'highfidelity/master' into zip_project
2016-08-22 16:05:16 -07:00
