Commit graph

783 commits

Author SHA1 Message Date
Kasen IO
ad2c3f08e6 Update further links. 2020-07-10 18:50:58 -04:00
Robert Adams
3878ad6df6 Move metaverse server URL info into NetworkingConstants.h (for C++
code) and into shared.js (for JS code).
Modify references to the metaverse server from constants to
    references to the new central definitions.
2020-06-13 07:04:58 -07:00
kasenvr
7996698c8f
Merge branch 'master' into fix/other-renamings 2020-05-18 15:10:32 -04:00
David Rowe
ffeb37e7aa Merge remote-tracking branch 'hifi/master' into merge-hifi-master
# Conflicts:
#	CMakeLists.txt
#	README.md
#	cmake/externals/glad32es/CMakeLists.txt
#	cmake/externals/glad41/CMakeLists.txt
#	cmake/externals/glad45/CMakeLists.txt
#	cmake/externals/polyvox/CMakeLists.txt
#	cmake/externals/quazip/CMakeLists.txt
#	cmake/externals/vhacd/CMakeLists.txt
#	cmake/init.cmake
#	cmake/ports/hifi-deps/CONTROL
#	cmake/ports/sdl2/CONTROL
#	cmake/ports/sdl2/disable-hidapi-for-uwp.patch
#	cmake/ports/sdl2/enable-winrt-cmake.patch
#	cmake/ports/sdl2/fix-arm64-headers.patch
#	cmake/ports/sdl2/fix-x86-windows.patch
#	cmake/ports/sdl2/portfile.cmake
#	cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake
#	cmake/ports/tbb/portfile.cmake
#	hifi_vcpkg.py
#	interface/src/avatar/MyAvatar.h
#	libraries/avatars-renderer/src/avatars-renderer/Avatar.h
#	libraries/avatars/src/AvatarData.h
#	libraries/entities-renderer/src/RenderableEntityItem.h
#	libraries/entities/src/EntityItem.cpp
#	libraries/entities/src/EntityItem.h
#	libraries/fbx/src/GLTFSerializer.cpp
#	libraries/graphics-scripting/src/graphics-scripting/Forward.h
#	libraries/networking/src/AddressManager.cpp
#	libraries/networking/src/DomainHandler.h
#	libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
#	libraries/render-utils/src/HighlightEffect.cpp
#	libraries/render-utils/src/MeshPartPayload.cpp
#	libraries/render-utils/src/Model.cpp
#	libraries/render-utils/src/RenderShadowTask.cpp
#	libraries/script-engine/src/WebSocketClass.cpp
2020-04-09 16:46:27 +12:00
Kasen IO
115c40bd54 Lots of renamings, more to come. 2020-04-07 04:56:02 -04:00
Kasen IO
08ec9ef3b7 Various URL updates + window title update. 2020-02-05 15:25:51 -05:00
e5dd23b922
Merge pull request #33 from kasenvr/feature/metaverse-url-switching
Ability to change Metaverse API from setting
2020-01-14 18:40:04 -06:00
David Rowe
ec1e6bc7d3 Merge branch 'DOC-55-C' into api-docs 2020-01-14 18:04:32 +13:00
Dale Glass
dabda684b8 Don't bind action if QML menu can't be added.
Otherwise eventually methods will be called on a NULL pointer.
Fixes crash related to QMetaObject::invokeMethod.
2019-12-26 01:04:53 +01:00
David Rowe
2dd981493e Update classes' JSDoc per @hideconstructor 2019-12-23 14:13:48 +13:00
Thijs Wenker
0ac8c178db
fix spacing 2019-12-20 12:43:43 +01:00
Kasen IO
c34cd996df change Metaverse API from setting 2019-12-20 11:39:05 +01:00
David Rowe
a04e57d82d Miscellaneous JSDoc fixes noticed in passing 2019-12-19 11:38:17 +13:00
David Rowe
7cf216f114 Add warning about EventBridge not immediately availble in TabletProxy 2019-12-18 07:15:34 +13:00
David Rowe
3232f89a33 OverlayWindow and OverlayWebWindow JSDoc 2019-12-13 10:13:10 +13:00
David Rowe
deb60f66d0 Update API status 2019-12-10 09:20:12 +13:00
David Rowe
b7af7fe1ab OffscreenFlags JSDoc 2019-12-10 09:14:59 +13:00
Sam Gateau
048626ba9a
Merge pull request #15278 from kitely/clear-more-disk-caches
case 21983: Clear more disk caches
2019-11-18 11:11:26 -08:00
Rebecca Stankus
3f19bbfcac Changed variable to not be magic number 2019-11-01 11:46:01 -07:00
Rebecca Stankus
e5fcc577f0 Changed default interface window size on mac 2019-11-01 10:47:12 -07:00
David Rowe
116510225a Typo 2019-10-24 09:10:26 +13:00
David Rowe
9d905dbec4 Merge branch 'master' into DOC-126 2019-10-24 09:05:41 +13:00
Zach Fox
341abb8185 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-14 12:36:35 -07:00
Zach Fox
a1b6b0af35
Merge pull request #16336 from ctrlaltdavid/DEV-1867
DEV-1867: Fix toolbarTest.js
2019-10-14 11:50:59 -07:00
David Rowe
d4c5a20c4f Tablet JSDoc fixes 2019-10-12 11:42:49 +13:00
David Rowe
94f9e35704 Toolbars JSDoc 2019-10-12 11:41:53 +13:00
David Rowe
f944604120 Deprecate Toolbar API's addButton() and removeButton() methods 2019-10-12 10:10:27 +13:00
Zach Fox
19acd76854 Modify InteractiveWindow positions in C++ instead of JS, resulting in huge speedup 2019-10-10 15:48:40 -07:00
Brad Davis
960cab9994 Qt 5.13 warnings & fixes 2019-10-08 15:40:13 -07:00
Shannon Romano
7aa28f29d2
Merge pull request #16224 from ctrlaltdavid/DOC-111
DOC-110, DOC-111, DOC-167: JSDoc fixes and tidying
2019-10-08 10:01:21 -07:00
Shannon Romano
e1de615cbe
Merge pull request #16261 from ctrlaltdavid/BUGZ-491
BUGZ-491: Fix tablet.loadWebScreenOnTop()
2019-10-08 09:05:33 -07:00
David Rowe
f224832d27 Merge branch 'master' into DOC-111 2019-10-08 20:44:13 +13:00
David Rowe
3b9884c76f Fix build warning 2019-09-28 11:42:25 +12:00
David Rowe
3d667b4a21 Deprecate tablet.gotoWebScreen()'s loadOtherBase parameter 2019-09-28 11:30:57 +12:00
David Rowe
c79581e93f Update JSDoc 2019-09-28 10:19:29 +12:00
David Rowe
bbf6d3f595 Remove unused code 2019-09-28 10:19:00 +12:00
David Rowe
2e2d3df26f Fix loadWebScreenOnTop() 2019-09-28 09:38:19 +12:00
David Rowe
e9d138a961 Rename internal function to distinguish signatures and reflect function 2019-09-28 09:29:27 +12:00
David Rowe
57649811d7 Update JSDoc of TabletProxy internal functions 2019-09-27 09:17:48 +12:00
amer cerkic
9daf670678 Merge branch 'master' into dev469 2019-09-24 15:38:07 -07:00
dante ruiz
fe2a4c3600 fix fix-snap-html-issue 2019-09-19 18:20:08 -07:00
David Rowe
605d272392 Merge branch 'master' into DOC-111 2019-09-20 10:25:21 +12:00
David Rowe
d5e08d19e3 Fix JSDoc for miscellaneous white space issues 2019-09-20 08:17:24 +12:00
amerhifi
cc11bd9552 created new AudioWrapper 2019-09-13 11:24:41 -07:00
danteruiz
8491a37923 fixing WebEntities html 2019-09-13 09:57:51 -07:00
dante ruiz
b969a9b1e0 fix tablet html loading errors 2019-09-10 16:50:50 -07:00
Brad Davis
0511f87bad BUGZ-1398: Tablet access to local HTML https://youtu.be/7EWQOeQf32U 2019-09-05 11:43:43 -07:00
Brad Davis
428a58710d BUGZ-1365: Ensure that by default web views can't access local content 2019-08-29 13:44:49 -07:00
Brad Davis
36be00bf97 Fix android build again 2019-08-29 10:25:57 -07:00
Brad Davis
af22ab55bb PR feedback 2019-08-29 08:46:46 -07:00
Brad Davis
5a6e2e5daf Add caching to the restricted value 2019-08-28 10:13:32 -07:00
Brad Davis
954773124a BUGZ-1363: crash when checking for web content restrictions 2019-08-28 09:56:45 -07:00
Zach Fox
083470e4fe Ensure that geometryChanged is emitted after docked widget is resized 2019-08-19 16:48:40 -07:00
Brad Davis
06ad461c32 PR feedback 2019-08-01 16:57:54 -07:00
Oren Hurvitz
d7ef7a052d The "Clear Disk Caches" command also deletes the HTTP cache used by QtWebEngine
Note that this only clears the HTTP cache (used for files), but not the directory used for
persistent data such as Cookies, Local Databases, etc. There's no Qt API to do that.
Fortunately, this directory should be small.
2019-07-26 15:28:44 +03:00
Oren Hurvitz
ef163c836d Enable QtWebEngine to store its cache on disk
In the past, QtWebEngine stored the cache on disk automatically. But apparently due to a recent
change to Qt, this has changed: a Web Engine Profile that is constructed without a Storage Name is placed
in "Off the Record" mode, which means that the cache is stored only in memory. Therefore, we must assign
a Storage Name and disable "Off the Record" mode.
2019-07-26 15:25:24 +03:00
Brad Davis
abb71ba604 Don't request an OpenGL 2.0 context via the dock widget 2019-06-19 14:10:53 -07:00
Shannon Romano
d6859a42d9
Merge pull request #15762 from annabrewer/quest-login-keybrd
BUGZ-531: Quest tablet login missing keyboard
2019-06-13 16:44:49 -07:00
Anna
7099b04911 appeasing jenkins 2019-06-13 12:21:41 -07:00
Preston Bezos
8dcf6e6a03 removed a dead line of code, made a couple formating changes 2019-06-12 15:47:19 -07:00
Preston Bezos
29d795af5b hopefully good now 2019-06-12 15:36:20 -07:00
Anna
4b30065ad1 fixed keyboard on quest login and cleaned up qml files 2019-06-12 15:17:37 -07:00
Preston Bezos
34e9acc0b5 better fix for the toolbar remnant 2019-06-12 14:31:43 -07:00
Zach Fox
fade8f9c04 It works! 2019-06-12 12:47:48 -07:00
Zach Fox
51c2cc793a Tinkering with toolbar visibility signal - not quite working 2019-06-12 10:26:32 -07:00
David Rowe
92eb418690 Doc review 2019-06-12 10:50:37 +12:00
David Rowe
15d3c7231e Fix typos 2019-06-07 12:21:32 +12:00
David Rowe
beb70988c3 Tablet and related JSDoc 2019-06-07 08:34:53 +12:00
amerhifi
5a3585ea5b adressing pr comments 2019-05-24 14:36:42 -07:00
amerhifi
6f04e039fe adding whitelisting for dockedWidgets 2019-05-24 14:12:24 -07:00
amerhifi
bd88a68a0f testing context passing to dockWidget via whitelisting. 2019-05-24 10:58:13 -07:00
Shannon Romano
15484436ca
Merge pull request #15507 from danteruiz/dockable-windows
case LILY-30: Dockable Interactive Windows
2019-05-08 12:16:04 -07:00
danteruiz
3806631bf1 dockable window 2019-05-08 10:04:31 -07:00
Thijs Wenker
119b97216f Fix crash for active async messageBoxes on exit of client 2019-05-02 19:11:02 +02:00
danteruiz
d73f685ef2 change mac default window size 2019-04-26 16:56:38 -07:00
jennaingersoll
fb1842cbfa
Merge pull request #15455 from ctrlaltdavid/M22330
Case 22330: Regularize JSDoc deprecation notices
2019-04-26 09:48:45 -07:00
SamGondelman
0e4ea4aff2 fix openDirectory 2019-04-25 13:20:18 -07:00
David Rowe
8e69e0b049 Regularize deprecation notices 2019-04-25 20:55:30 +12:00
SamGondelman
31b3f0e8f1 possible fix for openUrl exploit 2019-04-24 16:39:31 -07:00
Sam Gondelman
04ecdb463f
Merge pull request #15173 from SamGondelman/audio
Case 21457, Case 16836, Case 15782: Improve AudioInjector threading
2019-03-21 18:03:58 -07:00
danteruiz
5f3e31b119 add ui to kick api 2019-03-15 18:15:18 -07:00
SamGondelman
609c4ab52e try to fix audio injector threading issues 2019-03-12 18:41:43 -07:00
SamGondelman
cfb84967d5 these seemed dangerous 2019-03-01 10:54:44 -08:00
John Conklin II
87556059d3
Merge pull request #13901 from Cristo86/android_handshake
case 20058: Android - Handshake implementation
2019-02-20 13:33:52 -08:00
Brad Davis
0b171ffe13 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-15 10:31:04 -08:00
Bradley Austin Davis
d45d87031d
Merge pull request #14782 from SamGondelman/NOverlaysFinal
Case 20723, Case 20334: Internally, replace all overlays with local entities
2019-02-14 13:49:47 -08:00
Brad Davis
292602afd7 Resolving more master differences 2019-02-14 12:55:28 -08:00
Brad Davis
0f4d1f073b Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-14 12:49:56 -08:00
Shannon Romano
8a07e2b31a
Merge pull request #14895 from ctrlaltdavid/M21132
Case 21132: Add "Avatar Script" classification to relevant JSDoc APIs
2019-02-13 10:35:00 -08:00
Brad Davis
a6f23f48d6 Merge branch 'feature/quest_custom_plugins' into feature/quest 2019-02-12 09:53:12 -08:00
Brad Davis
b896e2577b Fix QML file selectors 2019-02-11 16:17:06 -08:00
SamGondelman
f53ccf7363 fix create, working on mini tablet 2019-02-11 14:54:53 -08:00
David Rowe
8e0ff9b4de Fix up some "Client Entity" JSDoc API classifications 2019-02-12 11:50:09 +13:00
David Rowe
5428bb19dc Add "Avatar Script" JSDoc API classification 2019-02-12 11:49:49 +13:00
Brad Davis
d3301803d3 Support custom display / input plugin lists and small tweaks 2019-02-07 15:15:26 -08:00
Cristian Duarte
babb972d89 Merge remote-tracking branch 'hifi/master' into android_handshake 2019-02-07 14:44:22 -03:00
Brad Davis
b40595b14f Fix merge issue 2019-02-06 13:06:04 -08:00
Brad Davis
91e18f569b Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-06 10:15:36 -08:00
Jeff Clinton
35608c35de
Merge pull request #14808 from danteruiz/webengine-fileselector
Case 20879: Migrate  webEngine referencing  QML into +webengine folder
2019-02-05 12:57:38 -08:00
Dante Ruiz
93a91cdba2 webengine fileselector 2019-01-30 13:57:49 -08:00