Commit graph

31444 commits

Author SHA1 Message Date
d6ead4eeeb
Merge pull request #31 from shocktail39/fix/deprecated_qml_connections_properties
fixed deprecated qml implicitly defined onFoo properties in connections
2022-03-22 21:52:09 +01:00
Alezia Kurdis
62029bd47e
Adjustment for Keylight direction
Adjustment for Keylight direction
The keylight was still a bit offset with the skybox sun.
2022-03-15 20:18:48 -04:00
steve hocktail
8fdc08f8d7 whoops, forgot to hold shift when making these parentheses 2022-03-05 14:49:29 -05:00
steve hocktail
35194b0f44 fixed deprecated qml implicitly defined onFoo properties in connections 2022-02-28 22:09:43 -05:00
Alezia Kurdis
3d410252c7
Exposed serverless subdirectory as resources
Expose some serverless subdirectory as outside the binary
to make possible the referencing from inside a script or from inside the html
these don't support qrc url.
2022-02-27 14:01:00 -05:00
Alezia Kurdis
d1c408759d
Fix EOL 2022-02-27 13:43:58 -05:00
Alezia Kurdis
f6f0c01951
fix EOL 2022-02-27 13:40:17 -05:00
Alezia Kurdis
14f80f92ef
Change the url to have the files reachable.
Change the url to have the files reachable.
2022-02-27 13:36:15 -05:00
Alezia Kurdis
02ed4b2774
Delete mirror_without_backface.baked.fbx 2022-02-23 22:58:29 -05:00
Alezia Kurdis
0226072b29
Delete dome2.glb 2022-02-23 22:58:00 -05:00
Alezia Kurdis
1ae189f3a9
Delete bowl2.fbx 2022-02-23 22:57:42 -05:00
Alezia Kurdis
4acfc35ea5
Delete Stands.fbx 2022-02-23 22:57:16 -05:00
Alezia Kurdis
568ff06a59
Delete materialSequencer.js 2022-02-23 22:56:03 -05:00
Alezia Kurdis
701efa0393
Delete mirrorClient.js 2022-02-23 22:55:53 -05:00
Alezia Kurdis
9d731dcca3
Delete mirrorReflection.js 2022-02-23 22:55:38 -05:00
Alezia Kurdis
5598ae53ea
Delete 468407__onderwish__sci-fi-survival-dreamscape.mp3 2022-02-23 22:54:42 -05:00
Alezia Kurdis
3970f32f64
Delete gradient1.jpg 2022-02-23 22:53:38 -05:00
Alezia Kurdis
2c57212bfd
Delete galaxySkybox.png 2022-02-23 22:53:24 -05:00
Alezia Kurdis
651a2889dd
Delete galaxySkybox.JPG 2022-02-23 22:52:48 -05:00
Alezia Kurdis
d758682d50
Delete tutorialqrc.json 2022-02-23 22:50:59 -05:00
Alezia Kurdis
f6b196318f
New serverless tutorial for Overte
New serverless tutorial for Overte
2022-02-23 22:49:35 -05:00
96932a6946 Update metaverse server URL 2022-02-21 23:17:33 +01:00
Alezia Kurdis
ceb5456ccd
Logo ratio adjustment
Logo ratio adjustment
2022-02-12 13:30:31 -05:00
bd457ccc79 Revert "Adjustment for Logo ratio"
This reverts commit 2400bc96ea.
2022-02-12 19:19:27 +01:00
Alezia Kurdis
2400bc96ea
Adjustment for Logo ratio
Adjustment for Logo ratio
2022-02-12 13:07:22 -05:00
c6f1e6410e Updated some URLs, rebranded documentation and changed default metaverse server address 2022-02-09 23:57:24 +01:00
Alezia Kurdis
ae3f24172b
Delete VircadiaLogo.fbx
Replaced by:
logo_overte.fbx
logo_overte_white-color-emissive.fst
2022-02-06 12:57:05 -05:00
Alezia Kurdis
9b1958e00a
Replaced by brand-logo.svg
Replaced by brand-logo.svg
2022-02-06 12:53:26 -05:00
Alezia Kurdis
990b4f28bb
Replace by brand-banner.svg 2022-02-06 12:52:50 -05:00
Alezia Kurdis
f97b1dfe87
Ressources rebranding for Overte
Ressources rebranding for Overte
(mostly images, icon, model updated with Overte brand)
some file has been edited to replace some files (they had vircadia in the name)
Most of this has not been tested. (cause I don't build)
2022-02-06 12:51:05 -05:00
6a81255226 Merge branch 'tell-accountmanager-url-changed' of https://github.com/overte-org/overte into tell-accountmanager-url-changed 2022-01-28 18:57:15 +01:00
dc29dc4998 Clear password on metaverse server change 2022-01-28 18:55:58 +01:00
e2d7e55e0b Merge branch 'master' into tell-accountmanager-url-changed 2022-01-23 14:08:10 +01:00
000166beef Update Metaverse server URL on focus change 2022-01-22 19:30:03 +01:00
30806ce346 Inform AccountManager about metaverse server change 2022-01-22 18:41:04 +01:00
bf48bf01c6
Merge branch 'vircadia:master' into tell-accountmanager-url-changed 2022-01-18 21:36:50 +01:00
Dale Glass
0c453e7e0e Explicitly encode QStrings to utf8 2022-01-16 21:38:14 +01:00
Dale Glass
5f7bd24c14 Fix MultiHash issues 2022-01-13 23:02:46 +01:00
Frost
d2f878000e Tell the AccountManager that the auth URL changed 2022-01-06 11:23:04 -08:00
Frost
3d0c5e26b7 Fix some anchors and add logging 2022-01-06 11:22:50 -08:00
Frost
b5258ead80 Fix height, tabbing, and other stuff 2022-01-06 11:22:50 -08:00
Frost
5a09064f50 Add metaverse server field on the login screen 2022-01-06 11:22:50 -08:00
Julian Groß
650c2568cf Remove extended deadlock wait on macOS 2021-12-15 00:40:52 +01:00
Dale Glass
d4a832a0c1
Merge pull request #1473 from Penguin-Guru/AudioOutputTest
Remove second argument from some playSystemSound() calls in QML.
2021-12-11 20:58:54 +01:00
Dale Glass
93e5f48951
Merge pull request #1423 from Penguin-Guru/RenderingEffects
Separate rendering effect settings.
2021-12-11 20:51:34 +01:00
Kalila
03b5b83b67
Merge pull request #1339 from odysseus654/pr/make_shared
Housekeeping: use of std::make_shared / QSharedPointer::create.
2021-12-09 17:14:04 -05:00
Kalila
a1d0f95535
Merge pull request #1340 from odysseus654/pr/auto-const-ref
Housekeeping: Update use of "auto" with plugin lists.
2021-12-09 17:13:55 -05:00
Kalila
7610f810ef
Merge pull request #1474 from Penguin-Guru/CodeSimplification
Remove <thread> library from main.cpp.
2021-12-09 17:07:30 -05:00
David Rowe
022dea7a58 Update API examples to use "vircadia" in mapping names 2021-12-04 21:37:33 +13:00
Kalila
b7734e32d0
Merge pull request #1468 from daleglass/qt5-fix-multimap
Fix deprecated usage of multiple keys in QHash and QMap.
2021-12-02 20:28:22 -05:00
Dale Glass
d77c8bbe41 Fix warnings related to deprecated usage of multiple keys in QHash and QMap
This replaces those uses with QMultiHash and QMultiMap
2021-11-26 17:53:23 +01:00
Penguin-Guru
9de2ac1eb5 Made requested change. 2021-11-25 15:24:13 -08:00
Penguin-Guru
78981307e6 This seems like the last one. Untested. 2021-11-24 18:13:06 -08:00
Penguin-Guru
cf50bcb71b Marked qmlPosition as deprecated. 2021-11-24 17:55:55 -08:00
Penguin-Guru
46bf41bff8 This doesn't seem to be used? 2021-11-24 09:58:10 -08:00
Penguin-Guru
65dcd58371 This seems fine? 2021-11-24 08:51:43 -08:00
David Rowe
48c32b96f4 Merge branch 'master' into fix/ssl-websocket-crash 2021-11-23 09:58:04 +13:00
David Rowe
a2ac43289c Use avatar position as orb position when head position not available 2021-11-09 12:12:55 +13:00
Dale Glass
35a420d312
Merge pull request #1422 from Penguin-Guru/master
Changed preset framerates; Add "low power" preset.
2021-11-06 19:30:01 +01:00
Kalila
61367ffd47
Merge pull request #1427 from Penguin-Guru/AntialiasingSetting
Add antialiasing setting.
2021-11-02 16:09:15 -04:00
Penguin-Guru
021268696c Adjusted for rebase on typo correction. 2021-10-30 12:58:32 -07:00
Penguin-Guru
6dd26c53a9 Maybe this helps? 2021-10-30 12:57:41 -07:00
Penguin-Guru
727ac38372 Removed typo newline. 2021-10-30 12:57:00 -07:00
Penguin-Guru
56bc962d36 Changed preset framerates. Added preset. 2021-10-30 12:57:00 -07:00
Dale Glass
4d190df3cd
Merge pull request #1407 from JulianGro/macOS_fix_crashpad
Fix crashpad on macOS.
2021-10-28 23:45:09 +02:00
Penguin-Guru
e6a41e85b2 Added comments. Referenced all enums explicitly. 2021-10-25 13:40:36 -07:00
Penguin-Guru
fc1a0d6a4c Apparently it worked. 2021-10-25 13:35:24 -07:00
Penguin-Guru
3c85964c5d Hopefully works. 2021-10-25 13:25:31 -07:00
Penguin-Guru
e7d5a005b8 Forgot to remove these. 2021-10-24 19:24:00 -07:00
Penguin-Guru
8386f2eb61 Clumsy fix for enum storage. 2021-10-24 19:19:20 -07:00
Penguin-Guru
66fdfa40ad Hopefully implemented antialiasing setting. 2021-10-24 15:32:51 -07:00
Penguin-Guru
ca4a817d09 Added other effect checkboxes for consistency. 2021-10-24 11:31:15 -07:00
Penguin-Guru
ed725fd814 Fixed typo. 2021-10-24 10:40:58 -07:00
Penguin-Guru
d9d8d951ec Fixed irony. 2021-10-23 17:29:57 -07:00
Penguin-Guru
803cfd9bdc Separated shadow rendering setting. Replaced drop-down with radio. 2021-10-23 17:16:48 -07:00
Julian Groß
e5609e10c2 Do not search for crashpad inside Interface binary. 2021-10-12 00:20:43 +02:00
David Rowe
c03312319d Merge branch 'master' into dev/webapp-master-update
# Conflicts:
#	libraries/networking/src/NodeList.h
#	libraries/shared/src/shared/WebRTC.h
2021-10-03 12:51:47 +13:00
Dale Glass
b8d1057e1f Replace the deprecated QMutex{ QMutex::Recursive} with QRecursiveMutex
This fixes around 1700 warnings.
2021-09-26 01:27:19 +02:00
Dale Glass
891d555679
Merge pull request #1352 from odysseus654/pr/q_disable_copy
Code Review: use of Q_DISABLE_COPY.
2021-09-25 20:33:20 +02:00
Dale Glass
3349d02cef
Merge pull request #1349 from JulianGro/use_GLVND
Set GL preference to GLVND
2021-09-25 20:31:11 +02:00
Heather Anderson
c88b7f6064 apply Q_DISABLE_COPY to MyHead (cleaning up the likely-bug in the existing code) 2021-09-19 17:52:02 -07:00
Heather Anderson
57a3cd3d63 replace the various disable-copy constructions with Q_DISABLE_COPY (or Q_DISABLE_COPY_MOVE) 2021-09-18 21:36:35 -07:00
Julian Groß
babee7c527 Set GL preference to GLVND 2021-09-17 21:04:12 +02:00
Heather Anderson
6e4e0dfb6a remove unnecessary list copying when retrieving a list of plugins 2021-09-12 13:12:02 -07:00
Heather Anderson
05182af561 more (relatively useless) code review 2021-09-11 20:16:51 -07:00
Heather Anderson
bee33745c4 missed some shared pointer construction in Application 2021-09-11 16:01:07 -07:00
Heather Anderson
bcce9a2091 convert explicit shared pointer creation (using "new") to make_shared where possible/appropriate 2021-09-11 15:15:04 -07:00
Heather Anderson
ab4d70760e review and cleanup of "#include <QtCore/QSharedPointer>" 2021-09-10 21:40:54 -07:00
David Rowe
b1050dc83a Merge branch 'master' into dev/webapp-master-update 2021-09-01 21:52:04 +12:00
Kalila
6b0f4c107b
Merge pull request #1301 from daleglass/qt5-fix-qdir-operator-assign
Fix QDir::operator= is deprecated
2021-08-19 20:48:14 -04:00
Kalila
0af1ef64ca
Merge pull request #1309 from daleglass/log-resources-location
Log the location of the primary resources file
2021-08-19 17:12:37 -04:00
Dale Glass
bb1884b361 Copy resources to interface's exe directory
This should have no effect on Unix, but fix the resource issue on Win32
2021-08-19 01:04:09 +02:00
Dale Glass
8a8093e529 Log the location of the primary resources file
Also emit the full path to the file in the exception
2021-08-12 23:49:44 +02:00
Dale Glass
24b2cdfcd2 Fix QString::SplitBehavior deprecation, replace with Qt:: 2021-08-06 20:16:10 +02:00
Dale Glass
8d19d08268 Fix QDir::operator= is deprecated 2021-08-06 18:44:53 +02:00
Dale Glass
b293dd2816
Merge pull request #1288 from digisomni/feature/add-talk-to-help
Add "Talk" link to "Help" menu.
2021-07-29 23:40:24 +02:00
Kalila
4b6d1e47e2
Fix syntax error in Menu.cpp. 2021-07-26 01:10:55 +02:00
Kalila
030cdbf348
Update Menu.cpp 2021-07-23 20:43:33 -04:00
Dale Glass
567ff291fe
Merge pull request #943 from daleglass/cmake-build-in-build-dir
Cmake: build in build dir
2021-07-22 23:26:21 +02:00
David Rowe
74c2788a14 Merge branch 'master' into dev/rename-hifisockaddr-webapp
# Conflicts:
#	assignment-client/src/AssignmentClient.cpp
#	domain-server/src/DomainServer.cpp
#	libraries/networking/src/DomainHandler.cpp
#	libraries/networking/src/LimitedNodeList.cpp
#	libraries/networking/src/LimitedNodeList.h
#	libraries/networking/src/SockAddr.cpp
#	libraries/networking/src/SockAddr.h
#	libraries/networking/src/udt/Socket.cpp
#	libraries/networking/src/udt/Socket.h
#	tools/ice-client/src/ICEClientApp.cpp
2021-07-21 15:03:29 +12:00
Kalila
d75df82687
Merge pull request #1102 from HifiExperiments/materials2
Material improvements 2: reference textures/materials by entity ID
2021-07-15 17:42:40 -04:00
Kalila
8e4a0f8880
Merge branch 'master' into feature/add-talk-to-help 2021-07-15 17:34:29 -04:00
Kalila
0193e0f4d6
Merge pull request #1244 from digisomni/fix/lookup-string-spaces
Add ability for 'handleLookupString' to have spaces.
2021-07-12 17:07:29 -04:00
Dale Glass
276a0506bf Fix building interface without npm 2021-07-11 19:26:51 +02:00
Dale Glass
96ad5e971b Remove redundant cmake code 2021-07-11 19:26:51 +02:00
Dale Glass
6a62dc10e6 Fix resources and jsdoc dependencies 2021-07-11 19:26:51 +02:00
Dale Glass
c95de72174 Fix copying jsdoc to interface
Take the jsdoc from tools/jsdoc and copy it to interface.

A subtle issue was found: It turns out that for cmake it matters
what gets parsed first, especially if you rely on setting a variable
in one project and reading it in another.

This can result in things like builds that fail the first time, then
work after re-running cmake.

Generation of jsdoc and screenshare were moved above interface,
because they're a dependency of it.
2021-07-11 19:26:51 +02:00
Dale Glass
7546be2e8a Use qt5_add_binary_resources instead of custom command.
Also move find_package for Qt to the top, so that it finds the
rcc binary before it's needed
2021-07-11 19:26:51 +02:00
Dale Glass
f7f01c2acc Don't copy RCC, it's generated where it's needed 2021-07-11 19:26:51 +02:00
Dale Glass
3f20f6ec66 Generate all files in the build dir, don't touch source dir
This makes it so that RCC files and jsdoc are both generated into
the build directory.
2021-07-11 19:26:51 +02:00
Kalila L
8df362ef1f Add "Talk" link to "Help" menu. 2021-07-10 18:05:28 -04:00
Dale Glass
e3004af61a More logging for crash reporting
* Make it clear in cmake if crash reporting is going to be used
* Log warning on startup if there's no crash reporting
2021-07-10 01:43:18 +02:00
daleglass
15dfa04c07 Whitespace review fix
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2021-07-10 01:43:18 +02:00
daleglass
e2eab15469 Whitespace review fix
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2021-07-10 01:43:18 +02:00
Dale Glass
186e784d89 Rework crashpad initialization
* Don't abort on startup if we can't find our own path
* Try to locate our own path by looking in /proc in Linux -- should fix AppImage issues
* Add extensive logging
2021-07-10 01:43:18 +02:00
HifiExperiments
7f99ddca2e merge with master 2021-07-05 16:48:45 -07:00
David Rowe
4d375c029f Merge remote-tracking branch 'upstream/webapp' into dev/webrtc-packet 2021-07-01 12:14:52 +12:00
Kalila
b86e4b98a9
Merge pull request #1249 from digisomni/fix/docs-links-dev
Update user docs links "docs.vircadia.dev" -> "docs.vircadia.com".
2021-06-27 05:55:13 -04:00
David Rowe
5a5cb6488c Multiplex UDP and WebRTC sockets in a QUdpSocket-style NetworkSocket 2021-06-26 22:07:01 +12:00
Kalila L
d26e035764 Update copyright headers. 2021-06-21 12:06:52 -04:00
Kalila L
90aaa85089 Update user docs links "docs.vircadia.dev" -> "docs.vircadia.com". 2021-06-21 12:01:37 -04:00
Dale Glass
f90d872752 Formatting cleanup 2021-06-20 14:22:28 +02:00
Dale Glass
3ebcced301 Fix build -- screenshare is not found 2021-06-20 14:22:28 +02:00
Dale Glass
506fd9563a Handle empty environment variables as false 2021-06-20 14:22:28 +02:00
Dale Glass
758ebd7f9d Fix environment variable cmake syntax 2021-06-20 14:22:28 +02:00
Dale Glass
2b05c32436 Don't depend on screenshare on Android 2021-06-20 14:22:28 +02:00
Dale Glass
474cd6b1c7 Improve Qt handling in CMake
Support 3 options:

	* VIRCADIA_USE_SYSTEM_QT is set -- use system's Qt
	* VIRCADIA_QT_PATH is set -- use Qt found in that dir
	* Otherwise -- use downloaded Qt package

This removes these variables:
	* VIRCADIA_USE_QT_VERSION
	* VIRCADIA_USE_PREBUILT_QT
	* HIFI_QT_BASE
2021-06-20 14:22:28 +02:00
Kalila L
51e6468abd Rename 'URL_SCHEME_HIFI' -> 'URL_SCHEME_VIRCADIA'. 2021-06-11 17:04:16 -04:00
David Rowe
4d11d1d515 Convert all "/**jsdoc" occurrences to "/*@jsdoc" 2021-05-12 10:54:45 +12:00
Kalila
80e17a1e94
Merge pull request #1193 from glenalec/patch-1
Update Snapshot.cpp
2021-04-26 03:51:07 -04:00
Kalila
3629427cff
Merge pull request #1161 from ctrlaltdavid/fix/spinbox
Fix settings (QML) spin box stepping
2021-04-26 03:39:56 -04:00
Glenn Alexander
307005d561
Update Snapshot.cpp
Changed string "highfidelity_url' to "vircadia_url"
String is used to form start of snapshot-image metadata.
First step of issue #1192.
2021-04-23 12:05:34 +10:00
Kalila
bb9460f6d9
Merge pull request #1162 from ctrlaltdavid/fix/osx-dmgs
Revise OSX DMGs
2021-04-19 17:01:05 -04:00
Kalila
dec3369583
Merge pull request #1178 from JulianGro/rename_fbx_to_model-serializers
Rename fbx to model serializers
2021-04-19 16:00:21 -04:00
Kalila
7bd91bcfb0
Merge pull request #1129 from digisomni/fix/save-lod-settings
Fix LOD manager defaults + settings not being saved correctly.
2021-04-19 15:45:30 -04:00
Kalila L
5c76139816 Update copyright headers. 2021-04-19 15:44:52 -04:00
David Rowe
ab34c6ef96 Default to mini tablet disabled 2021-04-17 16:56:43 +12:00
Kalila
0150c46836
Merge pull request #1142 from SilverfishVR/serverlessV3
Load serverless tutorial from local disk
2021-04-15 19:10:52 -04:00
Julian Groß
ecb7c47f1a Rename fbx folder to model-serializers 2021-04-15 19:26:10 +02:00
Kalila L
35b3c76da9 Merge remote-tracking branch 'upstream/master' into fix/save-lod-settings 2021-04-14 18:48:59 -04:00
Kalila
1dba5bedfa
Merge pull request #1149 from daleglass/add_thread_debugging
Implement thread debugging with tsan
2021-04-08 17:17:07 -04:00
Kalila L
048c273eaf "DEFAULT_LOD_MODE" -> "DEFAULT_LOD_AUTO_ADJUST" 2021-04-06 00:13:51 -04:00
David Rowe
87bb4654ee Fix up screenshare conditionals 2021-04-06 15:36:57 +12:00
David Rowe
6b18011a97 Don't include screenshare app in OSX client-only build 2021-04-06 12:34:13 +12:00
David Rowe
1ddbf15f14 Name OSX Interface target as Vircadia 2021-04-06 12:21:19 +12:00
David Rowe
f0eb6a3fcd Adjust numbers of decimals and step sizes in Settings dialogs 2021-04-05 12:15:08 +12:00
David Rowe
8b2aa93198 Fix step size in combined slider/spinner QML control 2021-04-05 12:14:52 +12:00
SilverfishVR
8434e4ea19 url's fixed 2021-04-05 01:18:14 +02:00
David Rowe
7088fc9d6c Merge branch 'master' into fix/spinbox 2021-04-05 10:41:31 +12:00
Kalila
8c92910861
Update interface/resources/qml/hifi/Pal.qml
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2021-04-03 22:49:56 -04:00