Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-13 21:47:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85082 commits 22 branches 28 tags 1.2 GiB
Commit graph

31256 commits

Author SHA1 Message Date
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