Zach Fox
373ef6c6ce
Progress?
2017-12-21 16:32:20 -08:00
Sam Gateau
0ff91e5926
Merge pull request #11952 from samcake/light
...
Exposing multi highlight and selection feature to js api
2017-12-12 01:09:15 +07:00
Zach Fox
006ea3342c
Merge pull request #11959 from zfox23/commerce_removeBuyEndpoint
...
Remove useless Wallet.buy() scripting endpoint
2017-12-11 09:33:18 -08:00
Sam Gateau
d1cd9f5c6b
adding correct support for the meta item fetch subItems for Overlays and specifically for ModelOverlay which fixes the highlight on Overlays
2017-12-11 02:21:09 -08:00
Sam Gateau
cc4b266647
Add names to objects of the selection, remove comments in shader and fix one more warning on linux
2017-12-11 00:31:54 -08:00
Sam Gateau
bb888f2d4c
Replace the name opacity for alpha
2017-12-10 23:07:06 -08:00
Sam Gateau
eec4e966a7
Fix the linux build and correct the name of the property Intensity to Opacity
2017-12-10 10:13:49 -08:00
Sam Gateau
429d54d65d
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-10 09:53:22 -08:00
Zach Fox
6f5028080b
Remove useless Wallet.buy() scripting endpoint
2017-12-08 18:23:23 -08:00
Clément Brisset
18b9118518
Merge pull request #11935 from birarda/bug/atp-drop-actual-files-only
...
only attempt default asset upload for local files
2017-12-08 17:18:49 -08:00
Stephen Birarda
3265eb42f1
only attempt default asset upload for local files
2017-12-08 14:45:27 -08:00
samcake
9a4f667059
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-08 08:50:33 -08:00
Seth Alves
a7a6dee8e0
Merge pull request #11950 from hyperlogic/bug-fix/hand-scaling
...
Fix for hand controller avatar scaling.
2017-12-08 07:17:59 -08:00
Seth Alves
91b2d8df8a
Merge pull request #11874 from luiscuenca/audioscope
...
Improve Audio Scope
2017-12-08 07:15:28 -08:00
Sam Gateau
d07cde3ecb
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-07 19:20:25 -08:00
samcake
7a9d77fed4
return a legit selectedItemsList js object as long as the list exist, only void if the list name is unknown
2017-12-07 17:53:30 -08:00
samcake
ace8e153c2
making sure the ID of an object in the Selection list is unique and more refined debugging
2017-12-07 17:45:40 -08:00
Anthony J. Thibault
542af47e9e
Fix for hand controller avatar scaling.
...
* Added getDomainMaxScale() and getDomainMinScale() to JS api.
* Updated scaleAvatar controller module to use this to prevent scaling past the limits.
* Made sure that getDomainMaxScale() getDomainMinScale() and getUnscaledEyeHeight are thread safe,
so that they can be invoked on the script thread.
* Added signals to Model class that can be used to let observers know when the Rig has finished initializing it's skeleton.
and also when the skeleton is no longer valid. These hooks are used to cache the unscaled eye height of the avatar.
2017-12-07 17:08:13 -08:00
Andrew Meadows
ed231fa4a1
Merge pull request #11894 from hyperlogic/bug-fix/flying
...
Improvements to HMD flying
2017-12-07 16:31:33 -08:00
Andrew Meadows
4691a98509
Merge pull request #11865 from hyperlogic/feature/domain-limited-height
...
domain uses min/max avatar height instead of min/max scale
2017-12-07 16:29:15 -08:00
samcake
6148458aeb
Workable state, need final clean up and testing
2017-12-07 16:04:08 -08:00
Sam Gondelman
e7d7e9abb8
Merge pull request #11947 from ctrlaltdavid/21634
...
Move mouse and hover slots out of Overlays API
2017-12-07 14:47:01 -08:00
Zach Fox
4b3c61178c
Merge pull request #11944 from zfox23/commerce_dontSendEmptyPublicKeys
...
Don't send commerce requests to backend if cached public keys is empty
2017-12-07 14:31:09 -08:00
Sam Gondelman
b05e1f8a32
Merge pull request #11847 from SamGondelman/overlayFlash
...
Cleanup Web3DOverlay and tablet home button
2017-12-07 14:06:56 -08:00
David Rowe
fd38b89f35
Move mouse and hover slots out of Overlays API
2017-12-08 10:58:52 +13:00
Anthony J. Thibault
47b52238d9
code review feedback
2017-12-07 10:49:23 -08:00
Anthony J. Thibault
68ad27a38d
Merge branch 'master' into bug-fix/flying
2017-12-07 10:28:13 -08:00
Anthony J. Thibault
fbcecbfc89
Merge branch 'master' into feature/domain-limited-height
2017-12-07 10:01:33 -08:00
Zach Fox
21077da41a
Don't send requests to backend if cached public keys is empty
2017-12-07 09:48:06 -08:00
Sam Gondelman
99c52f8602
coding standards
2017-12-07 09:38:14 -08:00
Brad Hefta-Gaub
4f8a2ea4be
Merge pull request #11934 from ctrlaltdavid/21630
...
Fix cloned 3D overlays' dimensions
2017-12-07 09:24:01 -08:00
Brad Hefta-Gaub
a0457d2b5e
Merge pull request #11856 from AndrewMeadows/sort-and-throttle-avatars
...
Use PrioritySortUtil for avatar updates from avatar-mixer
2017-12-07 09:22:52 -08:00
samcake
5f85e8e2cb
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-07 08:48:12 -08:00
Sam Gateau
0245a7005d
Adding the query of a particular selection content
2017-12-06 22:44:58 -08:00
samcake
5500a6d11c
More to come
2017-12-06 18:02:30 -08:00
John Conklin II
fffcf56904
Merge pull request #11892 from SamGondelman/snapshot
...
Expose Window.getDeviceSize()
2017-12-06 16:44:08 -08:00
samcake
1efddb8260
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-06 10:21:45 -08:00
samcake
1483195285
almost complete setup working, yeah
2017-12-05 18:27:53 -08:00
luiscuenca
8abe8b9879
move save logic to audioclient
2017-12-05 18:22:14 -08:00
David Rowe
cafebf6a7e
Fix Unix build warnings and tidy initializers
2017-12-06 13:38:42 +13:00
luiscuenca
20d6615417
emit only when recording
2017-12-05 16:13:44 -08:00
David Rowe
e074bd85f9
Fix shape of cloned shape overlay
2017-12-06 12:29:09 +13:00
David Rowe
2752dc7cac
Fix dimensions of cloned cube, sphere, shape, and model overlays
2017-12-06 12:28:55 +13:00
Zach Fox
d59c9bd73a
Fix gray/incorrect security image after relog
2017-12-05 10:27:40 -08:00
Sam Gateau
987246afb8
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-04 19:11:42 -08:00
samcake
de410b6833
I need a color editor
2017-12-04 17:29:01 -08:00
luiscuenca
390c59b45c
Change menu and minor fixes
2017-12-04 15:29:01 -08:00
samcake
9fceaad38b
Merging with master
2017-12-04 14:20:10 -08:00
Zach Fox
4c96fc2d9d
Merge pull request #11905 from zfox23/commerce_resetWalletBeforeCreation
...
Call reset() on Wallet before creating new wallet
2017-12-04 13:05:36 -08:00
Brad Hefta-Gaub
33adb0d76d
Merge pull request #11868 from ctrlaltdavid/21615
...
Add "size" as synonym for "dimensions" in model overlay property setter
2017-12-03 18:10:30 -08:00
