Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 16:33:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
8770 commits 71 branches 56 tags 1.2 GiB
Commit graph

8770 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
c432a34cfb fix rendering of Avatars 2014-01-23 14:51:29 -08:00
Stephen Birarda
9ab1fc4c2c resolve conflicts on merge with upstream/master 2014-01-23 14:43:04 -08:00
Stephen Birarda
2e548fb39c complete migration of Avatar list to AvatarManager 2014-01-23 14:41:11 -08:00
AndrewMeadows
d556581842 Merge pull request #1663 from PhilipRosedale/master 
New drumstick sounds, markers at origin, rolling voxels make no sound
 2014-01-23 14:05:03 -08:00
Philip Rosedale
29f33a4e79 Balls rolling on voxels don’t make sound 2014-01-23 13:54:45 -08:00
Philip Rosedale
5d1a320dd0 fixed merge 2014-01-23 13:50:44 -08:00
Philip Rosedale
7e216443e9 Merge pull request #1662 from ZappoMan/bugfixes 
set default particle lifetime to 10 seconds, make sure lifetime is always honored
 2014-01-23 13:48:30 -08:00
ZappoMan
d2bf3a2a5d set default particle lifetime to 10 seconds, make sure lifetime is always honored 2014-01-23 13:46:12 -08:00
Philip Rosedale
e4e2bb3854 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-23 13:09:36 -08:00
Philip Rosedale
9363671f1e Merge pull request #1661 from ZappoMan/bugfixes 
another attempt to fix particle-server crash
 2014-01-23 13:07:36 -08:00
ZappoMan
599475b797 Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 2014-01-23 13:01:17 -08:00
ZappoMan
8aa7a915e7 ok, one more shot at fixing particle-server crash 2014-01-23 13:01:07 -08:00
Stephen Birarda
1f95d0c017 have avatar-mixer report avatar kills to all avatars 2014-01-23 12:47:27 -08:00
Philip Rosedale
f0417d187f Merge branch 'master' of https://github.com/worklist/hifi 2014-01-23 12:40:56 -08:00
Philip Rosedale
8c92c0b663 Merge pull request #1658 from ey6es/master 
Remove eyes' hovering on mouse avatar, voxels.  Closes #1643.
 2014-01-23 12:26:21 -08:00
Stephen Birarda
a9f1984676 add an AvatarManager that will keep Avatars in Application thread 2014-01-23 11:59:24 -08:00
Philip Rosedale
86e37f8fc2 new sounds for drumsticks 2014-01-23 11:53:46 -08:00
Andrzej Kapolka
b32b0a495a Remove eyes' hovering on mouse avatar, voxels. Closes #1643. 2014-01-23 11:49:34 -08:00
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