MiladNazeri
bf61d8c7b3
Merge pull request #12115 from ctrlaltdavid/deprecations
...
Update JSDoc with some deprecations
2018-01-10 12:04:21 -08:00
vladest
075bcba49f
AddressBar trigger implemented. Fixed warnings on non existing context properties. Fixed warnings about non notifyable property
2018-01-09 23:48:40 +01:00
David Back
13c34b2d33
add AccountServices context
2018-01-08 17:37:48 -08:00
David Rowe
3d9d2a1859
Filed overlay property has been removed
2018-01-09 14:35:02 +13:00
David Back
43cd5586f3
nuke AccountScriptingInterface, rename GlobalServicesScriptingInterface to AccountServicesScriptingInterface
2018-01-08 17:25:58 -08:00
Dante Ruiz
4cf40554c0
don't call setQmlTabletRoot twice
2018-01-08 16:06:31 -08:00
David Rowe
ceb2d38103
Deprecate Overlays.getOverlayObject()
2018-01-09 12:45:12 +13:00
Zach Fox
0c38a5598f
Merge pull request #12085 from zfox23/commerce_fixHandControllerInspection
...
Fix bugs related to inspecting entities with hand controllers
2018-01-05 15:50:00 -08:00
Sam Gateau
91eb718074
Merge pull request #12091 from SamGondelman/overlayFix
...
Update model render items on texture load and fix no haze issue
2018-01-05 12:26:56 -08:00
David Back
b165eac6a0
Merge branch 'master' into mergeAccountGlobalServices
2018-01-05 10:54:59 -08:00
Melissa Brown
eb83c68d46
Merge pull request #12094 from ctrlaltdavid/resolution-removed
...
Delete web3d overlay "resolution" property JSDoc
2018-01-05 10:38:07 -08:00
Seth Alves
fd8b521c50
Merge pull request #12038 from ElderOrb/audio_name_conflict_fix
...
Audio name conflict fix (fix for https://github.com/highfidelity/hifi/issues/11963 )
2018-01-05 08:15:48 -08:00
David Rowe
d6a0457ee5
Delete web3d overlay "resolution" property JSDoc
2018-01-05 16:48:37 +13:00
Zach Fox
ea29d8bde0
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_fixHandControllerInspection
2018-01-04 15:41:27 -08:00
David Back
81f3590954
Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices
2018-01-04 13:17:07 -08:00
SamGondelman
6a19b0e0b6
update render items on texture load
2018-01-04 13:10:46 -08:00
Zach Fox
ff4f582c7d
Thanks Howard
2018-01-03 17:23:35 -08:00
David Back
6c8987d75f
Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices
2018-01-03 14:44:52 -08:00
David Rowe
7013f64714
Remove erroneous "filed" Overlay property
2018-01-03 10:37:37 +13:00
David Back
c620f3274c
merge
2017-12-22 16:28:29 -08:00
Seth Alves
96197e66bb
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-22 15:13:02 -08:00
Sam Gateau
a2c16ddf6a
Merge pull request #12026 from SamGondelman/burp3
...
Remove _model from ModelMeshPartPayload
2017-12-22 13:50:06 -08:00
Seth Alves
897b96d092
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-22 07:36:26 -08:00
Alexander Ivash
bd3a056f4e
rename exposed to QML "Audio" context object to "AudioScriptingInteface" to avoid naming conflict
...
note: I'm not sure what exactly causes naming conflict - importing QtMultimedia in ForceLoad.qml, or the fact of existance of Audio.qml, but starting with Qt 5.10.0 'Audio' already exists in global scope
2017-12-21 20:03:38 +00:00
humbletim
a146b778f7
support additional .extraInfo for ray intersections
2017-12-21 12:35:13 -05:00
SamGondelman
bd06dc6443
cleaning up modelmeshpartpayload
2017-12-20 11:00:14 -08:00
Brad Davis
9f7b6f543d
Merge remote-tracking branch 'upstream/master' into HEAD
2017-12-18 11:17:07 -08:00
Zach Fox
ed5082e5d4
Merge pull request #11974 from birarda/feat/staging-env-or-cl
...
allow custom metaverse URL to be used with env var
2017-12-13 17:29:45 -08:00
Zach Fox
3764445272
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-13 14:12:08 -08:00
Sam Gateau
4e68663cfc
Merge pull request #11970 from SamGondelman/circleFix
...
Fix Circle3DOverlays uninitialized member variables, cloning, getProperty
2017-12-14 00:30:18 +07:00
Stephen Birarda
139976d8bb
allow staging METAVERSE_SERVER_URL to be toggled by env
2017-12-12 16:22:08 -08:00
David Rowe
92be33da31
Web3d overlay's "resolution" property has been removed
2017-12-13 11:40:44 +13:00
David Rowe
650e7e1922
Document that getProperty() only works for 3D overlays
2017-12-13 10:34:33 +13:00
SamGondelman
16f545a9e8
fix circle3d overlays
2017-12-12 13:25:47 -08:00
David Rowe
578c42b4ea
Merge branch 'master' into 21624
2017-12-13 09:41:09 +13:00
Seth Alves
2cd64ccd2c
merge from upstream
2017-12-11 10:14:30 -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
Zach Fox
a81a981676
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-08 09:44:52 -08:00
Sam Gateau
d07cde3ecb
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-07 19:20:25 -08:00
Seth Alves
40412b80c6
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-07 17:03:04 -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
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
Zach Fox
b2bafed2bb
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-07 11:21:24 -08:00
David Back
46d265e3f1
Merge branch 'master' of https://github.com/highfidelity/hifi into mergeaccountglobalservices
2017-12-07 10:13:55 -08:00
Sam Gondelman
99c52f8602
coding standards
2017-12-07 09:38:14 -08:00
David Rowe
0146eca315
JSDoc review
2017-12-07 10:09:05 +13:00
David Rowe
cafebf6a7e
Fix Unix build warnings and tidy initializers
2017-12-06 13:38:42 +13: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
Seth Alves
73b21f7cd5
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-05 06:55:10 -08:00
David Back
3873a8f91e
Merge branch 'master' into mergeAccountGlobalServices
2017-12-04 14:46:59 -08:00
samcake
9fceaad38b
Merging with master
2017-12-04 14:20:10 -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
Brad Hefta-Gaub
314265fa86
Merge pull request #11891 from ctrlaltdavid/21625
...
Add missing line3d overlay property getters and setters
2017-12-02 12:52:44 -08:00
Seth Alves
b590cd5b89
avatar-entities which are children of an avatar will scale with the avatar
2017-12-02 09:31:43 -08:00
David Rowe
b9ad15b19e
Add missing line3d overlay property getters
2017-11-29 11:03:16 +13:00
David Rowe
3956b3b953
Fix missing line3d overlay property setter overrides of base class
2017-11-29 10:41:51 +13:00
David Rowe
76c934f012
Add missing line3d overlay property setters
2017-11-29 10:41:21 +13:00
David Rowe
cd2922a560
Merge branch '21602' into 21624
...
# Conflicts:
# tools/jsdoc/plugins/hifi.js
2017-11-28 17:04:59 +13:00
David Rowe
97b4dcaa5c
Web3DOverlay's resolution property is deprecated
2017-11-28 16:31:13 +13:00
David Rowe
a6937d7c8b
Add Overlays API examples JSDoc
2017-11-28 16:30:25 +13:00
David Rowe
92493f14d7
Miscellaneous JSDoc fixes
2017-11-28 16:30:09 +13:00
SamGondelman
52039e022b
merge from master, get rid of resolution in RayPick
2017-11-27 13:11:35 -08:00
David Rowe
4b5aa9bdec
Add Overlays API functionality JSDoc
2017-11-25 16:18:14 +13:00
David Rowe
3535071178
Add "size" as synonym for "dimensions" in model overlay property setter
2017-11-22 21:04:04 +13:00
howard-stearns
16d6d8a361
Merge branch 'master' of https://github.com/highfidelity/hifi into MandatoryMania-ECWallet
2017-11-21 16:28:29 -08:00
howard-stearns
ca80c9b764
Merge branch 'ECWallet' of https://github.com/MandatoryMania/hifi into MandatoryMania-ECWallet
2017-11-21 16:28:08 -08:00
samcake
84ff40c717
Merging with master
2017-11-21 14:12:47 -08:00
ZappoMan
b44ced4c21
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-20 17:19:18 -08:00
Howard Stearns
4018b99118
Merge pull request #11848 from zfox23/commerce_flipTheSwitch
...
Turn Commerce on by default!
2017-11-20 16:18:53 -08:00
David Rowe
8e647fb32c
Disable unused Overlays.panelDeleted signal
...
#if'd out to match the other panel code that is disabled.
2017-11-21 11:00:36 +13:00
Dante Ruiz
76935c1457
fixing merge conflict
2017-11-20 09:51:10 -08:00
samcake
a74372b233
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-11-20 09:26:29 -08:00
ZappoMan
04ee1adabd
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-19 14:40:31 -08:00
Brad Hefta-Gaub
e4a03a7d12
Merge pull request #11840 from ctrlaltdavid/21609
...
Fix typo in overlay "filled" property
2017-11-18 14:31:11 -08:00
David Rowe
b4bc8da20a
Document deprecation of "filed" property
2017-11-19 08:44:00 +13:00
Sam Gateau
44f63ef802
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-11-18 08:23:59 -08:00
SamGondelman
393ad0079c
home button is circle instead of sphere, fixed positioning, fix lasers on tablet
2017-11-17 15:24:21 -08:00
Zach Fox
f47f259816
Turn Commerce on by default
2017-11-17 15:12:49 -08:00
SamGondelman
42d047c572
merge with master
2017-11-17 11:52:34 -08:00
SamGondelman
e38b0ab6b8
make web overlays match web entities more, remove resolution
2017-11-17 11:50:24 -08:00
H Q
21a28827c9
Remaining coding style changes, other small fixes
2017-11-17 07:59:52 -08:00
David Rowe
a33162d7ff
Fix typo in Base3DOverlay "filled" property
2017-11-17 21:07:43 +13:00
David Rowe
12e005f215
Initial update of Overlays JSDoc
2017-11-17 17:59:11 +13:00
samcake
08dd76c9a8
changes of the day
2017-11-16 17:52:12 -08:00
H Q
14890495a2
Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet
...
Syncing
2017-11-16 12:38:45 -08:00
Sam Gateau
3a0b2651d5
Keep spinning on the bridge between js interface and the highlighting feature
2017-11-16 00:55:51 -08:00
SamGondelman
3274c41aeb
Merge remote-tracking branch 'upstream/pointers' into ui
2017-11-15 17:45:45 -08:00
Dante Ruiz
dd8ea759d4
fix tablet rez for commence button
2017-11-15 15:48:39 -08:00
SamGondelman
7eb22b372f
merge with master
2017-11-15 14:35:30 -08:00
SamGondelman
8730a26d20
use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup, documentation
2017-11-15 14:12:16 -08:00
Brad Davis
26a745be6f
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
2017-11-15 11:59:06 -08:00
John Conklin II
8592f3fd4d
Merge pull request #11764 from luiscuenca/case7587
...
7587 Lasers resize with avatar
2017-11-15 09:31:45 -08:00
H Q
0db9e876d6
Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet
2017-11-14 15:40:44 -08:00
H Q
44f2c92d30
Final ECSDA and nonce modifications for this dev cycle
2017-11-14 15:40:29 -08:00
SamGondelman
60db24f2d3
merge with master
2017-11-13 14:36:24 -08:00
SamGondelman
2fb1981c4a
merge with master
2017-11-13 14:34:39 -08:00
SamGondelman
2c0272f304
(mostly?) fix touch events
2017-11-13 12:58:31 -08:00
Brad Davis
5cf9c1bb33
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
2017-11-13 10:48:21 -08:00
