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

8263 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
d8933b66b2 Merge pull request #1516 from birarda/domain-change 
replace the DomainChangeListener class with a signal/slot combo
 2014-01-14 16:22:28 -08:00
Stephen Birarda
540378262d Merge branch 'master' of https://github.com/worklist/hifi into domain-change 2014-01-14 16:19:37 -08:00
Andrzej Kapolka
a1c6075c5b Merge pull request #1526 from ey6es/master 
Fix compile error.
 2014-01-14 16:16:38 -08:00
Andrzej Kapolka
4c2b67f6f3 Fix compile error. 2014-01-14 16:16:06 -08:00
Stephen Birarda
77ee27e5d7 resolve conflicts on merge with upstream master 2014-01-14 16:12:42 -08:00
Andrzej Kapolka
bd6418d4a4 Merge pull request #1514 from birarda/nodelist-container 
replace the NodeList hacky container with a QHash<QUuid, QSharedPointer(Node)>
 2014-01-14 16:09:55 -08:00
Stephen Birarda
274989935d resolve conflicts on merge with upstream master 2014-01-14 16:09:12 -08:00
Stephen Birarda
767a241105 Merge remote-tracking branch 'upstream/master' into nodelist-container 2014-01-14 16:08:58 -08:00
Stephen Birarda
8676ac38f9 foreach spacing and reference repairs 2014-01-14 15:54:09 -08:00
Philip Rosedale
108d09856a Merge pull request #1522 from birarda/master 
only output the first starve for a PositionalAudioRingBuffer
 2014-01-14 15:05:16 -08:00
Stephen Birarda
bcf9e04f56 only output first starve for a PositionalAudioRingBuffer 2014-01-14 14:34:00 -08:00
Stephen Birarda
bdc31a3b48 replace the DomainChangeListener class with a signal/slot combo 2014-01-14 11:38:05 -08:00
Stephen Birarda
fa01383f3f move the NodeList to the thread used for a ThreadedAssignment 2014-01-14 11:26:26 -08:00
Stephen Birarda
e888366fd8 remove unused index variable 2014-01-14 10:57:34 -08:00
Stephen Birarda
9de098b4d9 fix logging name for metavoxel server 2014-01-14 10:55:18 -08:00
Stephen Birarda
5a43c2c66b remove extraneous node destructor debug 2014-01-14 10:53:55 -08:00
Stephen Birarda
718d04bd71 correct iterator push on NodeList clear 2014-01-14 10:53:17 -08:00
Stephen Birarda
9efb391ecf repair crazy references to node ponter from old iterator style 2014-01-14 10:50:06 -08:00
Stephen Birarda
66f50c38e3 repair iterator push on silent node removal 2014-01-14 10:48:47 -08:00
Stephen Birarda
ed0ed96029 properly emit signal on silent node removal 2014-01-14 10:28:41 -08:00
Stephen Birarda
57f977668f replace the Node mutex with a QMutex 2014-01-14 10:15:31 -08:00
Stephen Birarda
53d435006c more follow mode cleanup, fix silent node iterator 2014-01-14 10:07:26 -08:00
Stephen Birarda
cbcdeb570b pull all available datagrams in Application processDatagrams 2014-01-14 10:01:11 -08:00
Stephen Birarda
3ab7a6d9d5 move network packet processing to main thread 2014-01-13 17:58:48 -08:00
Philip Rosedale
a8bbe41642 Merge pull request #1512 from ey6es/retryagain 
After failing to download textures or geometry, retry again after increasing delays.
 2014-01-13 17:44:18 -08:00
Stephen Birarda
1faa2120aa use typedef in NodeList implementation 2014-01-13 17:36:27 -08:00
Stephen Birarda
0579b18426 fix deadlock in silent node removal 2014-01-13 17:33:58 -08:00
Stephen Birarda
6a0c431562 repair add of new node (so it doesn't immediately kill) 2014-01-13 17:29:45 -08:00
Stephen Birarda
677303b5c0 properly hook SharedNodePointer for signals/slots 2014-01-13 17:17:53 -08:00
Stephen Birarda
7d1a64ca8c change NodeList container to QHash with QSharedPointer 2014-01-13 17:09:21 -08:00
Andrzej Kapolka
ce03853da5 Merge branch 'master' of https://github.com/worklist/hifi into retryagain 2014-01-13 16:13:38 -08:00
Andrzej Kapolka
0694a7d4a5 When we fail to download textures or geometry, retry after steadily increasing 
delays.  Closes #1471.
 2014-01-13 16:09:36 -08:00
ZappoMan
85161382d6 Merge pull request #1511 from ey6es/master 
Fix (hopefully) for Windows warning, orbit around hover voxel center (not corner).
 2014-01-13 15:54:42 -08:00
Andrzej Kapolka
f21436a29e Fix (hopefully) for warning on Windows build. 2014-01-13 15:02:46 -08:00
Andrzej Kapolka
d8bae0530f Merge branch 'master' of https://github.com/worklist/hifi 2014-01-13 14:44:18 -08:00
Andrzej Kapolka
9d831a2ab5 Orbit around voxel center, limit hover distance. 2014-01-13 14:43:59 -08:00
Philip Rosedale
0f2aa6ce00 Merge pull request #1510 from ey6es/master 
When teleporting to a user, face them from a couple meters away.
 2014-01-13 14:16:20 -08:00
Andrzej Kapolka
7abb7d9ccd Merge branch 'master' of https://github.com/worklist/hifi 2014-01-13 14:03:08 -08:00
Andrzej Kapolka
e721e8b7d4 Merge pull request #1509 from birarda/master 
fix for avatar fade/scale bug
 2014-01-13 14:02:45 -08:00
Stephen Birarda
42e3bcfe91 allow fade scale to get smaller than minimum avatar scale 2014-01-13 13:52:41 -08:00
Andrzej Kapolka
2d5df38907 Persist the user orientation as well as the position, show up a couple meters 
in front of (and facing) target.  Closes #1367.
 2014-01-13 13:51:51 -08:00
Stephen Birarda
3f2c6504a6 fix for avatar scale bug, closes #1506 2014-01-13 12:27:47 -08:00
Andrzej Kapolka
68eb1f79fe Merge branch 'master' of https://github.com/worklist/hifi 2014-01-13 10:40:59 -08:00
Leonardo Murillo
0e25c85eef Trivial change - testing deploy changes 2014-01-13 11:46:27 -06:00
Andrzej Kapolka
eb4cb0c8e7 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-10 17:52:51 -08:00
ZappoMan
038f8d5777 Merge pull request #1502 from AndrewMeadows/master 
more correct particle-particle collisions
 2014-01-10 17:36:36 -08:00
ZappoMan
6345eff3ae Merge pull request #1501 from birarda/qprocess 
switch to QProcess instead of fork in AssignmentClient
 2014-01-10 17:36:24 -08:00
Andrzej Kapolka
c6a3d702c7 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-10 17:05:33 -08:00
Andrew Meadows
c61f071ab7 merge of latest upstream work in preparation for pull request #1500 
Conflicts:
	libraries/particles/src/ParticleCollisionSystem.cpp
 2014-01-10 17:03:45 -08:00
Stephen Birarda
248754e63e make sure STDOUT from child assignment-client bubbles up to parent 2014-01-10 17:03:13 -08:00