Anthony J. Thibault
c2af948e25
Merge branch 'master' into feature/handheld-marketplace
2016-08-24 16:07:04 -07:00
Brad Hefta-Gaub
99ea180f09
Merge pull request #8495 from AndrewMeadows/faster-spherical-harmonics
...
speed up spherical harmonics calculation with minimal error
2016-08-24 15:57:42 -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
Brad Davis
211fb3f3df
Merge pull request #8520 from highfidelity/stable
...
Stable to Master
2016-08-24 12:20:29 -07:00
Chris Collins
2514587899
Merge pull request #8508 from highfidelity/RC-19
...
Beta Release 19 - Includes up to Developer Release 5298
2016-08-24 11:40:41 -07:00
Zach Pomerantz
6c99a33009
detect unset skybox
2016-08-24 11:03:07 -07:00
Chris Collins
8163fc785a
Merge pull request #8516 from zzmp/fix/default-skybox
...
fix default skybox behavior
2016-08-24 10:32:57 -07:00
Anthony J. Thibault
1939c6915a
Bug-fixes for marketplace toggling
2016-08-24 10:05:27 -07:00
James B. Pollack
48bab49210
in the right place... thanks howard!
2016-08-23 21:09:44 -07:00
James B. Pollack
c4c6b30440
center after teleport
2016-08-23 21:09:17 -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
Zach Pomerantz
c740b263a8
detect unset skybox
2016-08-23 15:16:26 -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
Ryan Downe Karpf
82041e4baa
Merge pull request #8514 from imgntn/center_hud
...
Center HMD Hud after teleport
2016-08-23 13:34:29 -07:00
Howard Stearns
3f30b23b78
Merge pull request #8496 from huffman/fix/address-bar-popup
...
Fix address bar being opened when moving between places on same domain
2016-08-23 13:08:31 -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
6be737993e
bug fix for sensorToWorld translation transmission
2016-08-23 10:13:07 -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
df17913801
Mipmap generation, trilinear,anisotropic filtering for OffscreenQmlSurface
2016-08-23 10:10:29 -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
Brad Hefta-Gaub
52cd222714
Merge pull request #8504 from zzmp/fix/argee
...
fix typo argee->agree
2016-08-23 09:52:43 -07:00
Howard Stearns
97c706f4cb
Merge pull request #8511 from howard-stearns/size-card-up
...
size activity card up
2016-08-23 09:48:03 -07:00
howard-stearns
7601876641
Scale the activity card back up to match the window being scaled down, so
...
that it covers the address bar.
2016-08-23 09:44:28 -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
Howard Stearns
7a9e832959
Merge pull request #8509 from ctrlaltdavid/discovery
...
Fix server card window scale
2016-08-22 21:35:07 -07:00
David Rowe
f7389dc059
Fix server card window scale
2016-08-23 16:28:32 +12:00
