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

1348 commits

Author SHA1 Message Date
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