Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-09 18:04:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
83893 commits 67 branches 56 tags 1.2 GiB
Commit graph

83893 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kalila L
60b31000d7 hifi-production DomainContent -> vircadia-content 2020-10-07 19:44:14 -04:00
Kalila L
46ddde0bd6 hifi-production tutorials -> vircadia-content 2020-10-07 19:42:51 -04:00
Kalila L
dc554bb8c6 Update some descriptions. 2020-10-07 19:37:10 -04:00
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
ea4ae45d9e
Merge pull request #778 from ctrlaltdavid/feature/chat-open-browser 
Open chat hyperlinks in Interface browser window
 2020-10-06 04:34:48 -04:00
kasenvr
baeb64a83b
Merge pull request #651 from kasenvr/feature/update-shortcut-names 
Update shortcut names to include "Vircadia"
 2020-10-06 04:34:35 -04:00
kasenvr
01185c94b4
Merge pull request #761 from daleglass/fix-more-warnings 
Fix more warnings
 2020-10-03 14:25:09 -04:00
Kalila L
6e7e7f5c55 Correct applying of shortcut names. 2020-10-03 03:58:32 -04:00
David Rowe
081c0672bf Fix JSDoc 2020-10-03 17:05:28 +13:00
David Rowe
cd7e1d0865 Miscellaneous tidying 2020-10-03 17:01:46 +13:00
David Rowe
3e94a034ca Use Window.openWebBrowser() instead of About.openUrl() in chat script 2020-10-03 17:01:01 +13:00
David Rowe
64eb4d11e1 Add URL parameter to Window.openUrl() API function 2020-10-03 17:00:43 +13:00
David Rowe
86aa3c8709 Make chat open links in internal Web browser instead of custom window 2020-10-03 16:29:14 +13:00
David Rowe
7ea6452de0 Fix Interface crash when using About.openUrl() in script 2020-10-03 16:06:38 +13:00
Kalila L
5e43b3a550 Fix sandbox and console names on PR builds. 2020-10-02 20:52:03 -04:00
Kalila L
aa20fbb0d9 Fix double application of "Vircadia" 2020-10-02 16:48:54 -04:00
kasenvr
46442bf5af
Merge pull request #730 from kasenvr/fix/update-api-docs 
API docs updates
 2020-10-02 15:55:54 -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
Kalila L
11d847b74b Merge branch 'master' into feature/update-shortcut-names 2020-10-02 15:24:18 -04:00
kasenvr
f7f8ea1e78
Merge pull request #767 from kasenvr/fix/3-0-wrap-up 
Fix/3 0 wrap up
 2020-09-29 02:17:17 -04:00
Kalila L
8cd129469b Update a few more links, not all links have endpoints though. 2020-09-28 04:47:21 -04:00
Kalila L
71f8d37754 Update tutorial JSON. 2020-09-28 04:28:36 -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
ac6486052d
Merge pull request #605 from kasenvr/feature/transparent-web-entities 
Transparent Web Entities
 2020-09-26 01:26:09 -04: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
Kalila L
46875a6cf1 Update tutorial to Vircadia EU CDN. 2020-09-25 20:55:57 -04:00
Kalila L
a90af38921 Fix badly formatted JSON metadata being sent to metaverse. 2020-09-25 20:55:43 -04:00
Kalila L
9e8dc88f63 Fix temporary place name assignment. 2020-09-24 18:06:39 -04:00
Kalila L
a965ac8591 Fix some weird context. 2020-09-24 17:30:15 -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
Kalila L
2c1a51e7c4 Remove inventory app from defaultScripts.js 2020-09-24 16:03:27 -04:00
kasenvr
d46c6c192e
Merge pull request #753 from daleglass/improve-url-migrations 
Sanitize URLs in ExternalResources
 2020-09-24 15:40:30 -04:00
Dale Glass
9b4d115a5d Review fixes 
Make it ignore a // at the beginning of the URL
 2020-09-24 19:37:14 +02:00
Kalila L
a50918b723 Merge branch 'master' into fix/URL-migrations 2020-09-23 18:56:50 -04: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
kasenvr
892f97d38d
Merge pull request #751 from ctrlaltdavid/fix/external-resource 
Fix/external resource
 2020-09-23 15:40:33 -04:00
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