Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-03 22:43:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
8752 commits 76 branches 59 tags 1.2 GiB
Commit graph

8752 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
c882104046 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-23 11:43:08 -08:00
Philip Rosedale
5e77f5643d Merge pull request #1630 from birarda/nodelist-set 
change node types of interest to a QSet
 2014-01-23 11:42:37 -08:00
Philip Rosedale
d34bb53d53 Merge pull request #1657 from birarda/master 
more NL repairs for concurrency issues, fix audio starve display
 2014-01-23 11:41:34 -08:00
Philip Rosedale
8bba7b65eb Merge branch 'master' of https://github.com/worklist/hifi 2014-01-23 11:23:53 -08:00
Stephen Birarda
c54eacbf36 make sure starve is displayed even if ring buffer just received data 2014-01-23 11:15:21 -08:00
Stephen Birarda
24bed09473 DatagramProcessor need not be a pointer in Application 2014-01-23 11:13:03 -08:00
Stephen Birarda
b5a72ef669 more nodelist repairs for concurrency issues 2014-01-23 11:11:22 -08:00
Philip Rosedale
9a8e978733 Merge pull request #1654 from AndrewMeadows/hand-vs-avatar 
Adding option to disable hand collisions against their own avatar.
 2014-01-23 11:08:37 -08:00
Andrew Meadows
c9c6c99fa2 Merge branch 'master' of ssh://github.com/highfidelity/hifi into hand-vs-avatar 2014-01-23 10:58:28 -08:00
Andrew Meadows
fa3c3448f4 Adding option to disable hand collisions against their own avatar. 2014-01-23 10:55:51 -08:00
Philip Rosedale
f4aefa2fe4 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-23 10:52:50 -08:00
Philip Rosedale
f6cfa5d213 Merge pull request #1651 from birarda/master 
use NodeHash getter for methods that can be called from other threads
 2014-01-23 10:51:35 -08:00
Philip Rosedale
007d31b092 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-23 10:50:22 -08:00
Philip Rosedale
f4dafa9057 Merge pull request #1650 from ZappoMan/bugfixes 
Fix crash in particle server
 2014-01-23 10:50:13 -08:00
Stephen Birarda
04286e39e6 use NodeList getNodeHash getter for methods that can be called from other threads 2014-01-23 10:49:51 -08:00
Philip Rosedale
89414eb8f2 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-23 10:47:18 -08:00
Philip Rosedale
7d56dd57c0 Merge pull request #1649 from birarda/master 
move datagram processing back to separate thread
 2014-01-23 10:40:41 -08:00
ZappoMan
2c896f402b Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 2014-01-23 10:32:49 -08:00
ZappoMan
ccc30d95fb fix crashing particle server bug 2014-01-23 10:32:42 -08:00
Stephen Birarda
7efc9e2e78 move datagram processing back to separate thread 2014-01-23 10:32:23 -08:00
Leonardo Murillo
f177a4fe23 Merge pull request #1645 from ZappoMan/bugfixes 
fix particle-server spinning out at 100% cpu
 2014-01-23 10:11:27 -08:00
ZappoMan
3d0d5f130a fix particle-server spinning out at 100% cpu% 2014-01-23 10:02:04 -08:00
Philip Rosedale
11eaef6887 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-22 19:29:03 -08:00
ZappoMan
0e6faec5bb Merge pull request #1639 from birarda/master 
add debugging for UUID owner change on NodeList
 2014-01-22 17:46:55 -08:00
Stephen Birarda
33257fc785 add debugging for UUID owner change on NodeList 2014-01-22 17:42:52 -08:00
Philip Rosedale
6c02a923a9 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-22 17:41:51 -08:00
ZappoMan
84bddf2383 Merge pull request #1635 from birarda/packet-sender 
fix null UUIDs
 2014-01-22 17:35:57 -08:00
Stephen Birarda
454a1cc6c9 only set UUID when not null, properly send UUID from data-server 2014-01-22 17:33:17 -08:00
Philip Rosedale
9d3093ba2a Merge branch 'master' of https://github.com/worklist/hifi 2014-01-22 17:00:09 -08:00
AndrewMeadows
3a9dc667db Merge pull request #1633 from birarda/master 
fix for NodeList UUID not updating
 2014-01-22 16:59:02 -08:00
Stephen Birarda
5214d53872 call UUID setter in Profile UUID update so it updates NodeList 2014-01-22 16:49:36 -08:00
Philip Rosedale
bacfa15065 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-22 16:35:01 -08:00
Stephen Birarda
b965d850d5 move node interest add for JL to JL 2014-01-22 16:26:28 -08:00
Stephen Birarda
6979135fe3 move some of the node interest additions to correct spots 2014-01-22 16:23:24 -08:00
Stephen Birarda
ec04d5450b Merge branch 'master' of https://github.com/highfidelity/hifi into nodelist-set 2014-01-22 16:16:47 -08:00
Stephen Birarda
f4f828ab72 Merge pull request #1629 from ZappoMan/juridiction_improvements 
Change JurisdictionListener and JurisdictionSender to not require virtual base class
 2014-01-22 16:16:24 -08:00
Philip Rosedale
3c5cd850fc Merge pull request #1631 from ZappoMan/new_particle_scripting_interface 
remove ParticleEditHandle, and change ParticleCollisionSystem to use new particle edit API
 2014-01-22 16:03:51 -08:00
ZappoMan
29ce6db285 Merge pull request #1628 from birarda/dialog-fix 
updates to UpdateDialog ui loading
 2014-01-22 15:31:28 -08:00
ZappoMan
e19c7e12b5 Merge pull request #1625 from birarda/logger-deadlock 
fix LogDialog deadlock
 2014-01-22 15:30:29 -08:00
ZappoMan
d73144ff0e Merge pull request #1623 from birarda/master 
remove separate Avatar UUID
 2014-01-22 15:29:39 -08:00
Brad Hefta-Gaub
e0f68bedc1 fixed type 2014-01-22 15:25:05 -08:00
Brad Hefta-Gaub
9231c1d80a remove ParticleEditHandle, and change ParticleCollisionSystem to use new particle edit API 2014-01-22 15:21:58 -08:00
Stephen Birarda
abddb969a5 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-22 14:47:44 -08:00
Stephen Birarda
e9e2557576 change node types of interest to a QSet 2014-01-22 14:47:04 -08:00
Brad Hefta-Gaub
b9ccd28428 removed some debug code 2014-01-22 14:35:38 -08:00
Brad Hefta-Gaub
ef2d0e97da removed some debug code 2014-01-22 14:26:57 -08:00
Brad Hefta-Gaub
132b043d68 removed debug code 2014-01-22 14:26:03 -08:00
Stephen Birarda
6937ce035a restore functionality of shouldSkipVersion 2014-01-22 14:25:06 -08:00
Brad Hefta-Gaub
85363f6603 Merge branch 'master' of git://github.com/worklist/hifi into juridiction_improvements 2014-01-22 14:23:00 -08:00
Brad Hefta-Gaub
39f7111b2d remove public virtual from PacketSender and RecievedPacketProcessor 2014-01-22 14:21:03 -08:00