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

8891 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
5cc2b029cf Adding ParticleTree::findParticles(box, QVector<Particle*>) method 2014-01-24 14:01:34 -08:00
Andrew Meadows
998b772be4 Adding ParticleTreeElement::findParticles(box, QVector<Particles*>) 2014-01-24 14:01:03 -08:00
Andrew Meadows
f6a49c96a7 Adding ParticleTreeElement::findParticles(box, QVector<Particles*>) 2014-01-24 13:59:35 -08:00
Andrew Meadows
52511b2baf Adding AABox::touches(box) 2014-01-24 13:59:03 -08:00
ZappoMan
dbde1a29fe Merge pull request #1682 from ZappoMan/master 
Fix Windows Build
 2014-01-24 10:07:50 -08:00
Brad Hefta-Gaub
0c891ddfa8 Merge branch 'master' of https://github.com/ZappoMan/hifi 2014-01-24 09:55:52 -08:00
Brad Hefta-Gaub
177f09aa4d Merge branch 'master' of git://github.com/worklist/hifi 2014-01-24 09:55:38 -08:00
AndrewMeadows
ea681f0d8f Merge pull request #1669 from birarda/avatar-list 
add an AvatarManager to house a separate list of Avatars from NodeList
 2014-01-24 09:54:17 -08:00
Brad Hefta-Gaub
7c507b44eb Merge branch 'master' of git://github.com/worklist/hifi 2014-01-24 09:53:19 -08:00
Brad Hefta-Gaub
692358bf6e fix windows builds 2014-01-24 09:51:17 -08:00
Brad Hefta-Gaub
54faeae13e fix windows builds 2014-01-24 09:51:06 -08:00
Leonardo Murillo
57dd739607 Merge pull request #1679 from birarda/mismatch-log 
expand packet mismatch log entry
 2014-01-24 09:49:29 -08:00
Stephen Birarda
dff59f386a cleanup spacing in debug 2014-01-24 09:23:44 -08:00
Brad Hefta-Gaub
fd2f5ec0e6 Merge branch 'master' of https://github.com/ZappoMan/hifi 2014-01-24 09:16:51 -08:00
Stephen Birarda
fc55c3efac simplify debug a little 2014-01-24 09:11:03 -08:00
Stephen Birarda
9d71671a52 add extra debugging to packet mismatch 2014-01-24 09:10:27 -08:00
Leonardo Murillo
604f436d4b Merge pull request #1677 from murillodigital/master 
changing default domain closes #1676
 2014-01-24 07:03:26 -08:00
Leonardo Murillo
6dae086f32 changing default domain closes #1676 2014-01-24 08:49:07 -06:00
ZappoMan
bb46435c38 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-23 21:46:13 -08:00
Stephen Birarda
d5b4e643c8 resolve conflicts on merge with upstream/master 2014-01-23 18:10:40 -08:00
Andrzej Kapolka
4296e5e81e Merge pull request #1674 from ey6es/master 
Fix OS X warning.
 2014-01-23 18:10:20 -08:00
Andrzej Kapolka
6619cdb36b Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-23 18:10:00 -08:00
Stephen Birarda
777e375761 Merge pull request #1670 from AndrewMeadows/zero-length-penetrations 
Zero length penetrations
 2014-01-23 18:09:41 -08:00
Andrzej Kapolka
c4254cd423 Fix OS X warning. 2014-01-23 18:08:45 -08:00
Stephen Birarda
10cfd628aa resolve conflicts on merge with upstream master 2014-01-23 17:52:30 -08:00
Stephen Birarda
2aac064a67 increase debug for Avatar removal from AvatarManager 2014-01-23 17:44:06 -08:00
Stephen Birarda
b495e6251d add a weak pointer to the avatar mixer that owns the avatar 2014-01-23 17:39:14 -08:00
Philip Rosedale
2dee6426e9 Merge pull request #1672 from ZappoMan/bugfixes 
fix crash on shutdown of interface
 2014-01-23 17:27:07 -08:00
Stephen Birarda
3a127556e8 put back the important Avatar destructor 2014-01-23 17:10:24 -08:00
Stephen Birarda
8d2e9823de remove notion of owning node from NodeData 2014-01-23 17:06:03 -08:00
ZappoMan
5560a0fb4d fix crash on shutdown of interface 2014-01-23 17:03:11 -08:00
Stephen Birarda
820132cb45 cleanup debug and Avatar destructor 2014-01-23 16:47:18 -08:00
Stephen Birarda
da26f43499 broadcast node kills to agent, not avatar-mixer 2014-01-23 16:44:32 -08:00
Andrew Meadows
93482d9d18 Fixing indentation. 2014-01-23 16:41:03 -08:00
AndrewMeadows
6120416cbb Merge pull request #1627 from ey6es/metavoxels 
Basic metavoxel editing interface (doesn't actually perform any edits yet).
 2014-01-23 16:37:22 -08:00
ZappoMan
da58486fb1 Merge pull request #1668 from birarda/nodelist-patches 
cleanup deadlocking in NodeList methods, avatar-mixer debug
 2014-01-23 16:30:29 -08:00
Stephen Birarda
7762ea9f94 repair calls to broadcast to nodes 2014-01-23 16:28:35 -08:00
Stephen Birarda
000bbccdf0 Merge pull request #1664 from ZappoMan/bugfixes 
fix random crash on interface shutdown
 2014-01-23 16:25:07 -08:00
Andrzej Kapolka
e80eb03ba9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/src/Application.cpp
 2014-01-23 16:13:42 -08:00
Andrew Meadows
631c1d2c1b Merge branch 'master' of ssh://github.com/highfidelity/hifi into zero-length-penetrations 2014-01-23 16:07:16 -08:00
Andrew Meadows
70c675e9be Adding comments and minor cleanup after tracking down some NaN's that were showing up in collision sound triggers. 2014-01-23 16:03:52 -08:00
Stephen Birarda
4ebd5795fc handle merge with nodelist-patches branch 2014-01-23 16:01:52 -08:00
Stephen Birarda
80106979a5 replace packetSenderNotify with signal/slot combo 2014-01-23 15:55:36 -08:00
Stephen Birarda
349c790cc7 NodeData cleanup thanks to separation from rendered avatars 2014-01-23 15:41:40 -08:00
Stephen Birarda
ed9118fd67 more NodeList QSet changes, closes #1660 2014-01-23 15:28:46 -08:00
Stephen Birarda
ba7a73e347 add a missing break, don't double activate sockets 2014-01-23 15:11:09 -08:00
Stephen Birarda
761bcb9825 allow recursive locking on the NodeHashMutex 2014-01-23 15:11:02 -08:00
ZappoMan
9de99ce6a8 removed commented out debug 2014-01-23 15:07:17 -08:00
Stephen Birarda
09cd8eb0fd add a missing break, don't double activate sockets 2014-01-23 15:05:09 -08:00
Stephen Birarda
e7927ff837 allow recursive locking on the NodeHashMutex 2014-01-23 15:02:23 -08:00