ZappoMan
|
c07f97358e
|
Merge pull request #1533 from birarda/nodelist-container
simplify return of nodeWithUUID from NodeList
|
2014-01-15 12:06:30 -08:00 |
|
Stephen Birarda
|
b4438c04c6
|
return result of QHash value from nodeWithUUID
|
2014-01-15 11:31:23 -08:00 |
|
Stephen Birarda
|
602060525b
|
Merge pull request #1530 from kordero/19485
Code Review for Job #19485
|
2014-01-15 10:55:47 -08:00 |
|
Lucas Crisman
|
73dfc5dd58
|
Merge branch 'master' of git://github.com/worklist/hifi into 19485
|
2014-01-15 14:50:59 -03:00 |
|
Lucas Crisman
|
24103740da
|
equal sign shortcut for Reset Avatar Size on Application keyPress Event
|
2014-01-15 14:50:25 -03:00 |
|
Stephen Birarda
|
8325753962
|
Merge pull request #1529 from birarda/master
remove newlines from node debug
|
2014-01-15 09:42:38 -08:00 |
|
Stephen Birarda
|
13dfe91358
|
remove newlines from Node debug
|
2014-01-15 09:42:11 -08:00 |
|
Philip Rosedale
|
6a2c962326
|
Merge pull request #1525 from ey6es/armstrong
First cut at stretching the arms out and aligning forearms with wrists.
|
2014-01-14 20:10:18 -08:00 |
|
Andrzej Kapolka
|
7e4fcb43f2
|
Merge branch 'master' of https://github.com/worklist/hifi into armstrong
|
2014-01-14 16:31:30 -08:00 |
|
Andrzej Kapolka
|
fdfdefaf4b
|
Merge pull request #1518 from birarda/debug-cleanup
some debugging cleanup so we don't always have to add new lines
|
2014-01-14 16:31:18 -08:00 |
|
Stephen Birarda
|
e76a37f48b
|
resolve conflicts on merge with upstream master
|
2014-01-14 16:26:02 -08:00 |
|
Andrzej Kapolka
|
617453da8c
|
Merge branch 'master' of https://github.com/worklist/hifi into armstrong
|
2014-01-14 16:22:41 -08:00 |
|
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 |
|
Stephen Birarda
|
299e558b79
|
Merge branch 'master' of https://github.com/worklist/hifi into debug-cleanup
|
2014-01-14 16:19:21 -08:00 |
|
Andrzej Kapolka
|
242597bbda
|
Merge branch 'master' of https://github.com/worklist/hifi into armstrong
|
2014-01-14 16:19:10 -08:00 |
|
Stephen Birarda
|
6b2f72f14d
|
repair reference to _targetScale in MyAvatar
|
2014-01-14 16:17:07 -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
|
599e3bb9e5
|
resolve conflicts on merge with upstream master
|
2014-01-14 16:15:58 -08:00 |
|
Stephen Birarda
|
77ee27e5d7
|
resolve conflicts on merge with upstream master
|
2014-01-14 16:12:42 -08:00 |
|
Andrzej Kapolka
|
96a88e194c
|
Merge branch 'master' of https://github.com/worklist/hifi into armstrong
|
2014-01-14 16:10:31 -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 |
|
Andrzej Kapolka
|
eaf6aef1cb
|
Merge branch 'master' of https://github.com/worklist/hifi into armstrong
|
2014-01-14 15:29:53 -08:00 |
|
Andrzej Kapolka
|
5d88953f12
|
First cut at stretching the arms out and aligning forearms with wrists.
Closes #1423, #1504.
|
2014-01-14 15:27:28 -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
|
4ea14a51fc
|
remove the SerialInterface
|
2014-01-14 13:14:15 -08:00 |
|
Stephen Birarda
|
987c639e36
|
initial newline removal from all QDebug calls
|
2014-01-14 13:09:22 -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 |
|