kasenvr
b182a7b371
Merge pull request #669 from odysseus654/pr/script-logging
...
add more details to messages logged in entity scripts
2020-10-06 04:35:11 -04:00
kasenvr
01185c94b4
Merge pull request #761 from daleglass/fix-more-warnings
...
Fix more warnings
2020-10-03 14:25:09 -04:00
kasenvr
ca80d79991
Merge branch 'master' into fix/update-api-docs
2020-10-02 15:33:28 -04:00
kasenvr
c975d1acec
Update libraries/script-engine/src/ScriptEngine.h
...
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-10-02 15:32:05 -04:00
Kalila L
853c8052f4
Merge branch 'master' into pr/669
2020-10-02 15:29:51 -04:00
Dale Glass
8761b26079
Remove unused variable
2020-09-26 23:01:05 +02:00
Dale Glass
2fac1ddf2c
Add missing 'override'
...
Fixes:
warning: ‘virtual void render::entities::GizmoEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer&, render::Transaction&, const TypedEntityPointer&)’ can be marked override [-Wsuggest-override]
2020-09-26 22:58:44 +02:00
kasenvr
87d4fddb40
Merge branch 'master' into feature/transparent-web-entities
2020-09-26 01:25:02 -04:00
kasenvr
faadb9e340
Merge pull request #668 from kasenvr/fix/URL-migrations
...
New Metaverse PR
2020-09-26 01:21:17 -04:00
kasenvr
1c818bc8eb
Merge pull request #657 from daleglass/fix-build-on-qt-5.14
...
Fix build on qt 5.14
2020-09-24 17:11:42 -04:00
kasenvr
dd3152a2e4
Merge pull request #349 from daleglass/fix_warnings
...
Fix warnings emitted by GCC
2020-09-24 17:06:16 -04:00
daleglass
fffb6619b3
Update libraries/shared/src/BufferParser.h
...
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-09-24 22:17:22 +02:00
daleglass
ed4164b59e
Update libraries/shared/src/GeometryUtil.cpp
...
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-09-24 22:17:16 +02:00
Dale Glass
9b4d115a5d
Review fixes
...
Make it ignore a // at the beginning of the URL
2020-09-24 19:37:14 +02:00
Dale Glass
1d58ac4d79
Sanitize the URL further by removing leading slashes and any duplicated ones
2020-09-23 23:33:22 +02:00
Dale Glass
b243d382fc
Fix warning due to multiline comment
2020-09-23 22:34:01 +02:00
David Rowe
1cb1c63228
Tidying
2020-09-23 23:08:02 +12:00
David Rowe
c6ba42b7d6
Fix calculating external resource paths
2020-09-23 22:15:13 +12:00
David Rowe
ba7242f4dc
Script.getExternalPath() and related JSDoc
2020-09-23 17:23:40 +12:00
kasenvr
dcf1e41086
Update libraries/entities/src/EntityScriptingInterface.h
...
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-09-22 23:49:07 -04:00
David Rowe
3344c7423d
Fix up types
2020-09-22 20:52:15 +12:00
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
kasenvr
88fc213644
Apply suggestions from code review
...
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-09-19 23:53:04 -04:00
Kalila L
bc1ffa8a8d
Merge branch 'master' into fix/update-api-docs
2020-09-19 23:46:13 -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
Kalila L
bcd5f242b9
Added type and filename doc for Script API.
2020-09-18 18:52:49 -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
9a35323295
Update entities API docs to show entity properties at top.
2020-09-18 16:27:42 -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
