Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-10 13:38:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
87688 commits 74 branches 59 tags 1.2 GiB
Commit graph

759 commits

Author SHA1 Message Date
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
5ec026255c
Merge pull request #938 from vircadia/feature/qt-update 
Update to Qt 5.15.2
 2021-04-22 17:36:53 -04:00
Kalila
bb9460f6d9
Merge pull request #1162 from ctrlaltdavid/fix/osx-dmgs 
Revise OSX DMGs
 2021-04-19 17:01:05 -04:00
Kalila
9463f8be0f
Merge pull request #1171 from daleglass/windows_memory_debugging 
Implement VIRCADIA_MEMORY_DEBUGGING for Windows
 2021-04-18 16:22:25 -04:00
Julian Groß
1cadfcc284
Merge branch 'master' into feature/qt-update 2021-04-16 01:55:51 +02:00
Kalila
d0d9d4b30b
Merge pull request #1163 from JulianGro/initial_linux_aarch64 
Initial partial linux aarch64 support
 2021-04-15 19:07:44 -04:00
Dale Glass
b42162b831 Implement VIRCADIA_MEMORY_DEBUGGING for Windows 
Only supported starting from VS2019 v16.9.

Only the address sanitizer is supported, as MS has not implemented any
others yet.
 2021-04-10 19:48:40 +02:00
David Rowe
c8632f8613 Merge branch 'master' into feature/qt-update-misc 2021-04-10 09:10:26 +12:00
Julian Groß
69a3f21e5d Initial partial linux aarch64 support 2021-04-06 03:50:36 +02:00
David Rowe
1ddbf15f14 Name OSX Interface target as Vircadia 2021-04-06 12:21:19 +12:00
David Rowe
c45a02036a Fix nitpick icon 2021-04-06 11:51:07 +12:00
David Rowe
a4787bcf29 Move OSX items into root directory of DMG 2021-04-06 11:46:13 +12:00
Dale Glass
e070a21bf4 Review fixes 2021-04-06 00:54:59 +02:00
Dale Glass
43f6fd82f4 Implement thread debugging with tsan 
This is enabled with the VIRCADIA_THREAD_DEBUGGING environment variable.
It's incompatible with VIRCADIA_MEMORY_DEBUGGING, so only one of those
can be enabled for a build.
 2021-04-02 20:41:23 +02:00
daleglass
7e91479614
Update cmake/macros/MemoryDebugger.cmake 
Co-authored-by: Julian Groß  <firedefender1@googlemail.com>
 2021-04-01 23:16:49 +02:00
Dale Glass
c02c38bf4a Emit error if memory debugging isn't implemented on the platform 2021-03-30 00:38:23 +02:00
Dale Glass
029e602075 Remove incorrect argument from clang memory debugger args, add leak detection. 2021-03-30 00:37:33 +02:00
Dale Glass
65c74986ee Rename variable to VIRCADIA_MEMORY_DEBUGGING 
This is to make it consistent with an upcoming addition of VIRCADIA_THREAD_DEBUGGING.

Also, check if the variable contains anything and isn't just defined to avoid hard
to figure out bugs and confusion.
 2021-03-30 00:35:54 +02:00
Dale Glass
5ffc05f7a7 Fix HIFI_MEMORY_DEBUGGING on Linux/gcc 
It seems that libasan was running into some sort of trouble due to static linking.

Additionally, -fstack-protector-strong has been enabled by disabling the usage of
the FIR_1x4_AVX512 function under memory debugging.
 2021-03-28 18:42:35 +02:00
David Rowe
c3b7d65617 Merge branch 'master' into feature/qt-update-master 
# Conflicts:
#	BUILD.md
 2021-03-25 10:18:38 +13:00
Kalila
6c223be3f4
Merge pull request #1081 from digisomni/feature/pkg-updates 
Rename to "Vircadia Server" and disable server shortcuts with Express install on Windows
 2021-03-14 17:35:03 -04:00
Kalila L
b5d89c44bf Rename "INITIAL_STARTUP_LOCATION" -> "PRELOADED_STARTUP_LOCATION". 2021-03-08 02:01:53 -05:00
Kalila L
3ed98d0f3e Add "ScriptGatekeeper" class and "PRELOADED_SCRIPT_WHITELIST" variable. 2021-03-08 02:00:34 -05:00
Kalila
fe3f006953
Update SetPackagingParameters.cmake 
Try to fix Apple builds.
 2021-03-08 00:14:50 -05:00
Kalila L
6ad9113bcc Rename "Vircadia Sandbox" -> "Vircadia Server" 2021-03-07 20:57:04 -05:00
Kalila L
357aa9a08b Update GenerateInstallers.cmake 
Add release name to end of installers.
 2021-02-22 23:28:27 -05:00
David Rowe
f69e0402aa Merge branch 'master' into feature/qt-update-master 
# Conflicts:
#	BUILD.md
#	BUILD_WIN.md
 2021-02-23 16:08:55 +13:00
Kalila L
2287aba7fa Update installer names and images "Alpha" -> "" 2021-02-01 05:10:45 -05:00
Kalila L
a0747b2912 Add "RELEASE_NAME" env variable. 2021-01-20 01:17:45 -05:00
David Rowe
d5530f180b Update Windows builds to Qt 5.15.2 2020-12-28 15:54:38 +13:00
David Rowe
71cee734ec Merge branch 'master' into fix/interface-console 
# Conflicts:
#	README.md
 2020-12-18 19:44:20 +13:00
David Rowe
fd1ea3cf04 Update Windows builds to OpenSSL 1.1.1h 2020-12-18 10:05:21 +13:00
ArcadeFever
65fb1320cc Upgraded Oculus SDKs to latest 2020-12-15 00:04:59 -08:00
David Rowe
c33fb5df84 Fix cmake warning when bypassing signing 2020-10-18 16:35:17 +13:00
David Rowe
5f283e45b5 Fix use of the BYPASS_SIGNING flag 2020-10-18 15:55:59 +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
Kalila L
11d847b74b Merge branch 'master' into feature/update-shortcut-names 2020-10-02 15:24:18 -04:00
Dale Glass
125841afc9 Remove the HiFiAC codec 
This is a proprietary codec and it's uncertain who can use it, and
under what conditions. At this point, Opus is stable and a suitable
replacement.
 2020-09-27 20:17:15 +02:00
Kalila L
bb3ea1014a Update shortcut names to include "Vircadia" 2020-08-24 23:47:36 -04:00
Kalila L
a2bd06993f Add option to build an Interface to go to specified address by default. 2020-08-23 01:49:32 -04:00
Kasen IO
cefda3f7f2 Update packaging parameters for Vircadia. 2020-06-01 22:48:38 -04:00
Thijs Wenker
eb1bf12494 Fix linux PR builds 2020-05-18 14:07:38 +02:00
Thijs Wenker
48ee437c00 cmake -D VCPKG_BUILD_TYPE could be set to either release debug or release in order to build vcpkg in a specific build type, otherwise it will build with debug and release 2020-04-19 22:50:49 +02:00
David Rowe
1254557814 Fix Linux cmake problem 
Credit: Dale Glass <dale@daleglass.net>
 2020-04-12 13:24:35 +12:00
David Rowe
b92bd1773a Fix copying PolyVox libraries to cmake binary directory 2020-04-11 20:24:10 +12:00
David Rowe
ffeb37e7aa Merge remote-tracking branch 'hifi/master' into merge-hifi-master 
# Conflicts:
#	CMakeLists.txt
#	README.md
#	cmake/externals/glad32es/CMakeLists.txt
#	cmake/externals/glad41/CMakeLists.txt
#	cmake/externals/glad45/CMakeLists.txt
#	cmake/externals/polyvox/CMakeLists.txt
#	cmake/externals/quazip/CMakeLists.txt
#	cmake/externals/vhacd/CMakeLists.txt
#	cmake/init.cmake
#	cmake/ports/hifi-deps/CONTROL
#	cmake/ports/sdl2/CONTROL
#	cmake/ports/sdl2/disable-hidapi-for-uwp.patch
#	cmake/ports/sdl2/enable-winrt-cmake.patch
#	cmake/ports/sdl2/fix-arm64-headers.patch
#	cmake/ports/sdl2/fix-x86-windows.patch
#	cmake/ports/sdl2/portfile.cmake
#	cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake
#	cmake/ports/tbb/portfile.cmake
#	hifi_vcpkg.py
#	interface/src/avatar/MyAvatar.h
#	libraries/avatars-renderer/src/avatars-renderer/Avatar.h
#	libraries/avatars/src/AvatarData.h
#	libraries/entities-renderer/src/RenderableEntityItem.h
#	libraries/entities/src/EntityItem.cpp
#	libraries/entities/src/EntityItem.h
#	libraries/fbx/src/GLTFSerializer.cpp
#	libraries/graphics-scripting/src/graphics-scripting/Forward.h
#	libraries/networking/src/AddressManager.cpp
#	libraries/networking/src/DomainHandler.h
#	libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
#	libraries/render-utils/src/HighlightEffect.cpp
#	libraries/render-utils/src/MeshPartPayload.cpp
#	libraries/render-utils/src/Model.cpp
#	libraries/render-utils/src/RenderShadowTask.cpp
#	libraries/script-engine/src/WebSocketClass.cpp
 2020-04-09 16:46:27 +12:00
Thijs Wenker
dcb575a178
Merge pull request #86 from MarcusLlewellyn/opus-plugin 
Add support for the Opus audio plugin.
 2020-01-31 01:04:47 +01:00
Marcus Llewellyn
a0fd53ae24 Change installer name from Beta to Alpha 2020-01-17 14:58:40 -06:00
Thijs Wenker
26bebba8dd fix opus library linking in cmake 
Signed-off-by: Marcus Llewellyn <marcus.llewellyn@gmail.com>
 2020-01-13 12:27:24 -06:00
Marcus Llewellyn
d030d82355 Cosmetic change for TargetOpus.cmake 2020-01-10 12:17:22 -06:00
Marcus Llewellyn
3d8d359c35 Initial work on Opus audio plugin 
This commit is made up of changes to VCPKG and CMake to include the Opus libraries, as well as a skeleton project for an Opus audio plugin.
 2020-01-09 16:43:11 +01:00
Marcus Llewellyn
986cb05f7b
Fix typo 
Tomato, Tohmahto, Athena, Athenay
 2019-12-29 17:40:51 -06:00
Marcus Llewellyn
f614f6f290 Stuff I forgot in last commit for NSIS 2019-12-22 15:44:25 -06:00
Simon Walton
16b6c6305b Fix formatting issues in cmake file 2019-12-10 09:46:35 -08:00
Simon Walton
82ed358323 Merge remote-tracking branch 'upstream/master' into linux-actions-builds 
Also merge in Linux PR build
 2019-12-05 16:19:12 -08:00
Brad Davis
f39088fb0b Github Actions master builds 2019-12-03 10:56:04 -08:00
Brad Davis
0240a6e3d9 Update prebuilt dependencies 2019-11-25 11:42:09 -08:00
Simon Walton
167dfab539 Copy PolyVox libs to build directory; don't try to upload docker image 2019-11-22 15:17:23 -08:00
Simon Walton
9e5c0a7afc Copy quazip lib to build dir; built server-console 2019-11-21 15:02:08 -08:00
Anthony J. Thibault
befbdcef48 Upgraded OSC plugin with changes from ARKit blendshape work. 2019-11-19 13:13:56 -08:00
Brad Davis
d4b3a9ba49 Github actions 2019-11-18 15:20:37 -08:00
Zach Fox
1e24df3f71 Get Interface to look in the proper directories 2019-10-31 08:57:06 -07:00
milad
ea373ac14c First steps towards a screenshare app 2019-10-30 16:44:42 -07:00
Ken Cooke
97dab24a69 Fix Android clang warnings due to unused compiler flags 2019-09-26 15:45:26 -07:00
Shannon Romano
65d0bb1342
Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc 
Kasen Plugin Infrastructure v½ Codename "Modkit Mini"
 2019-09-11 13:04:01 -07:00
dante ruiz
f80fb39447 Lowercase interface 
Launcher expects a lower-cased "Interface". This ensures that it's
created lower-cased on case sensitive filesystems.
 2019-09-06 11:19:54 -07:00
Brad Davis
7c84d897ba Fix webrtc link errors in debug builds 2019-09-05 14:16:52 -07:00
humbletim
271fac4bca Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge 2019-09-05 09:46:21 -04:00
amerhifi
7a1828e0cb removed interface name from shortcut 2019-08-27 21:41:45 +02:00
Seth Alves
27b574cf14 disable webrtc for android 2019-07-30 14:09:34 -07:00
Seth Alves
c1cadf670e update webrtc library, enable for android 2019-07-30 14:09:31 -07:00
Seth Alves
32d5ab7b1f Make WebRTC library available 2019-07-30 14:09:30 -07:00
humbletim
058c81aa1a Merge branch 'hifi-master' into kpi-v1-modkit-rc 2019-07-26 01:36:52 -04:00
humbletim
6ae75ecafe segregated scripting/ plugins (re: permissions checkbox) 2019-07-26 01:31:42 -04:00
Ryan Huffman
2ec87f4e61 Add serverless tutorial 2019-07-24 16:38:03 -07:00
Matt
34908e54ef
Merge pull request #15873 from Atlante45/feat/qt-5.12.3-upgrade 
BUGZ-820: Remove QT_CMAKE_PREFIX_PATH prod hack
 2019-07-12 10:24:06 -07:00
SamGondelman
bda87aa13f trying to fix android 2019-07-11 16:39:23 -07:00
SamGondelman
9539664749 add haze to skybox 2019-07-11 11:00:30 -07:00
SamGondelman
d545ba5bc6 haze on most entities, working on skybox 2019-07-10 23:52:50 -07:00
SamGondelman
981311778c comments 2019-07-03 10:41:10 -07:00
Clement
c7442e3a62 Remove QT_CMAKE_PREFIX_PATH prod hack 2019-07-02 16:00:55 -07:00
SamGondelman
68d2f9581f add ability for slp files to define shader variants 2019-06-03 19:16:42 -07:00
Anthony Thibault
736d002f59 Apparently APPLE is UNIX in cmake. 2019-05-30 09:44:27 -07:00
Anthony Thibault
5c982855ab Added cmake messages to help debug config issues 
Also remove uncessary HIFI_QT_INSTALL_ROOT env varaible from hifi_vcpkg.py
 2019-05-30 09:22:53 -07:00
Anthony J. Thibault
ddf1543d68 Update mac qt build 
* Reformat whitespace in README.md
* hifi_vckpg.py: Remove macos var/temp hack for vcpkg
* hifi_vckpg.py: Add ability to override HIFI_QT_INSTALL_ROOT dir with environment variable.
* hifi_vckpg.py: Update macos url for pre-built qt 5.12.3 on S3.
* cmake/ports/bullet3/portfile.cmake: add comment to force change in vcpkg hash.
* tools/qt-builder/README.md: updated formatting and added details about how to generate symbols for macos and pc
* tools/qt-builder: added prepare python scripts for symbols
* cmake/macros/SetupQt.cmake: Remove hardcoded var/temp qt cmake path
 2019-05-29 17:11:24 -07:00
Andrew Meadows
670effd372 handle case when QT_CMAKE_PREFIX_PATH not defined on UNIX 2019-05-21 03:52:01 -07:00
Andrew Meadows
8dcc617acc obey QT_CMAKE_PREFIX_PATH for non DEV_BUILD on UNIX 2019-05-20 20:20:20 -07:00
Andrew Meadows
528a64c618 hack QT_CMAKE_PREFIX_PATH for Jenkins macos builds 2019-05-18 06:45:25 -07:00
Andrew Meadows
9e8d604373 remove debug logs 2019-05-16 16:35:16 -07:00
Andrew Meadows
3e63734123 more correct QT_VERSION detection for MacOS 2019-05-16 13:50:23 -07:00
Andrew Meadows
595edb9f6e more correct QT_VERSION detection 2019-05-16 12:29:37 -07:00
Andrew Meadows
4cf9673dbb Merge master into 22007-hifiQtBuildv2 2019-05-15 14:10:30 -07:00
Roxanne Skelly
72fe3a66f5 Debugging code to monitor the queue depth for a few critical threads 2019-05-13 15:56:55 -07:00
NissimHadar
c0201ac2ba Corrected cmake macros. 2019-05-04 18:45:51 -07:00
NissimHadar
844fbec36f So that both Jenkins and local Mac are happy. 2019-05-04 18:09:54 -07:00
NissimHadar
50d1958c4c Reverted unneeded changes. 2019-05-04 17:30:49 -07:00
NissimHadar
604f506dec Merge branch '22007-hifiQtBuildv2' of github.com:NissimHadar/hifi into 22007-hifiQtBuildv2 2019-05-03 19:24:45 -07:00
NissimHadar
88a89de7c6 Merge branch 'master' of github.com:highfidelity/hifi into 22007-hifiQtBuildv2 2019-05-03 19:18:34 -07:00
NissimHadar
c12d270f8a Use macdeployqt in post build 2019-04-29 14:33:17 -07:00