Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-09 16:22:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
83766 commits 25 branches 0 tags 1.1 GiB
Commit graph

83766 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Kalila L
c03d1ec659 Merge branch 'master' into feature/domain-server-metaverse-switching 2020-09-16 22:55:03 -04:00
kasenvr
bcaaa3257f
Merge pull request #715 from ctrlaltdavid/fix/serverless-title 
Fix "Serverless" capitalization in title bar
 2020-09-16 22:39:44 -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
kasenvr
b3d618a527
Merge pull request #713 from kasenvr/fix/audio-switching-crash 
Fix audio output switching crash
 2020-09-16 22:39:18 -04:00
Kalila L
23bf8388f1 Fix metaverse URL retrieval and comment out updatePlaceNameLink until we have our own functionality. 2020-09-16 21:37:48 -04:00
Kalila L
8a71c66fcc Added comments. 2020-09-16 20:01:47 -04:00
kasenvr
699425254d
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-09-16 19:59:44 -04:00
kasenvr
66f953d957
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-09-16 19:59:07 -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
Alezia Kurdis
ec4d559055
Added (Optional) to the label "Material URL" 
Added "(Optional)" to the label "Material URL"

"Material URL (Optional)"
 2020-09-15 22:24:08 -04:00
Kalila L
3610446150 Update metaverse paths for Android as well. 2020-09-15 22:00:36 -04:00
Kalila L
c5a618be8f Fix indent...? 2020-09-15 21:09:39 -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
dcbf8c7663 Agnostify language "High Fidelity" -> "Metaverse" and implement dynamic retrieval of URL for metaverse. 2020-09-15 01:31:24 -04:00
Kalila L
7a033f93da Add HTTP route to get metaverse info. 2020-09-15 00:54:52 -04:00
David Rowe
d6a49439b8 Fix "Serverless" capitalization in title bar 2020-09-15 15:57:34 +12: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
59ae17baf2
Merge pull request #689 from ctrlaltdavid/feature/open-ext-browser 
Add open-in-external-browser button to web browser dialog
 2020-09-12 22:15:23 -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
kasenvr
a3219d854c
Merge pull request #701 from AleziaKurdis/Issue_696_ImageUrl_refresh_In_List 
Fix for Issue 696. Create App - List refresh on updating image URL
 2020-09-12 22:14:47 -04:00