vladest
bca903a6df
Fix build
2018-01-31 23:31:18 +01:00
vladest
2a5b3d97fb
AddressBar trigger implemented. Fixed warnings on non existing context properties. Fixed warnings about non notifyable property
2018-01-31 23:05:38 +01:00
Seth Alves
a49097789a
Revert "AddressBar trigger implemented. Fixed warnings on non existing contex…"
2018-01-31 13:32:19 -08:00
Seth Alves
0df4ae02fc
Merge pull request #12126 from vladest/addressbar_close_fix
...
AddressBar trigger implemented. Fixed warnings on non existing contex…
2018-01-31 11:26:05 -08:00
Brad Hefta-Gaub
f3dfad6c59
Merge pull request #12155 from ctrlaltdavid/21689
...
Remove unused "anchor" Overlays property
2018-01-18 15:04:41 -08:00
David Back
92c0fd4877
Merge pull request #12116 from dback2/deleteAccount_renameGS_addAS
...
Merge Account & GlobalServices follow-up
2018-01-17 10:50:54 -08:00
David Rowe
9b0fb19cfa
Remove unused "anchor" Overlays property
2018-01-12 12:16:58 +13:00
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 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
David Rowe
d6a0457ee5
Delete web3d overlay "resolution" property JSDoc
2018-01-05 16:48:37 +13:00
David Back
c620f3274c
merge
2017-12-22 16:28:29 -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
Zach Fox
3764445272
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-13 14:12:08 -08:00
David Rowe
92be33da31
Web3d overlay's "resolution" property has been removed
2017-12-13 11:40:44 +13:00
David Rowe
578c42b4ea
Merge branch 'master' into 21624
2017-12-13 09:41:09 +13:00
Zach Fox
a81a981676
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-08 09:44:52 -08: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 Rowe
0146eca315
JSDoc review
2017-12-07 10:09:05 +13:00
David Back
3873a8f91e
Merge branch 'master' into mergeAccountGlobalServices
2017-12-04 14:46:59 -08: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
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
samcake
84ff40c717
Merging with master
2017-11-21 14:12:47 -08:00
ZappoMan
04ee1adabd
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-19 14:40:31 -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
SamGondelman
e38b0ab6b8
make web overlays match web entities more, remove resolution
2017-11-17 11:50:24 -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
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
7bf1b176d7
Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem
2017-11-10 14:21:24 -08:00
SamGondelman
224386317d
send overlay visibility through transaction
2017-11-09 12:14:40 -08:00
SamGondelman
7d420f5242
isLeftHand, isRightHand, isMouse
2017-11-06 12:29:21 -08:00
SamGondelman
dd4275430b
fix hover events, working on HUD events
2017-11-02 17:48:37 -07:00
ZappoMan
afaad5fcd7
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-02 13:39:51 -07:00
Bradley Austin Davis
55d819d7e3
Merge pull request #11699 from SamGondelman/ui
...
Pointers generate PointerEvents (WIP)
2017-10-31 10:01:15 -07:00
SamGondelman
76eb4c656e
fix multi-touch and keyboard on web entities
2017-10-30 16:41:59 -07:00
ZappoMan
f63db42c0e
migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation
2017-10-28 10:14:25 -07:00
ZappoMan
a7a0f03ede
rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition()
2017-10-27 18:39:17 -07:00
samcake
8a3b1a20cc
merge with upstream
2017-10-27 14:57:25 -07:00
Brad Hefta-Gaub
d61ede2a4e
Merge pull request #11697 from ElderOrb/FB8211
...
8211 Add very short haptic feedback when highlighting letters on keyboard
2017-10-27 13:26:41 -07:00
beholder
f6fa85fed2
adjust to coding standards
2017-10-27 01:25:25 +03:00
samcake
b9112024b8
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-26 14:27:23 -07:00
