Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 13:43:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
83791 commits 69 branches 56 tags 1.2 GiB
Commit graph

83791 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
1c9e1dd160 Remove redundant buckets. 2020-09-23 00:14:31 -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
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
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
0310764013 More review fixes 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
kasenvr
39c36e275f
Merge pull request #656 from daleglass/fix-build-on-gcc10 
Fix build of hifiSdl2 on GCC 10
 2020-09-17 18:49:47 -04:00
Kalila L
bba8aecc4c Fix typo. 2020-09-17 17:15:33 -04:00
kasenvr
9fad6109ca
Merge pull request #703 from AleziaKurdis/feature_Create_App_materialData 
Feature: Create Material even without a URL.
 2020-09-16 23:36:56 -04:00
kasenvr
26c3c9ab15
Merge pull request #667 from odysseus654/pr/assignment-client-option-fix 
apparent copy/paste bug on assignment-client parameters
 2020-09-16 23:26:35 -04:00
Alezia Kurdis
6ca176335e
Change "Add" button for "Create" 
Change "Add" button for "Create"
 2020-09-16 23:15:07 -04:00
Alezia Kurdis
1a0e69ed6e
Change "Add" button for "Create" 
Change "Add" button for "Create"
 2020-09-16 23:07:41 -04:00
Kalila L
1fad06b112 Update further. 2020-09-16 23:06:02 -04:00
Kalila L
ed79f03755 Include metaverse URL in window title. 2020-09-16 22:59:47 -04:00