Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-03 05:51:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
71833 commits 73 branches 59 tags 1.2 GiB
Commit graph

1606 commits

Author SHA1 Message Date
Stephen Birarda
3cf77f377c remove FBX SDK from CMake files 2017-09-07 18:46:44 -07:00
Brad Hefta-Gaub
ca00349abc Merge pull request #11248 from birarda/feat/install-remember-custom 
remember if express or custom was selected for install
 2017-09-07 12:43:01 -07:00
Stephen Birarda
5e1decb02b Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake 2017-09-07 12:06:53 -07:00
Thijs Wenker
e2229b3c38 Merge pull request #11302 from cain-kilgore/21523 
WL 21523 - Update text in the "How to Quit The Sandbox" Prompt
 2017-09-07 21:04:34 +02:00
Cain Kilgore
84f37b9663 Changed string name 2017-09-07 18:53:05 +01:00
Cain Kilgore
d429bd0b01 Changed the Interface text to say 'Task bar' instead of 'system tray' 2017-09-06 13:42:13 +01:00
Cain Kilgore
2a6b523542 Again 2017-09-06 13:09:43 +01:00
Cain Kilgore
14e5cf31f2 Apparently I didn't need 'em 2017-09-06 12:42:17 +01:00
Cain Kilgore
4d0df705a9 Forgot some {}'s 2017-09-06 11:46:57 +01:00
Cain Kilgore
e9f666d970 Made the system tray message specific to Sandbox only 2017-09-06 02:06:10 +01:00
Cain Kilgore
99a99ce71b WL 21513 - Update text in the "How to Quit The Sandbox" Prompt 2017-09-04 21:14:26 +01:00
Brad Davis
e64227bccd Fix mac build 2017-09-03 09:50:25 -07:00
Brad Davis
9c03fa0369 Cleanup CMake 2017-09-02 16:15:14 -07:00
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
Stephen Birarda
0367f70a39 interpolate CONFIG for polyvox library path 2017-03-23 17:07:51 -07:00
Stephen Birarda
ee521ed369 handle library release path for faceshift MinSizeRel build 2017-03-23 17:06:22 -07:00
Stephen Birarda
5311de1f7b handle MinSizeRel library discovery for bullet external 2017-03-23 17:05:08 -07:00
Stephen Birarda
e100a7bedb point VHACD external to correct library for RelWithDebugInfo 2017-03-23 16:54:21 -07:00
Stephen Birarda
670f51af0b fix reference to RelWithDebugInfo library for polyvox 2017-03-23 16:50:03 -07:00
Stephen Birarda
be34e5a814 fix RelWithDebInfo path for faceshift 2017-03-23 16:46:52 -07:00
Stephen Birarda
654ae5032b simplify the RelWithDebInfo check in bullet ext 2017-03-23 16:11:48 -07:00
Stephen Birarda
b023cb71be when building RelWithDebInfo check for correct bullet libs 2017-03-23 16:02:39 -07:00
Brad Davis
8116de7c14 Force thread linkage 2017-03-23 13:45:13 -07:00
Stephen Birarda
c9d1916eea fix for build with win path with spaces 2017-03-20 18:24:19 -07:00
Seth Alves
509ce3f2d2 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-07 18:41:36 -08:00
Brad Davis
f9dcfa54aa Add debug/release builds to oculus lib 2017-03-06 16:08:21 -08:00
Bradley Austin Davis
c892d8a81a Update Oculus SDK to 1.11 2017-03-03 10:41:47 -08:00
Dante Ruiz
3ba605bf23 saving work 2017-02-23 00:28:30 +00:00
Ken Cooke
ab0d5ec178 Fix for memory-leak in Windows audio stack (audiodg.exe grows without bound) 2017-01-30 11:59:30 -08:00
Brad Hefta-Gaub
e4c59472ee Merge pull request #9468 from kencooke/audio-mixformat-float 
Fix another audio failure
 2017-01-23 16:52:54 -08:00
Zach Pomerantz
daf507fc81 revert "Use supplied libquazip5.so for Debug builds" for WIN32/OSX 2017-01-23 13:02:15 -05:00
Ken Cooke
4d6eea9a63 Updated WASAPI plugins to force dwChannelMask = KSAUDIO_SPEAKER_DIRECTOUT 2017-01-20 16:40:32 -08:00
Stephen Birarda
d0236af334 use select_library_configurations for LibOVRPlatform 2017-01-05 11:20:44 -08:00
Stephen Birarda
1a50a11741 have FindLibOVRPlatform produce LIBOVRPLATFORM_LIBRARY 2017-01-05 11:20:44 -08:00
Stephen Birarda
ac7637f8ff use _LIBRARY_RELEASE for LibOVRPlatform external 2017-01-05 11:20:44 -08:00
Stephen Birarda
4278d7b20d download and link oculus platform for oculus plugin 2017-01-05 11:20:44 -08:00
Zach Pomerantz
0bb82d2b73 use libquazip5.so in debug 2016-12-28 16:06:32 -05:00
Seth Alves
26639aac15 Merge pull request #8789 from Atlante45/fix/settings 
Use JSON for application Settings
 2016-12-15 07:00:46 -08:00
Brad Hefta-Gaub
a2ba03284e Merge pull request #9186 from ZappoMan/kinectPlugin 
Kinect Plugin
 2016-12-13 15:29:41 -08:00
Brad Hefta-Gaub
1b047d6901 fix cmake snafu 2016-12-12 11:39:10 -08:00
Brad Hefta-Gaub
4959a88581 first cut at kinect input plugin 2016-12-08 22:13:56 -08:00
Atlante45
5f2c77928a Restore "Updated the Qt audio plugins"" 
This reverts commit f7e8d47426.
 2016-12-08 14:14:48 -08:00
Clément Brisset
06331494af Revert "Revert "Select Audio DLL at runtime"" 2016-12-08 14:14:03 -08:00
Ken Cooke
b888ce890c Updated the Qt audio plugins 2016-12-03 07:26:55 -08:00
Atlante45
e6b9d3604d Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings 2016-12-01 09:45:50 -08:00
Atlante45
db263df03e Select Audio DLL at runtime 2016-11-29 19:42:59 -08:00
Atlante45
3035d43772 Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings 2016-11-21 13:05:08 -08:00
Zach Fox
2c0cfdf241 Fix build for real? 2016-11-18 14:39:30 -08:00
Zach Fox
5e8afb04c7 Potentially fix OSX and Linux build errors? 2016-11-18 14:39:30 -08:00
Zach Fox
fc21cae904 More stable than ever! Uses external GifCreator lib. Still frame timing issues. 2016-11-18 14:39:29 -08:00
Chris Collins
c81b0fc018 Merge pull request #9091 from kencooke/audio-multichannel 
Multichannel audio support
 2016-11-18 13:32:59 -08:00
Atlante45
2f2da8ccd3 Do not read launchClientNowState if client disabled 2016-11-16 13:15:10 -08:00
Atlante45
9e0230980b Enable Server Only install 2016-11-16 10:52:30 -08:00
Atlante45
d7d54dd82f Only launch interface if selected 2016-11-16 10:44:59 -08:00
Ken Cooke
171cb14087 New WASAPI Qt plugins that implement multichannel formats using WAVEFORMATEXTENSIBLE. 
QAudioInput, QAudioOutput, and IsFormatSupported() now support channels > 2.
dwChannelMapping is always set to 0xffffffff (1:1 passthru).
 2016-11-16 10:38:51 -08:00
Seth Alves
92836caf57 when creating plugins on Linux with memory-debugging enabled, use asan flags such that the shared libraries can be loaded 2016-11-12 10:01:29 -08:00
Ryan Huffman
3d160cca75 Merge pull request #8969 from huffman/feat/task-manager-app-name 
Add "High Fidelity" to sandbox and interface description in Windows Task Manager
 2016-11-02 14:21:19 -07:00
Atlante45
46102d93c6 Launch interface on install after content loading 2016-11-01 18:15:27 -07:00
Ryan Huffman
5f8cee787f Update VersionInfo.rc.in to use TARGET_NAME.exe as original filename 2016-11-01 09:07:56 -07:00
Ryan Huffman
ea31a8e3b4 Add VersionInfo.rc.in 2016-11-01 08:59:56 -07:00
Seth Alves
4d55bc1b32 adjust build arguments used with asan on Linux 2016-10-27 10:09:29 -07:00
Brad Hefta-Gaub
03946748bc Merge pull request #8928 from hyperlogic/bug-fix/more-openvr-crash-fixes 
Fix for crash in openvr on startup
 2016-10-26 22:45:33 -07:00
Anthony J. Thibault
7ac3a189a0 generate pdb files for plugins as well 
I'm going to coordinate with marco to ensure that these pdb files are uploaded to bugsplat as well.
It will make hard to reproduce crashes in display plugins easier to diagnose in the future.
 2016-10-26 17:48:28 -07:00
Brad Davis
f4f1b04cf0 Use OpenVR to determine if async reprojection is enabled 2016-10-26 16:02:06 -07:00
Mat Tyndall
1966a710b5 set inital USE_STABLE_GLOBAL_SERVICES to 0 2016-10-13 00:12:05 -07:00
Mat Tyndall
0e567da8d2 changed USE_STABLE_GLOBAL_SERVICES to use 1 2016-10-13 00:01:17 -07:00
Atlante45
36bd9ef4e6 Update new ACClientApp code 2016-10-12 14:02:05 -07:00
Atlante45
eaca3b672f Switch to JSON for application settings 2016-10-12 10:20:19 -07:00
Chris Collins
328ac71f8b Merge pull request #8739 from kencooke/audio-fixes3 
Fix 16khz support and hot-unplugging audio devices
 2016-10-06 09:46:51 -07:00
Ken Cooke
d6aa74c22d Fix 16khz support and hot-unplugging audio devices 2016-10-05 11:49:09 -07:00
Brad Hefta-Gaub
6f86ce8d3b Merge pull request #8683 from jherico/oglplus_b_gone2 
Remove all usage of oglplus
 2016-10-05 09:59:42 -07:00
Ken Cooke
6838dc0247 Inverted the CMAKE logic, to make the version comparison more clear 2016-10-04 09:01:43 -07:00
Ken Cooke
40393bd8ef remove Installer debugging code 2016-10-03 22:31:43 -07:00
Ken Cooke
541f7ebb05 Select the correct plugin in the Installer, based on Windows version 2016-10-03 21:46:55 -07:00
Ken Cooke
eb5b03d008 Don't pre-delete qtaudio_windows.dll in Installer 2016-10-03 20:52:24 -07:00
Ken Cooke
372b631448 Post-build command to use qtaudio_windows.dll for Win7, qtaudio_wasapi.dll for Win8/10, or include both for Installer 2016-10-03 19:59:27 -07:00
Brad Davis
9bc0f24777 Fix GLEW linker warnings 2016-10-02 12:22:00 -07:00
Brad Davis
488d191428 Remove all oglplus usage and references 2016-10-02 11:44:34 -07:00
Ken Cooke
d925a22fd4 Use new filename for the external as a simple form of versioning 2016-09-29 14:09:38 -07:00
Ken Cooke
f42c0dbd7c Fix cmake checksum, for updated qtaudio_wasapi.zip with release and debug plugins 2016-09-29 13:01:15 -07:00
Ken Cooke
468281f92d Fix the Debug build of Interface on Windows 2016-09-29 06:58:14 -07:00
Brad Davis
49a91e3a04 Update Oculus SDK 2016-09-22 11:31:50 -07:00
Chris Collins
1c4fcb5112 Merge pull request #8620 from ZappoMan/detectMasterOrStable 
add basic support for master vs stable builds
 2016-09-19 15:08:40 -07:00
Brad Hefta-Gaub
fd474f6319 add basic support for master vs stable builds 2016-09-19 14:14:32 -07:00
Marko Kudjerski
6ccf86e3e9 remove qtaudio_windows.dll on Windows before installing the new version 2016-09-13 11:10:36 -07:00
Brad Davis
ecfe56085d GLM update and GLI integration 2016-09-09 10:18:15 -07:00
Ken Cooke
9457d49103 Merge branch 'master' of https://github.com/highfidelity/hifi into low-latency-audio 2016-09-06 20:56:20 -07:00
Marko Kudjerski
da5f7912b5 fixed Info.plist setup for Components.app 2016-09-06 17:40:47 -07:00
SamGondelman
62edaf0ec9 commit for marko to look at later 2016-09-06 17:40:46 -07:00
Marko Kudjerski
930afad49c comment fix 2016-09-06 17:40:45 -07:00
Marko Kudjerski
b8da976123 added Info.plist to Components.app so that macdeployqt from Qt 5.6 doesn't throw a segfault 2016-09-06 17:40:45 -07:00
SamGondelman
7f2476f0f8 put pack macdeployqt call, but still removed qtwebprocess 2016-09-06 17:36:58 -07:00
SamGondelman
2db02fdde1 remove QtWebProcess hack on OSX 2016-09-06 17:36:56 -07:00
Brad Hefta-Gaub
df9ac9fd6e Merge pull request #8519 from birarda/installer-fixes 
add removal of resources folder before install
 2016-09-02 09:06:20 -07:00
Stephen Birarda
8977f9ed92 fix else condition in hifiAudioCodec 2016-09-01 10:57:30 -07:00
Stephen Birarda
47f15f6ad8 use libc++ and clang toolchain 2016-08-31 16:16:40 -07:00
Stephen Birarda
aea60692de update to latest android.toolchain.cmake 2016-08-31 15:39:46 -07:00
Stephen Birarda
d113105315 clarify SCRIBE_PATH error message 2016-08-31 14:08:59 -07:00
Stephen Birarda
fc8fad0753 check SCRIBE_PATH for scribe, add instructions 2016-08-31 13:56:02 -07:00
Stephen Birarda
f67f53a4fa remove the mtc tool that is no longer used 2016-08-31 13:24:21 -07:00
Stephen Birarda
b56a596c29 put android build output in target folder 2016-08-31 13:23:19 -07:00
Stephen Birarda
c9e18e8d90 spacing repairs in autoscribe_shader_lib 2016-08-31 11:59:51 -07:00
Stephen Birarda
62504d457b put the apk and apk-build folders in root of build 2016-08-31 11:50:39 -07:00
Stephen Birarda
3f1545008d don't target any plugins for android 2016-08-31 11:19:01 -07:00
Stephen Birarda
7c2fea4598 remove glew/oglplus requirement for android interface 2016-08-31 11:03:53 -07:00
Stephen Birarda
f1ed7a2e78 initial changes needed for android interface cmake 2016-08-31 10:53:29 -07:00
Stephen Birarda
a8272712bb move forced client selection to apply to all installs 2016-08-29 15:40:45 -07:00
Ken Cooke
678ea3ecbf PR feedback 2016-08-29 13:22:48 -07:00
Stephen Birarda
20777bd19a force default selection of client on install 2016-08-29 13:13:35 -07:00
Stephen Birarda
87ecc65dce set component requirement in cpack add componeent command 2016-08-29 13:13:35 -07:00
Stephen Birarda
fab2568624 always remove the resources dir, make client required 2016-08-29 13:13:35 -07:00
Stephen Birarda
0e4fb51d09 force cleanup section to be first 2016-08-29 13:13:35 -07:00
Stephen Birarda
c4ec02c4bf add removal of resources folder during install process 2016-08-29 13:13:35 -07:00
Ken Cooke
28a99a7a03 Merge branch 'master' of https://github.com/highfidelity/hifi into low-latency-audio 2016-08-29 12:38:17 -07:00
Ken Cooke
996bf0d763 Replace the Qt multimedia audio back-end on the Windows build. 
Adds an external project (wasapi) to download a low-latency audio plugin for Qt, as a precompiled DLL.
Adds a post-build command to use this new plugin instead of the default Qt audio plugin.
 2016-08-28 20:12:59 -07:00
elisa-lj11
4c434e875e fixed merge conflicts in Application.cpp 2016-08-19 09:46:22 -07:00
Brad Davis
adcfd55cc0 Batch replay reprojection 2016-08-12 22:28:23 -07:00
elisa-lj11
c009834685 Fixes for linux build of quazip 2016-08-05 17:36:27 -07:00
elisa-lj11
cd7706e80b Release now has quazip features 2016-08-04 17:01:19 -07:00
elisa-lj11
9833ba1987 No errors upon build 2016-08-04 16:51:14 -07:00
elisa-lj11
212e4f9cca making quazip work 2016-08-04 16:48:14 -07:00
elisa-lj11
87cbb79d67 fixing up quazip 2016-08-04 16:46:56 -07:00
elisa-lj11
c9c965b1e8 added new files for quazip 2016-08-04 16:46:56 -07:00
SamGondelman
676f4bdfcf misc fixes from particles branch 2016-07-29 15:36:32 -07:00
Seth Alves
5485b3ee13 when cmake is told SERVER_ONLY, still build server-side plugins 2016-07-20 11:34:44 -07:00
Leonardo Murillo
ce67d57279 Removing Debugs 2016-07-15 13:03:40 -06:00
Leonardo Murillo
b0c27a53e2 Linking to Linux only SDK 2016-07-15 13:01:21 -06:00
Leonardo Murillo
53d524eb2f Checkpoint 2016-07-15 12:04:45 -06:00
Leonardo Murillo
f0db7b9d39 Checkpoint 2016-07-15 11:42:30 -06:00
Brad Hefta-Gaub
c2fd055f0f more hacking 2016-07-14 08:20:07 -07:00
Brad Hefta-Gaub
b6ffabf500 attempt to get mac sandbox plugins to work 2016-07-13 14:58:27 -07:00
Brad Hefta-Gaub
2b719e12f7 attempt to make mac server plugins work 2016-07-12 10:54:45 -07:00
Brad Hefta-Gaub
3ddac73718 add mac lib to the external project 2016-07-11 18:24:22 -07:00
Brad Hefta-Gaub
f3f72f3c93 Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins 2016-07-11 13:15:27 -07:00
Brad Hefta-Gaub
f5b693cebb added support for external hificodec and hifi codec plugin 2016-07-11 12:22:27 -07:00
Brad Davis
790f74da1d Support geometry shaders 2016-07-07 13:36:47 -07:00
Brad Hefta-Gaub
38f0cd218b make client server plugins properly copy into plugins directory 2016-07-07 10:31:12 -07:00
Marko Kudjerski
17ce80ed69 sign executables with SHA256 2016-06-24 19:28:31 -07:00
SamGondelman
645ae3c21e remove tabs 2016-06-22 17:02:02 -07:00
SamGondelman
a9ed0b1c83 completely destroyed sixense on macs 2016-06-22 16:56:50 -07:00
Atlante45
89c50ab3df Update neuron archive in cmakelists 2016-06-21 17:23:08 -07:00
Atlante45
925375fb7a Move steamworks archive zip to dependencies 2016-06-14 16:29:50 -07:00
Atlante45
1a8d6ea614 Make steamworks an external dependency 2016-06-14 16:29:50 -07:00
Atlante45
96258a795a Initial Steamworks integration 2016-06-14 16:29:50 -07:00
Ken Cooke
b60b9bb312 compiler fixes for GCC/clang 2016-06-06 14:54:15 -07:00
Brad Davis
3cc08cdcfc Breaking up GL agnostic code from 4.1 specific code 2016-05-18 14:35:53 -07:00
Stephen Birarda
9fe9100cac change produced installer names to beta 2016-04-27 15:57:32 -07:00
Brad Hefta-Gaub
c410242fb2 Merge pull request #7688 from jherico/texture_derez 
Reducing GPU texture memory footprint
 2016-04-22 13:20:54 -07:00
Stephen Birarda
bc706191df add_definitions from cmake for each release type 2016-04-21 17:28:11 -07:00
Brad Davis
6c30194916 Support lowering the minimum mip of a texture at runtime 2016-04-21 14:46:12 -07:00
Brad Davis
5007c9bd4c Update glew version 2016-04-21 14:46:09 -07:00