Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-15 01:08:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
83055 commits 69 branches 56 tags 1.2 GiB
Commit graph

749 commits

Author SHA1 Message Date
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
Marcus Llewellyn
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 47b7e9a5dc, reversing
changes made to 6d0ba98bfc.
 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
sabrina-shanman
566d09dc9c Add model preparation step to ModelCache using new library model-baker 2018-12-11 11:15:54 -08:00
sabrina-shanman
753557736e Merge branch 'master' into hfm_library 2018-11-12 15:03:30 -08:00
Brad Davis
8c4f0ec774 Vcpkg migration 2018-11-08 12:28:06 -08:00
sabrina-shanman
e00024e8b0 Create HFM library 2018-11-05 12:47:34 -08:00
Wayne Chen
a7abebd7aa adding redirect json to post build in Mac 2018-09-04 11:11:34 -07:00
Wayne Chen
6cdcae3349 switching address syntax, updating redirection domain 2018-08-29 16:11:51 -07:00
Wayne Chen
8a9ad421e7 adding serverless file + redirection if conn fail 2018-08-28 15:50:14 -07:00
Brad Davis
04e84f1d23 Moving to cmake time shader compiling 2018-08-03 14:58:11 -07:00
Andrew Meadows
a18ba36dd2 merge 'master' into 'workload' 2018-06-18 13:40:08 -07:00
Andrew Meadows
6d422e4678 Merge 'master' into 'workload' 2018-06-18 10:30:13 -07:00
Gabriel Calero
3911a93a38 Merge remote-tracking branch 'upstream/master' into breakpad_android 2018-06-07 19:00:16 -03:00
Gabriel Calero
8869af069e Integrate Breakpad in android Interface 2018-06-07 18:59:43 -03:00
Bradley Austin Davis
fa51c15849 Use binary resources on OSX 2018-06-06 15:10:52 -07:00
Andrew Meadows
06af31594e merge 'master' into 'workload' 2018-04-20 15:07:46 -07:00
David Rowe
06bb873e8d Include JSDoc Web pages in the install 2018-04-16 16:08:26 +12:00