Commit graph

30988 commits

Author SHA1 Message Date
David Rowe
32b7823a73 Merge remote-tracking branch 'upstream/fix/URL-migrations' into fix/external-resource
# Conflicts:
#	libraries/networking/src/ExternalResource.h
2020-09-23 23:25:42 +12:00
David Rowe
1cb1c63228 Tidying 2020-09-23 23:08:02 +12:00
David Rowe
32efb2443e Don't store current CDN paths in Interface.json at present 2020-09-23 22:15:40 +12:00
David Rowe
c6ba42b7d6 Fix calculating external resource paths 2020-09-23 22:15:13 +12:00
Kalila L
24d4076079 Fix another URL. 2020-09-23 03:56:50 -04:00
Kalila L
ec15b51110 Fix typo. 2020-09-23 02:52:20 -04:00
Kalila L
0cb6261d11 Catch stragglers. 2020-09-22 20:25:19 -04:00
Kalila L
ff46a40741 Update avatarbookmarks.json and allow parsing of new 'avatarIcon' property. 2020-09-22 20:16:15 -04:00
Kalila L
154a95ac86 Update all scripts, script-archive scripts still broken. 2020-09-22 19:24:58 -04:00
David Rowe
4959ca4975 Move ExternalResource call into method
Fixes Interface crash on Windows.
2020-09-22 20:52:52 +12:00
Kalila L
7b7038fae1 Bunch of URL updates later... 2020-09-21 00:54:49 -04:00
Kalila L
0d08254a07 Some updates to URLs in C++ 2020-09-20 23:37:29 -04:00
Kalila L
b1f32dd9ac Merge branch 'pr/691' into fix/URL-migrations 2020-09-20 17:58:26 -04:00
Dale Glass
89aa89e9d3 Review fixes (non-working)
Trouble with:

> Script.getExternalPath(Script.ExternalPaths.Assets, "hi")

[UncaughtException evaluate] Error: cannot call getExternalPath(): argument 1 has unknown type `ExternalResource::Bucket' (register the type with qScriptRegisterMetaType()) in about:console:1 [Backtrace] <global>() at about:console:1
TypeError: cannot call getExternalPath(): argument 1 has unknown type `ExternalResource::Bucket' (register the type with qScriptRegisterMetaType())
2020-09-20 01:29:32 +02:00
Dale Glass
84e01630ee Make base URLs for external resources modifiable 2020-09-20 01:29:32 +02:00
Dale Glass
e0e4ffb214 Review fixes 2020-09-20 01:29:32 +02:00
Dale Glass
cd901f9e32 Move enum into ExternalResources namespace 2020-09-20 01:29:32 +02:00
Dale Glass
26bcaa420d Better enum registration 2020-09-20 01:29:32 +02:00
Dale Glass
c65cc9570d Prototype for moving content away from hifi infrastructure 2020-09-20 01:29:32 +02:00
Kalila L
bba8aecc4c Fix typo. 2020-09-17 17:15:33 -04:00
Kalila L
ed79f03755 Include metaverse URL in window title. 2020-09-16 22:59:47 -04:00
Kalila L
c03d1ec659 Merge branch 'master' into feature/domain-server-metaverse-switching 2020-09-16 22:55:03 -04:00
Kalila L
9b0ac9d75f Update endpoints to be consistent and work with the updates. 2020-09-15 21:05:00 -04:00
Kalila L
e3a6dc18af Add support for metaverse API's with paths. 2020-09-15 20:07:00 -04:00
David Rowe
d6a49439b8 Fix "Serverless" capitalization in title bar 2020-09-15 15:57:34 +12:00
kasenvr
370c2700be
Merge pull request #640 from kasenvr/feature/package-startup-interface
Add ability to package Interface with a custom startup location (also tacks on some build docs updates)
2020-09-12 22:17:25 -04:00
David Rowe
2985ac2262 Twek browser bar layout 2020-09-10 13:15:56 +12:00
David Rowe
29b96432bc Clear favicon image when page is changed 2020-09-06 21:04:13 +12:00
David Rowe
1d27c0138c Fix browsing history 2020-09-06 21:00:45 +12:00
David Rowe
7da2fa1315 Add open-in-externa-window button 2020-09-06 20:56:44 +12:00
David Rowe
9d3b763256 Add hover state to browser window buttons 2020-09-06 20:49:29 +12:00
David Rowe
fd2535ecaf Fix browser window buttons and Web page favicon display 2020-09-06 20:40:07 +12:00
kasenvr
7a686d95e0
Merge pull request #671 from ctrlaltdavid/fix/gltf-blendshapes
Fix and extend glTF blendshapes support
2020-09-03 13:57:57 -04:00
kasenvr
bbc5044451
Merge pull request #639 from ctrlaltdavid/enhancement/domain-login-items
Don't display domain log-in items unless relevant
2020-09-02 18:51:14 -04:00
kasenvr
e2c5504be4
Merge pull request #441 from odysseus654/pr/cxx-crashing
improve crashpad reporting of unhandled c++ exceptions
2020-09-02 18:51:01 -04:00
kasenvr
c7fbddf024
Merge pull request #631 from vegaslon/bug/TestFixAvatarApp
Test moving to qt image error handling in avatar app
2020-09-02 18:50:31 -04:00
kasenvr
9004fb8060
Merge pull request #624 from ctrlaltdavid/feature/vircadia-about
Add "About" JavaScript API and platform string
2020-09-02 18:50:09 -04:00
Kalila L
b8181d92a5 Merge branch 'master' into pr/441 2020-09-01 17:42:35 -04:00
kasenvr
60e6d99aff
Merge branch 'master' into feature/package-startup-interface 2020-09-01 17:40:37 -04:00
kasenvr
f2cc30d6d9
Merge pull request #276 from HifiExperiments/parenting
Improving performance of entity updates
2020-09-01 04:34:51 -04:00
Kalila L
58c1518d0b Updating some .cpp and .h URLs. 2020-08-31 01:00:05 -04:00
David Rowe
77dbe7a254 Rename FACESHIFT_BLENDSHAPES to BLENDSHAPE_NAMES 2020-08-29 11:21:56 +12:00
Kalila L
feac9683c4 Remove unneeded if checks for INITIAL_STARTUP_LOCATION assignment. 2020-08-23 01:52:53 -04:00
Kalila L
a2bd06993f Add option to build an Interface to go to specified address by default. 2020-08-23 01:49:32 -04:00
David Rowe
67100b5a20 Display domain login menu item only on domains that have domain login 2020-08-23 15:56:27 +12:00
Vegaslon
c6fbe08a8f Test moving to qt image error handling instead of creating own in attempt to fix avatar app slow down. 2020-08-20 08:59:57 -04:00
David Rowe
bf60cf5b4c Tidying 2020-08-18 16:33:47 +12:00
David Rowe
9bb5add1ca Don't display domain login status in title bar unless relevant 2020-08-18 11:42:35 +12:00
David Rowe
66cdefa4b3 Add a new "About.platform" property 2020-08-17 11:47:56 +12:00
David Rowe
70fd954ef4 Replace the "HifiAbout" API with a new "About" API 2020-08-17 11:34:58 +12:00