Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 20:42:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
63325 commits 71 branches 56 tags 1.2 GiB
Commit graph

1443 commits

Author SHA1 Message Date
Bradley Austin Davis
fb79ba2c6c Migrate to vcpkg version of OpenSSL 2017-08-31 10:49:49 -07:00
Stephen Birarda
81fdc27ca8 use 2017.1 FBX SDK on all platforms, change linux location 2017-08-30 16:46:43 -07:00
Atlante45
8a291f16ff Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-08-25 15:26:38 -07:00
Stephen Birarda
2661f92e09 fix state setting for express/custom 2017-08-25 14:05:40 -07:00
Stephen Birarda
6ac255dd21 add custom install reg key to cpack properties 2017-08-25 12:07:26 -07:00
Stephen Birarda
e848253618 remember if express or custom was selected for install 2017-08-25 10:59:56 -07:00
Ryan Huffman
39f04adc8d Improve baking interface and add automatic baking to asset server 2017-08-24 16:15:28 -07:00
druiz17
d5644885fa Merge pull request #11177 from anshuman64/icon-rename 
Correct desktop icon name
 2017-08-14 08:55:17 -07:00
Anshuman Dewangan
3bc185e67c Correct desktop icon name 2017-08-11 15:37:55 -07:00
Brad Davis
be9c1b0d12 Revert "Fix bad plugins causing instant crash on startup" 2017-08-10 16:05:16 -07:00
Anshuman Dewangan
f79bf4e009 High Fidelity Interface rename 2017-08-10 13:40:00 -07:00
Chris Collins
5a5ba08ae9 Merge pull request #11155 from jherico/fix_bad_plugins 
Fix bad plugins causing instant crash on startup
 2017-08-10 12:35:58 -07:00
Stephen Birarda
feef7dfec3 compare MSVC version numerically with greater_equal 2017-08-10 09:46:58 -07:00
Stephen Birarda
5b072b591e remove commas breaking MSVC dir setting 2017-08-09 18:41:34 -07:00
Stephen Birarda
57fe5ae802 use tbb binaries more and update for vc14 2017-08-09 17:55:15 -07:00
Brad Davis
0452bcfbd5 Fix bad plugins causing instant crash on startup 2017-08-09 17:15:04 -07:00
utkarshgautamnyu
56c695acbb Update NSIS.template.in 2017-08-07 18:34:20 -07:00
utkarshgautamnyu
dc4121f9d1 Update NSIS.template.in 2017-08-07 17:55:45 -07:00
utkarshgautamnyu
b80def995f Update NSIS.template.in 2017-08-07 17:53:39 -07:00
utkarshgautamnyu
c9c36bb19e indentation fixes 2017-08-07 17:50:53 -07:00
utkarshgautamnyu
3ee5f78c40 bug fixes for express installer 2017-08-07 17:44:07 -07:00
Chris Collins
6d57b4df38 Merge pull request #11108 from jherico/installer_remove_pdb 
Fix installer issues
 2017-08-03 12:51:58 -07:00
Marko Kudjerski
2279e174e6 Switching to completely silent VC++ redistributable installation 2017-08-03 09:41:41 -07:00
Ken Cooke
3c1607715e Updated WASAPI plugin 2017-08-02 17:42:56 -07:00
Brad Davis
5a7a6bab70 Remove PDB files, eliminate sixense 2017-08-02 14:08:46 -07:00
Marko Kudjerski
6855dcbacf use bzip2 compression only for PR builds (so that we internally benefit from faster builds) 2017-07-31 17:17:11 -07:00
Marko Kudjerski
ae31df426c remove vcredist_x64 after installation 2017-07-31 16:52:38 -07:00
Marko Kudjerski
46966b1132 switching from LZMA (default) to BZIP2 for NSIS compression 2017-07-31 16:19:34 -07:00
Marko Kudjerski
de97dfc9d7 install the bundled vcredist_x64 instead of relying on DLLs being setup by cmake directly in the install folder 2017-07-31 15:25:02 -07:00
Brad Hefta-Gaub
3aca1e1d84 Merge pull request #11004 from highfidelity/express_custom_install 
Added a page in installer for express/custom installation
 2017-07-27 13:14:56 -07:00
utkarshgautamnyu
e5ddded464 Moved Express/Custom install window just after EULA window 2017-07-25 16:16:15 -07:00
Brad Davis
b1aa6e1962 Move hosting for quazip back to hifi S3 2017-07-25 13:43:10 -07:00
utkarshgautamnyu
0ae8f4526e Merge branch 'express_custom_install' of https://github.com/highfidelity/hifi into express_custom_install 2017-07-20 13:55:39 -07:00
utkarshgautamnyu
7ddac54b37 copy from production for PR builds unchecked for custom and express also over rides deselection 2017-07-20 13:55:04 -07:00
Brad Davis
3a31805dff Fix warnings in Qt 59 / VS 2017 build 2017-07-20 11:57:12 -07:00
utkarshgautamnyu
2310ecab8d Update NSIS.template.in 2017-07-20 11:18:49 -07:00
utkarshgautamnyu
de5984d121 Update NSIS.template.in 2017-07-20 10:39:04 -07:00
utkarshgautamnyu
0277f6a7e6 Update NSIS.template.in 2017-07-20 10:11:24 -07:00
utkarshgautamnyu
0a64a1e3b0 Added a page in installer for express/custom installation 2017-07-19 18:26:35 -07:00
utkarshgautamnyu
35f97837e7 ensured clean install state is not saved in the registry 2017-07-13 10:50:14 -07:00
utkarshgautamnyu
902705297f indentation fix 2017-07-12 16:28:21 -07:00
utkarshgautamnyu
d6ac67d221 Added option for clean install 2017-07-12 16:09:30 -07:00
Ryan Huffman
b8ce4b9006 Merge pull request #10801 from huffman/fix/oven-native-separators 
Add support for native separators in oven, and vs2015/2017 FBX sdk
 2017-07-03 12:07:26 -07:00
Ryan Huffman
5f92c1adc0 Update FindFBX to use newer MSVC_VERSION 2017-06-26 09:40:07 -07:00
Ryan Huffman
7298cd6940 Add support for vs2015 and vs2017 FBX libs 2017-06-23 10:54:31 -07:00
David Rowe
9d0407cbdf Merge branch 'master' into 21396 2017-06-23 16:52:04 +12:00
Zach Fox
e5666fbb2f Two different options for server and client 2017-06-22 15:44:55 -07:00
Zach Fox
2318b6aef8 Add a /forceNoLaunch switch to the installer 2017-06-22 15:02:59 -07:00
Howard Stearns
922b66d447 Merge pull request #10779 from howard-stearns/no-sand-box-if-new-install-option 
installer allows /nSandboxIfNew command line switch
 2017-06-22 13:37:28 -07:00
Brad Hefta-Gaub
197006e3d3 Merge pull request #10780 from kencooke/audio-hrtf-avx512 
HRTF optimizations
 2017-06-22 13:34:05 -07:00
howard-stearns
cec4b4e86b change var to a global per CR 2017-06-22 12:54:30 -07:00
howard-stearns
6a5dfd6fc5 Merge branch 'master' of https://github.com/highfidelity/hifi into no-sand-box-if-new-install-option 2017-06-22 12:13:59 -07:00
David Rowe
6ff8aed5e3 Merge branch 'master' into 21396 2017-06-22 23:54:15 +12:00
howard-stearns
8f51beda17 installer allows /nSandboxIfNew command line switch, which defaults 
sandbox to off if this is a new install
 2017-06-21 16:54:47 -07:00
Seth Alves
0d9aa8182e have cmake find fbx library on Linux 2017-06-21 17:10:19 -04:00
Ken Cooke
b3bb91af8c CMAKE: detect compiler support, add flags for AVX512 source files 2017-06-21 10:25:34 -07:00
Brad Davis
ed6620fc51 Merge pull request #10718 from jherico/frame_thread 
Cleanup and refactoring
 2017-06-19 13:31:44 -07:00
Seth Alves
f42146c139 dry up quazip cmake 2017-06-18 13:24:24 -07:00
Seth Alves
a1571608db try some more 2017-06-18 11:48:11 -07:00
Seth Alves
242d615b50 sigh 2017-06-18 11:16:36 -07:00
Seth Alves
fd137e1a84 build quazip with c++11 2017-06-18 10:22:50 -07:00
David Rowe
2ca4283828 Fix Leap Motion SDK access 2017-06-17 12:02:26 +12:00
Brad Davis
a69cf31f4b PR feedback and cmake fixes 2017-06-16 16:59:58 -07:00
Ken Cooke
45db8c3bef Rebase optimizations on NVTT 2.1.0 instead of master 2017-06-05 11:18:54 -07:00
Ken Cooke
024499bdc4 Optimized NVTT library with fast gamma conversion 2017-06-04 12:59:15 -07:00
Brad Hefta-Gaub
a88f72024d Merge pull request #10243 from birarda/bake-textures 
Add an internal tool for domain/model/skybox KTX texture baking
 2017-05-12 12:26:33 -07:00
Ken Cooke
807a6d5831 Bugfix: new threading changes in the Qt5.7.1 plugin were causing deadlock 2017-05-08 18:03:50 -07:00
Ken Cooke
746ae6dfd3 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-wasapi-qt562 2017-05-08 17:56:19 -07:00
Brad Davis
5e1bc0d908 Remove faceshift 2017-04-28 16:34:54 -07:00
Ken Cooke
9e77771c99 Update WASAPI audio plugin for Qt5.6.2 2017-04-28 12:00:01 -07:00
Stephen Birarda
4863c924d1 don't link or include missing FBX library 2017-04-26 18:37:36 -07:00
Stephen Birarda
6519a9c45b bump FBX SDK version back to 2017 2017-04-26 18:37:35 -07:00
Stephen Birarda
32c348eb3d use SDK 2017 with new texture discovery strategy 2017-04-26 18:37:34 -07:00
Stephen Birarda
b04d507090 use correct FBX_VERSION for WIN32 2017-04-26 18:37:34 -07:00
Stephen Birarda
a586a31a93 stub the oven tool and add a find module for FBX SDK 2017-04-26 18:37:34 -07:00
Stephen Birarda
e3ab2615c1 allow NVTT to be built as external on android 2017-04-25 15:56:23 -07:00
Stephen Birarda
7968045626 update md5 for patched external nvtt 2017-04-25 15:56:23 -07:00
Stephen Birarda
11fa2797b7 force the release DLL path for NVTT on windows 2017-04-25 15:56:23 -07:00
Stephen Birarda
202e933d8b don't build, install, or configure nvtt on windows 2017-04-25 15:56:23 -07:00
Stephen Birarda
06b3b3d5f4 ad missing include dir for NVTT on win 2017-04-25 15:56:23 -07:00
Stephen Birarda
d72e5e5b24 add handling for install_name_tool calls on OS X 2017-04-25 15:56:23 -07:00
Stephen Birarda
3a217f75f4 force release for NVTT on Win32 2017-04-25 15:56:23 -07:00
Stephen Birarda
5c12180b58 use pre-built NVTT on windows 2017-04-25 15:56:23 -07:00
Stephen Birarda
27c6011e6e change nvtt external to ignore release type 2017-04-25 15:56:23 -07:00
Stephen Birarda
ee62e7dcb8 update nvtt external to build from source 2017-04-25 15:56:22 -07:00
Atlante45
94e1cbbc95 Upload nvtt archive to S3 2017-04-25 15:56:22 -07:00
Atlante45
0428b22b63 Add nvtt external 2017-04-25 15:56:22 -07:00
Stephen Birarda
b57bf956e2 make server plugins a dependency of AC too 2017-04-10 11:23:43 -07:00
Anthony J. Thibault
42262aac78 OpenVR: upgrade to version 1.0.6, for better generic tracker support 2017-04-05 18:41:43 -07:00
Brad Hefta-Gaub
692dc75977 Merge pull request #10025 from ZappoMan/improvedKinectCmake 
add the default environment variable name for the kinect plugin to the search hints
 2017-03-28 15:07:56 -07:00
Seth Alves
4516ddf855 Merge pull request #9847 from highfidelity/tablet-ui 
Tablet ui
 2017-03-28 14:48:02 -07:00
Andrew Meadows
e22d825d07 Merge pull request #9989 from birarda/bullet-rel-with-debug 
fix fresh MinSizeRel and RelWithDebugInfo builds
 2017-03-28 12:35:24 -07:00
ZappoMan
876dd4c850 add the default environment variable name for the kinect plugin to the search hints 2017-03-27 15:02:00 -07:00
Seth Alves
bb28976d0e Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-26 09:32:35 -07:00
Seth Alves
7455dcc2db Merge pull request #9985 from jherico/cmake_threads 
Force thread linkage
 2017-03-26 07:27:07 -08:00
Seth Alves
902e3d41d6 merge from upstream 2017-03-24 08:20:35 -07:00
Stephen Birarda
a798773425 fix polyvox location for MinSizeRel 2017-03-23 17:31:02 -07:00
Stephen Birarda
85dc63a671 fix multi-line strings in VHACD and faceshift externals 2017-03-23 17:26:32 -07:00
Stephen Birarda
22c7d4032b fix debug config handling of release faceshift lib 2017-03-23 17:13:19 -07:00
Stephen Birarda
6d38b1fe72 handle MinSizeRel configuration in vhacd external 2017-03-23 17:11:30 -07:00