Commit graph

22881 commits

Author SHA1 Message Date
Andrew Meadows
dd9ae49e49 Merge pull request #4392 from virneo/20304
worklist 20304: calculate mass properties of a mesh
2015-03-10 16:18:14 -07:00
Philip Rosedale
2e85cf7459 Merge pull request #4413 from birarda/master
fix stereo to stereo resampling via soxr
2015-03-10 16:09:31 -07:00
Stephen Birarda
8ede9fb39b fix stereo to stereo resampling 2015-03-10 15:50:30 -07:00
Andrew Meadows
9736ee1c28 Merge pull request #4410 from ZappoMan/crashonexit
make sure UserActivityLogger::close() waits for the pending log message to complete
2015-03-10 15:47:18 -07:00
Seth Alves
cf20596d6d Merge pull request #4406 from ZappoMan/svoFromURL
Support for importing from a network URL
2015-03-10 15:41:41 -07:00
ZappoMan
b9671f3f9b CR feedback 2015-03-10 15:27:44 -07:00
Virendra Singh
7954dd4d67 anticlockwise triangle order 2015-03-11 03:27:26 +05:30
Andrew Meadows
50ba8ecc9d Merge pull request #4409 from PhilipRosedale/master
Only catch moving objects with ToyBall.js
2015-03-10 14:56:04 -07:00
Virendra Singh
a0e7125e11 code revamp and correction in parallel axis theorem 2015-03-11 03:11:17 +05:30
ZappoMan
3bd3f5a6d2 make sure UserActivityLogger::close() waits for the pending log message to complete 2015-03-10 14:23:23 -07:00
Brad Hefta-Gaub
d59f9c85a3 Merge pull request #4408 from birarda/master
let QMainWindow delete GLCanvas, just stop the QTimer instead
2015-03-10 13:41:36 -07:00
Philip Rosedale
4b53cfb950 Merge pull request #4407 from birarda/windows-fixes
fix for out of bounds sound resampling
2015-03-10 13:35:22 -07:00
Philip Rosedale
182a1a726d remove debug 2015-03-10 13:34:16 -07:00
Philip Rosedale
2d6c51ac77 Detect moving objects before catching them 2015-03-10 13:32:56 -07:00
Stephen Birarda
6afdb26042 let QMainWindow delete GLCanvas, just stop the QTimer instead 2015-03-10 13:19:32 -07:00
Stephen Birarda
c660b771db Merge branch 'master' of https://github.com/highfidelity/hifi into windows-fixes 2015-03-10 13:05:09 -07:00
Stephen Birarda
271a4e2cae cleanup some divides for manual sound resampling 2015-03-10 13:04:35 -07:00
Stephen Birarda
dc0ad09953 fix for check of num source samples 2015-03-10 13:04:34 -07:00
Stephen Birarda
7ecde7be30 add fix for out of bounds Sound resampling 2015-03-10 13:04:34 -07:00
Stephen Birarda
6ec5c387e2 default to All discoverability until UI is present 2015-03-10 13:04:34 -07:00
Stephen Birarda
f8fe8393dd store discoverability mode as an int 2015-03-10 13:04:34 -07:00
Stephen Birarda
5feb6be221 expose discoverability changes to js 2015-03-10 13:04:34 -07:00
Stephen Birarda
d96691f2d0 handle discoverability change in DiscoverabilityManager 2015-03-10 13:04:34 -07:00
Stephen Birarda
91b473f035 move location update to DiscoverabilityManager 2015-03-10 13:04:34 -07:00
Stephen Birarda
6e84e94b86 remove discoverability setter until API ready 2015-03-10 13:04:33 -07:00
Stephen Birarda
dde84ac2b8 fix getUsername for AccountManager include in implementation 2015-03-10 13:04:33 -07:00
Stephen Birarda
c9982e765e cleanup username API from GlobalServicesScriptingInterface 2015-03-10 13:04:33 -07:00
Brad Hefta-Gaub
7b6dfc93d6 Merge pull request #4405 from birarda/master
manually call delete on GLCanvas in Application dtor
2015-03-10 13:04:16 -07:00
ZappoMan
e16961c958 removed dead code 2015-03-10 12:36:31 -07:00
ZappoMan
feddea821a cleanup import from file vs url 2015-03-10 12:35:12 -07:00
ZappoMan
5facb39aa7 support for import entities from network URL 2015-03-10 12:21:37 -07:00
Stephen Birarda
a8046b8316 fix a typo in comment, NULL glWidget pointer 2015-03-10 11:47:35 -07:00
Stephen Birarda
292354e180 manually call delete on GLCanvas in Application dtor 2015-03-10 11:33:49 -07:00
ZappoMan
c8298ca617 migrate SVO reading to use QDataStream in step toward reading from HTTP url 2015-03-10 10:49:53 -07:00
Virendra Singh
ce4226d6b9 Merge branch 'master' of git://github.com/highfidelity/hifi into 20304 2015-03-10 22:36:18 +05:30
ZappoMan
89f3a091f1 remove debugging 2015-03-10 09:02:35 -07:00
Andrew Meadows
a758ccd75a Merge pull request #4402 from birarda/master
add underlying controls for user discoverability
2015-03-10 08:30:46 -07:00
Brad Hefta-Gaub
d662c30405 Merge pull request #4403 from AndrewMeadows/thermonuclear
fix crash: avoid assert for zero-length character velocity
2015-03-09 20:56:42 -07:00
Andrew Meadows
fd76eda383 slightly better hardcoded size for avatar capsule
we'll be measuring avatar dimensions more correctly soon
2015-03-09 17:59:45 -07:00
Andrew Meadows
3c05d685d7 avoid assert for zero-length character velocity 2015-03-09 17:37:34 -07:00
Stephen Birarda
de38221cf6 default to All discoverability until UI is present 2015-03-09 17:28:44 -07:00
Stephen Birarda
c6afa131d9 store discoverability mode as an int 2015-03-09 17:26:56 -07:00
Stephen Birarda
cd382eeea5 expose discoverability changes to js 2015-03-09 17:20:09 -07:00
Stephen Birarda
6d900d5a40 handle discoverability change in DiscoverabilityManager 2015-03-09 17:05:57 -07:00
Stephen Birarda
0658b54263 move location update to DiscoverabilityManager 2015-03-09 16:48:39 -07:00
Stephen Birarda
77a60a3d72 remove discoverability setter until API ready 2015-03-09 16:34:00 -07:00
Stephen Birarda
f81ae30918 fix getUsername for AccountManager include in implementation 2015-03-09 16:32:09 -07:00
Stephen Birarda
2f22c0cd96 cleanup username API from GlobalServicesScriptingInterface 2015-03-09 16:28:01 -07:00
Brad Hefta-Gaub
0586cced11 Merge pull request #4401 from ZappoMan/fbxFixes
more hacking on mixamo pipeline files
2015-03-09 16:13:26 -07:00
ZappoMan
2a5d25e010 more hacking on mixamo pipeline files 2015-03-09 16:02:07 -07:00