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
bb9460f6d9
Merge pull request #1162 from ctrlaltdavid/fix/osx-dmgs
...
Revise OSX DMGs
2021-04-19 17:01:05 -04:00
Julian Groß
ecb7c47f1a
Rename fbx folder to model-serializers
2021-04-15 19:26:10 +02: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
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
Dale Glass
7b6fbe1f69
Set OpenGL_GL_PREFERENCE to LEGACY
...
GLVND appears to break the entire UI on ATI video cards.
It was set to GLVND due to an understanding that this was a no-op setting, but it turns
out the documentation in OpenGL_GL_PREFERENCE is confusing, and it looks like LEGACY
is the setting that was being used after all.
An additional point of interest is that debian/rules contained OpenGL_GL_PREFERENCE=GLVND,
and this was done back in the High Fidelity days. It's uncertain whether this was correct
or not, though.
2020-10-13 20:13:45 +02:00
Dale Glass
1c44bc96d9
Set GL preference to GLVND
...
This should be a no-op, besides generating less build warnings,
since:
"CMake 3.11 and above prefer to choose GLVND libraries."
And 3.11 is a few years old at this point
2020-09-27 20:37:12 +02:00
Julian Groß
dce34b8d90
Change strings, comments and folders to Vircadia
2020-07-09 16:03:07 +02:00
Kasen IO
cefda3f7f2
Update packaging parameters for Vircadia.
2020-06-01 22:48:38 -04: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
6d9f040bfd
Merge pull request #158 from daleglass/linux_dynamic_build
...
Force dynamic build on Linux
2020-02-22 20:36:19 +01:00
8ab06f5e0e
Change to Project Athena in Task Manager
2020-02-19 16:37:22 -06:00
Dale Glass
39f23b52c3
Force dynamic build on Linux, fixes #151
2020-02-05 23:30:04 +01:00
kasenvr
0bdfdfff4a
Merge pull request #43 from ctrlaltdavid/fix/re-enable-jsdoc
...
Re-enable JSDoc building
2020-01-06 18:37:58 -05:00
Kasen IO
0b66627eff
The command line no longer launches with interface.
2019-12-29 23:48:32 -05:00
David Rowe
a7d2412f11
Re-enable JSDoc building
2019-12-29 16:00:47 +13:00
milad
63e6875e27
added flag for windows and apple only on dependency
2019-12-04 11:28:32 -08:00
milad
f350701eac
fixed resouce path and removed unused include
2019-12-04 08:44:56 -08:00
dante ruiz
aeab06de53
fixing screenshare cmake issue for mac
2019-12-03 14:03:52 -08:00
Kasen IO
0b46c53df1
Merge branch 'kasen/core' into v0860-kasen-release+freshstart
2019-12-01 19:59:59 -05:00
Anthony J. Thibault
da0911e01b
Delete legacy blendshape code
...
Move FaceshiftConstants to BlendshapeConstants.
Delete FaceTracker and DdeFaceTracker classes.
Delete old facetracker menu and preferences
2019-10-16 10:36:37 -07:00
Ken Cooke
3f686be7ab
Add all Objective-C sources in CMakeLists.txt
2019-09-26 10:50:00 -07:00
Matt Hardcastle
f91ec8fbf5
Call Interface "High Fidelity" on macOS
2019-08-30 09:18:36 -07:00
amerhifi
335dea43df
changing app name to high fidelity and changing icons to the new logo
2019-08-27 20:08:21 +02:00
Kalila R
28b27a1e48
Merge branch 'v0.83.0-rc' into kasen/core
2019-08-03 15:27:23 -04:00
dante ruiz
ce2849b570
Revert "Merge pull request #15944 from danteruiz/add-signing"
...
This reverts commit 47b7e9a5dc6d0ba98bfc
2019-07-23 09:38:32 -07:00
Matt Hardcastle
afb5f81ca0
Add signing to macOS Interface and HQ Launcher
...
This change adds signing to the macOS version of Interface and HQ
Launcher. By default, signing is not enabled; to enable signing you must
add the `XCODE_DEVELOPMENT_TEAM` environment variable and rerun CMake.
Jira: https://highfidelity.atlassian.net/browse/DEVOPS-52
2019-07-15 10:54:44 -07:00
Andrew Meadows
f2f11b9509
only build qt.conf for DEV macos and unix builds
2019-05-20 15:00:07 -04:00
Andrew Meadows
9b78edd062
more correct qt.conf for Linux and MacOS dev environment
2019-05-20 11:50:09 -04:00
Andrew Meadows
c660ddd1af
Merge master into 22007-hifiQtBuildv2
2019-05-16 12:31:39 -07:00
Andrew Meadows
9884d390b8
fix qt.conf location for MacOS
2019-05-15 09:34:08 -07:00
Andrew Meadows
2d21b5c269
use qt.conf file to find Qt resources
2019-05-13 14:26:16 -07:00
amerhifi
0d97543ece
code cleanup based on discussion with Sam. Adding implementation for graphics and display info from gpuiden. removed dxgi references in platform
2019-05-09 12:04:41 -07:00
amer cerkic
f09f6ebd08
initial interface setup for platform
2019-05-02 15:50:35 -07:00
Revofire
47af406440
merged 0.80.0-kasen into 0.81.0-kasen, 0.81.0-kasen source ready for build.
...
various changes, idk, added a whitelist filter to ent script filter
2019-05-01 22:13:51 -04:00
Sam Gondelman
9aa99f24f0
Merge pull request #14905 from SamGondelman/materialMapping
...
Case 20242: FST materialMapping supports our material JSON format
2019-02-15 11:21:51 -08:00
Sam Gateau
384d4fb959
Merge pull request #14809 from highfidelity/commandLineAndroid
...
case 19113: Recreated changes due to CLA issue in previous pr. Adding args to int…
2019-02-14 12:10:08 -08:00
SamGondelman
13ece79476
merge with master
2019-02-13 16:30:22 -08:00
SamGondelman
77a8ddb3f0
Merge remote-tracking branch 'upstream/master' into materialMapping
2019-02-11 16:35:05 -08:00
SamGondelman
f7a487a020
move materialcache et al to material-networking library
2019-02-08 10:28:07 -08:00
Brad Davis
d3301803d3
Support custom display / input plugin lists and small tweaks
2019-02-07 15:15:26 -08:00
Brad Davis
8a1a55189a
CMake cleanup and modernization
2019-01-30 16:23:14 -08:00
amer cerkic
708da45ccc
recreated changes due to CLA issue in previous pr. Adding args to intent so that app can parse as comamnd line args.
2019-01-30 11:47:06 -08:00
