Commit graph

22236 commits

Author SHA1 Message Date
Stephen Birarda
d47a114f23 actually remove BUILD_SHARED_LIBS from combo command 2015-02-19 13:57:31 -08:00
Stephen Birarda
01c92ba94d don't attempt to build shared bullet libs on windows 2015-02-19 13:53:48 -08:00
Stephen Birarda
721be462f5 attempt to handle windows in bullet external project 2015-02-19 13:40:17 -08:00
Stephen Birarda
cbc6ae98d8 groundwork for windows support in bullet external project 2015-02-19 13:22:33 -08:00
Stephen Birarda
d185c775a4 fix install step for OS X bullet 2015-02-19 13:17:39 -08:00
Stephen Birarda
6b08b2993a fix for bullet system include to silence warnings 2015-02-19 13:03:16 -08:00
Stephen Birarda
2cdb8edbbf fix casing for libBulletSoftBody 2015-02-19 12:44:49 -08:00
Stephen Birarda
71b273ceec fix order for found result in bullet find module 2015-02-19 12:42:28 -08:00
Stephen Birarda
03809131a4 log install to be able to confirm installed files 2015-02-19 12:39:48 -08:00
Stephen Birarda
d563c80ca0 handle bullet external project on unix/android 2015-02-19 12:12:41 -08:00
Stephen Birarda
70a89680f5 fix bullet include to match previous format 2015-02-19 12:04:41 -08:00
Stephen Birarda
6f055ca0d7 add an external project to handle bullet 2015-02-19 12:01:40 -08:00
Stephen Birarda
27c6f80a61 use md5 hash to verify downloaded externals 2015-02-19 09:33:22 -08:00
Stephen Birarda
6231a9d8da remove TBB from build guides 2015-02-18 17:29:32 -08:00
Stephen Birarda
7ec01c9095 handle android build of tbb, don't prefix win with lib 2015-02-18 17:20:13 -08:00
Stephen Birarda
31b136f807 resolve conflicts on merge with upstream/master 2015-02-18 16:19:15 -08:00
Stephen Birarda
24468a7936 Merge pull request #4315 from birarda/master
use http link for gverb in case no git available
2015-02-18 16:18:04 -08:00
Stephen Birarda
5a3ef34d1e use http link for gverb in case no git available 2015-02-18 16:14:51 -08:00
Stephen Birarda
75b193d784 mirror tbb in HF S3 for http link 2015-02-18 16:03:12 -08:00
Stephen Birarda
e665a1b4bb use https for tbb urls since it will redirect 2015-02-18 15:47:33 -08:00
Stephen Birarda
b3b292a45f handle linux binary find for tbb external project 2015-02-18 15:40:14 -08:00
Philip Rosedale
f6f54809d0 Merge pull request #4291 from Atlante45/reverb_smoothing
Reverb smoothing
2015-02-18 15:34:14 -08:00
Stephen Birarda
b6d660fdd3 setup TBB external project for windows 2015-02-18 15:26:33 -08:00
Stephen Birarda
b2e587dbbd remove use of include_dependency_includes and use cmake 2015-02-18 14:12:05 -08:00
Stephen Birarda
71482f6ad7 include tbb as system include, use project as prefix 2015-02-18 13:58:20 -08:00
Stephen Birarda
973a076f34 use default prefix for external project 2015-02-18 13:54:39 -08:00
Stephen Birarda
60fc4d2c1c attempt to handle android via tbb binaries 2015-02-18 13:54:30 -08:00
Stephen Birarda
0a01a6f566 add TBB as external_project, handle on OS X 2015-02-18 13:24:59 -08:00
Stephen Birarda
84e82f045d find QT_DIR in root CMakeLists 2015-02-18 11:38:08 -08:00
Stephen Birarda
b2ecf99008 back out of lib cmake dir to get Qt bin 2015-02-18 11:36:49 -08:00
Stephen Birarda
e2d7fb574a move macro call so it is actually loaded 2015-02-18 11:27:37 -08:00
Stephen Birarda
c9fea9330e explain in win guide that fixup_bundle is finding DLLs 2015-02-18 10:16:45 -08:00
Stephen Birarda
cc29297a19 remove requirement of Qt dlls in path 2015-02-18 10:13:23 -08:00
Clément Brisset
906f7ecced Merge pull request #4306 from birarda/master
make sure the Agent has a SoundCache available
2015-02-18 10:05:22 -08:00
Stephen Birarda
758a552267 make sure the Agent has a SoundCache available 2015-02-18 09:59:33 -08:00
Clément Brisset
87f4ae2425 Merge pull request #4304 from thoys/20245
CR for Job #20245 - Implement UI sounds for virtualKeyboard & notifications
2015-02-18 09:55:34 -08:00
Stephen Birarda
1f7c3a0eb2 Merge branch 'master' of https://github.com/highfidelity/hifi into dependencies 2015-02-18 09:40:10 -08:00
Thijs Wenker
d10f37291b check if sounds are downloaded before play thanks @Atlante45 2015-02-18 18:25:16 +01:00
Clément Brisset
7183400e43 Merge pull request #4305 from ctrlaltdavid/20308
CR for Job #20308 - Refine progress.js
2015-02-18 08:10:57 -08:00
Clément Brisset
1af3a6ffa8 Merge pull request #4302 from AndrewMeadows/inertia
correct gain variance in linearFade()
2015-02-18 06:57:51 -08:00
Clément Brisset
6e5c3593b6 Merge pull request #4298 from talentraspel/20339
removed id "g3322" in start-script.svg because it is no longer used and ...
2015-02-18 06:13:35 -08:00
Clément Brisset
3f117ce322 Merge pull request #4293 from AndrewMeadows/thermonuclear
fix crash in AudioScope for bad memory access
2015-02-18 06:03:03 -08:00
Stephen Birarda
48d2684209 add path to DeviceDLL for sixense 2015-02-17 17:51:54 -08:00
Andrew Meadows
1c8f1bbcdd Merge pull request #4299 from talentraspel/20338
removed "Script.scriptEnding.connect(scriptEnding);" from lookWithMou…
2015-02-17 17:47:47 -08:00
Stephen Birarda
7d25013659 add DLL copying for all project targets 2015-02-17 17:44:58 -08:00
Stephen Birarda
c110fcbfad merge with upstream/master 2015-02-17 17:34:48 -08:00
Andrew Meadows
d7664718ee Merge pull request #4303 from sethalves/font-load-failed
Font load failed
2015-02-17 17:31:26 -08:00
Andrew Meadows
80c973c285 Merge pull request #4301 from sethalves/fixes-for-vrchat
fix uninitialized geometry cache id in Line3DOverlay
2015-02-17 17:28:55 -08:00
Stephen Birarda
9d7212cdae remove some debug in AddPathsToLibPaths 2015-02-17 17:18:24 -08:00
Stephen Birarda
68c19866c4 call dll copy after project deps are setup 2015-02-17 17:17:30 -08:00