Commit graph

84280 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
kasenvr
d6932aa540
Merge pull request #632 from Misterblue/fix/add-get-temp-name
Add --get-temp-name to domain-server invocation in creation of Docker
2020-09-23 04:13:05 -04:00
Kalila L
24d4076079 Fix another URL. 2020-09-23 03:56:50 -04:00
Kalila L
560a1a7119 Update sandbox URL. 2020-09-23 03:29:03 -04:00
Kalila L
ec15b51110 Fix typo. 2020-09-23 02:52:20 -04:00
kasenvr
567c3475c5
Merge pull request #654 from Madders/feature/update-explore-ui
Updated the Explore app UI
2020-09-23 02:04:20 -04:00
Kalila L
ed5a7e82d7 Fix default URLs for edit.js 2020-09-23 01:57:00 -04:00
David Rowe
ba7242f4dc Script.getExternalPath() and related JSDoc 2020-09-23 17:23:40 +12:00
Kalila L
b493f0c51d Alter icon positions, colors, combine visit and search box. Add tooltips for some buttons. 2020-09-23 01:22:04 -04:00
Kalila L
2d871a8f88 Add hover effect for cards and fix description for add location. 2020-09-23 00:54:50 -04:00
Kalila L
1c9e1dd160 Remove redundant buckets. 2020-09-23 00:14:31 -04:00
Kalila L
3866bf478b Fix icon resolutions. 2020-09-23 00:04:27 -04: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
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
kasenvr
79d34f6f1c
Merge pull request #748 from ctrlaltdavid/fix/screenshare-crash
Fix Interface start-up crash on Windows
2020-09-22 15:43:20 -04:00
David Rowe
4959ca4975 Move ExternalResource call into method
Fixes Interface crash on Windows.
2020-09-22 20:52:52 +12:00
David Rowe
3344c7423d Fix up types 2020-09-22 20:52:15 +12:00
Kalila L
085bdf0016 Merge branch 'master' into pr/654 2020-09-22 01:55:24 -04:00
kasenvr
5e65319254
Merge branch 'master' into fix/domain-threading-defaults 2020-09-22 00:27:50 -04:00
kasenvr
4602ec7cad
Merge pull request #738 from kasenvr/fix/chat-app
Fix chat opening due to other users triggering
2020-09-22 00:24:13 -04:00
kasenvr
894ffda5c2
Merge pull request #743 from ctrlaltdavid/fix/glb-asset-server
Fix GLB files not being able to be added from Asset Server
2020-09-22 00:23:45 -04:00
kasenvr
457cc56f1a
Update FloofChat.html
Fix formatting issues.
2020-09-21 23:48:36 -04:00
Alezia Kurdis
de21ebf853
Selection Tool "unlit"
This commit includes 2 parts:
1- Re-adjustment in the code to stay aligned with axis/colors/Pitch-Yaw-Roll 
It seems that the Overlay 3dCircle was in fast patch to work while the Gizmo Ring is aligned for Axix versus Pitch-Yaw-Roll.
The modification has been done differently and is in fact a simpler solution.

2- Add a Material local entities parented to each tool entity to make the Selection tool "unlit"
This addresses Issue #709 Enhancement: Make create translate "widget" unlit
BUT there is a known issue: The Gizmo Ring are not supporting the Material currently. (an issue has been open for that see #744)
The Rotation rings are then not "unlit", but everything in the code is ready to support it when it will be done.
Gizmo Ring having practically designed for that specific usage, I think we should keep using them.
Other alternatives like using an image or a model would imply to considerable modifications. 
We would lose the angular representation (that can't be done with image or model). 
The remaining "unlit" issue is very low severity, the widget is still fully functional. So I think it can wait for the support of Material.
2020-09-21 21:59:19 -04:00
Kalila L
5a321cdaa8 Fix links. 2020-09-21 16:23:30 -04: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
d3a97832a3 Update the rest of non /script-archive/ script URLs. 2020-09-21 00:14:22 -04:00
Kalila L
aeae078b67 Update some archived scripts. 2020-09-20 23:37:55 -04:00
Kalila L
a95c457499 Update active scripts. 2020-09-20 23:37:44 -04:00
Kalila L
0d08254a07 Some updates to URLs in C++ 2020-09-20 23:37:29 -04:00
Kalila L
d423b51e5f Change content.vircadia.com -> cdn-1.vircadia.com 2020-09-20 22:55:40 -04:00
David Rowe
8227705ed7 Fix GLB files not being able to be added from Asset Server 2020-09-21 11:59:02 +12: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
Kalila L
ecf3e67bdf Improve URL formatting and refactor. 2020-09-20 00:44:40 -04:00
Kalila L
2a5604a166 Fix chat window toggling for all users on domain. 2020-09-20 00:44:04 -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
c6b947e5f9 Update sandbox starter content URL 2020-09-19 23:46:34 -04:00
Kalila L
bc1ffa8a8d Merge branch 'master' into fix/update-api-docs 2020-09-19 23:46:13 -04:00
Alezia Kurdis
dca2f2e00e
Replacement of 3D Overlays for Local Entities
This replaces all the deprecated 3d Overlays for Local Entities.
No functional changes, only technical.

Many variables have been renamed for clarity. 
(Mainly the term "overlay" that were used to designate the elements of the selection tool. 
Now it refer to "toolEntity" to designate the entities composing the Selection Tool.)

The color of the different elements of the selection tools has also been adjusted.
They are now more contrasted and more vivid.
(The green and the blue of the previous version were too much close at the point that 
some color blind people might have difficulty to differenciate them.)
2020-09-19 23:20:43 -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