Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-19 05:40:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
23015 commits 72 branches 59 tags 1.2 GiB
Commit graph

7555 commits

Author SHA1 Message Date
Ryan Huffman
f44ab9da8f Update OAuthNetworkAccessManager to only send auth to metaverse 2015-03-13 17:29:01 -07:00
Stephen Birarda
471e55c8ce fix some lingering warnings 2015-03-12 12:36:39 -07:00
Stephen Birarda
09e2c0987e use Dependency customDeleter for Application NL 2015-03-12 12:27:48 -07:00
Stephen Birarda
cd2ce2ee2f Merge branch 'master' of https://github.com/highfidelity/hifi 2015-03-12 12:14:43 -07:00
Stephen Birarda
7bfc747748 Revert "Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList"" 
This reverts commit 9269b2a0b2.
 2015-03-12 12:13:32 -07:00
Stephen Birarda
9269b2a0b2 Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList" 2015-03-12 11:28:07 -07:00
Stephen Birarda
4da9186045 Merge pull request #4429 from birarda/master 
NOT MERGEABLE: graceful cleanup on Application dtor for NodeList
 2015-03-12 11:26:56 -07:00
Atlante45
eb5206f8e6 Naming 2015-03-12 19:05:06 +01:00
Atlante45
0bd97ce40c Dependency::customDeleter uses a lambda 2015-03-12 18:53:29 +01:00
Stephen Birarda
851d020390 remove QThread include required for debug 2015-03-11 17:21:49 -07:00
Stephen Birarda
7a8e94f1e5 remove extra debug information for node thread cleanup 2015-03-11 17:18:49 -07:00
Stephen Birarda
5d9a3811ca more graceful cleanup for Application NodeList and DatagramProcessor 2015-03-11 17:14:20 -07:00
Stephen Birarda
9f754e40d0 move all silent node timers into LimitedNodeList 2015-03-11 16:59:06 -07:00
ZappoMan
e87e0a1e0b some cleanup of dead code related to timers 2015-03-11 16:27:04 -07:00
Andrew Meadows
feafa0a60b remove old Ragdoll and avatar interactions 2015-03-11 14:29:03 -07:00
Brad Hefta-Gaub
5cced9fc66 Merge pull request #4400 from samcake/temp0 
Introduce gpu::Shader, Pipeline and State
 2015-03-10 16:51:40 -07:00
Brad Hefta-Gaub
77eae204cf Merge pull request #4411 from AndrewMeadows/thermonuclear 
fix for crash when deleting physical entity that departs the domain
 2015-03-10 16:43:17 -07:00
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
a0e7125e11 code revamp and correction in parallel axis theorem 2015-03-11 03:11:17 +05:30
Andrew Meadows
f82f9cc2f4 merge upstream/master into andrew/thermonuclear 2015-03-10 14:28:02 -07:00
Andrew Meadows
503afc8c73 erase deleted entities from pending sort list 2015-03-10 14:26:19 -07:00
Andrew Meadows
3d531e8304 add f at end of float literal 2015-03-10 14:24:49 -07:00
ZappoMan
3bd3f5a6d2 make sure UserActivityLogger::close() waits for the pending log message to complete 2015-03-10 14:23:23 -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
ZappoMan
5facb39aa7 support for import entities from network URL 2015-03-10 12:21:37 -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
853cf75f60 adding the atmosphere in the directional lighting pass, debug 2015-03-10 09:37:13 -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
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
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
Sam Gateau
8b78ca8dc1 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-03-09 11:15:19 -07:00
Sam Gateau
cc85f468d6 splitting the code of GLBackend into separate .cpp, adding the PIpeline,adn the state to gpu 2015-03-09 11:14:42 -07:00
Andrew Meadows
e418872f7b namechanges: setFooInMeters() --> setFoo() 
also fixed some warnings, made code abide to standard,
and moved some variables to be closer to where they're used
 2015-03-09 09:56:15 -07:00
Andrew Meadows
51d05cc43e merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
 2015-03-09 08:51:49 -07:00
Seth Alves
0833fc588b coding standard 2015-03-09 06:56:35 -07:00
Seth Alves
3604fd639a formatting 2015-03-08 20:03:10 -07:00