Commit graph

34392 commits

Author SHA1 Message Date
Kalila L
9db333a555 Update CDN URLs in NetworkingConstants.h 2020-09-21 16:07:56 -04: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
Kalila L
f465ecb53b Update STUN server 2020-09-20 17:56:54 -04:00
Dale Glass
929f395503 Spend more less time in the lock, do a sanity check, normalize path 2020-09-20 02:09:54 +02:00
Dale Glass
25a9716642 Fix crash due to incorrect assert 2020-09-20 02:08:22 +02:00
Dale Glass
2de0934598 Some missed review fixes 2020-09-20 01:57:44 +02:00
David Rowe
2c84478dc1 Register metatype 2020-09-20 01:29:32 +02: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
792854ccb7 Applied code formatter 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
kasenvr
68cefda3e5
Merge pull request #718 from kasenvr/feature/domain-server-metaverse-switching
Domain Metaverse Switching & Interface Support Improved
2020-09-18 22:55:43 -04:00
kasenvr
cf26f6bc4b
Merge pull request #694 from ctrlaltdavid/fix/import-json-textures
Support relative JSON URLs in model textures property
2020-09-18 17:00:13 -04:00
Kalila L
c03d1ec659 Merge branch 'master' into feature/domain-server-metaverse-switching 2020-09-16 22:55:03 -04:00
kasenvr
0236f49779
Merge pull request #705 from ctrlaltdavid/fix/bs-property-warning
Quiet warning for unused blendshapeCoefficients property
2020-09-16 22:39:29 -04:00
Kalila L
8a71c66fcc Added comments. 2020-09-16 20:01:47 -04:00
kasenvr
fd5b84b6eb
Apply suggestions from code review
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-09-16 19:57:58 -04:00
Kalila L
4224c8120f Set metaverse and ice to Vircadia again. 2020-09-15 21:06:27 -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
Kalila L
d5f5c76878 Update NetworkingConstants.h URLs to Vircadia Metaverse. 2020-09-15 19:57:30 -04:00
Kalila L
932a3b9e91 Update AudioClient.cpp
Fix double locking attempt if waitForFinished causes prepareLocalAudioInjectors to be called on this thread.

Co-Authored-By: Heather Anderson <1115056+odysseus654@users.noreply.github.com>
2020-09-14 02:58:36 -04:00
kasenvr
e6f3ba4458
Merge pull request #311 from odysseus654/pr/webpage-restrict-from-polling
[shutdown-deadlock] Restructure ContextAwareProfile from polling to notifications
2020-09-12 22:17:50 -04: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
kasenvr
ad28067cbe
Merge pull request #699 from ctrlaltdavid/fix/gltf-raycasting
Fix pick rays not intersecting glTF models
2020-09-12 22:15:05 -04:00
HifiExperiments
954e8096bb
Merge pull request #309 from HifiExperiments/modelShader
Procedural Shader applies to entities other than target
2020-09-12 11:13:57 -07:00
David Rowe
432090e2e9 Quiet warning for unused blendshapeCoefficients property 2020-09-10 21:01:04 +12:00
David Rowe
84cb3b2515 Fix pick rays not intersecting glTF models 2020-09-10 08:58:35 +12:00
David Rowe
dc04622a1d Fix some JSDoc noticed in passing 2020-09-08 22:10:40 +12:00
David Rowe
d8a119c1b3 Support relative JSON URLs in model textures poperty 2020-09-08 22:10:24 +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
David Rowe
9fc9b203ae Rename constant 2020-09-02 12:45:44 +12: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
David Rowe
2bfdaa31ab Add FIXME for missing relative URL handling case 2020-09-02 09:20:35 +12:00
HifiExperiments
ae944fd985 merge with master 2020-09-01 09:34:54 -07:00
David Rowe
4214182b2f Tidy JSON relative URLs importing 2020-09-01 21:08:52 +12:00
kasenvr
f2cc30d6d9
Merge pull request #276 from HifiExperiments/parenting
Improving performance of entity updates
2020-09-01 04:34:51 -04:00
kasenvr
6a872ef525
Merge pull request #586 from makitsune/relative-urls
Allow resolving relative urls when importing entities json
2020-09-01 04:34:12 -04:00
David Rowe
22e6ae9710 Fix hasBlendedMeshes() value 2020-08-31 21:44:19 +12:00
David Rowe
bd1be872a8 Support using blendshapes in file without needing an FST 2020-08-31 21:31:55 +12:00
Kalila L
58c1518d0b Updating some .cpp and .h URLs. 2020-08-31 01:00:05 -04:00
Kalila L
6e39e048be First pass at centralizing some URLs. 2020-08-31 00:43:30 -04:00