Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-05 03:02:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
22860 commits 25 branches 0 tags 1.1 GiB
Commit graph

22860 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Brad Hefta-Gaub
2ce80fe3d6 Merge pull request #4395 from sethalves/avatars-can-collide 
Avatars can collide
 2015-03-09 15:44:33 -07:00
Seth Alves
c947f3b62c use meters in wire-protocol for versions greater than VERSION_ENTITIES_USE_METERS_AND_RADIANS 2015-03-09 14:06:59 -07:00
Seth Alves
ab8784f1b4 add comment about character capsule being hard-coded 2015-03-09 13:51:08 -07:00
Seth Alves
99300a5bc8 merge from master 2015-03-09 13:39:51 -07:00
Stephen Birarda
74ab67c251 Merge pull request #4398 from murillodigital/master 
Fixing updater
 2015-03-09 13:19:15 -07:00
Leonardo Murillo
9ccd0a5afa Fixing updater 2015-03-09 14:12:47 -06:00
Brad Hefta-Gaub
750f8a09fa Merge pull request #4394 from AndrewMeadows/isentropic 
EntityItem now stores position in meters and angular velocity in radians/sec
 2015-03-09 12:47:00 -07:00
Brad Hefta-Gaub
5686a4a48d Merge pull request #4397 from ZappoMan/fbxFixes 
temporarily remove skeleton check from upload
 2015-03-09 11:01:20 -07:00