Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 11:26:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
22937 commits 76 branches 59 tags 1.2 GiB
Commit graph

22937 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
David Rowe
59762175e4 Grow/shrink window as size of users list changes 2015-03-10 12:44:34 -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
David Rowe
a4fe9c1a12 Click on username to TP to them 2015-03-10 12:32:48 -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
David Rowe
abb62fd8f9 Fix typo found in passing 2015-03-10 10:57:48 -07:00
David Rowe
63d8da0233 Display user names in 2D window 2015-03-10 10:57:47 -07:00
David Rowe
d25d3bc6ab Get users online from Web API 2015-03-10 10:57:46 -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
Sam Gateau
da16baf0ca removing the atmosphere effect from the directional lighting 2015-03-10 10:24:16 -07:00
Virendra Singh
ce4226d6b9 Merge branch 'master' of git://github.com/highfidelity/hifi into 20304 2015-03-10 22:36:18 +05:30
Sam Gateau
c1a0d767c9 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-03-10 09:37:40 -07:00
Sam Gateau
853cf75f60 adding the atmosphere in the directional lighting pass, debug 2015-03-10 09:37:13 -07:00
David Rowe
2df3eed31e Merge branch 'master' into 20287 
Conflicts:
	interface/src/Application.h
 2015-03-10 09:31:15 -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
Sam Gateau
d9c071a2a9 trying to put the atmospheric effect in a shader header and use it on the directional lighting pass 2015-03-10 00:47:27 -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
samcake
ee5409b0a8 fixing compilation on macosx 2015-03-09 14:25:59 -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
Sam Gateau
55f797f349 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-03-09 13:29:09 -07:00
Stephen Birarda
74ab67c251 Merge pull request #4398 from murillodigital/master 
Fixing updater
 2015-03-09 13:19:15 -07:00