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

8310 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
d7388c2288 Merge pull request #1537 from ZappoMan/stephens_requests 
added option to disable local cache file
 2014-01-15 17:07:43 -08:00
ZappoMan
ec3699da3b Merge pull request #1543 from birarda/master 
perform a proper oculus teardown if it isn't present
 2014-01-15 17:04:52 -08:00
ZappoMan
4beea7f0ec Merge pull request #1541 from birarda/double-stars 
clarify output for double stars
 2014-01-15 16:57:08 -08:00
Stephen Birarda
0f7d86a111 perform a proper oculus teardown if it isn't present 2014-01-15 16:52:03 -08:00
ZappoMan
4c5a3bdc32 Merge pull request #1540 from birarda/nodelist-container 
make sure killNodeWithUUID is called from right thread in DomainServer
 2014-01-15 16:30:27 -08:00
Stephen Birarda
a694425823 clarify output for star generation time 2014-01-15 16:26:01 -08:00
Stephen Birarda
0c22aa241f leverage invokeMethod to make sure killNodeWithUUID is called on right thread 2014-01-15 16:10:51 -08:00
Philip Rosedale
106c8f9f22 Merge pull request #1538 from birarda/nodelist-container 
don't return an iterator from killNodeAtHashIterator
 2014-01-15 13:15:06 -08:00
Stephen Birarda
1912ed0d9e have the Agent ask for an audio-mixer for audio scripting 2014-01-15 13:14:13 -08:00
Stephen Birarda
afc37789d4 Merge branch 'master' of https://github.com/worklist/hifi into nodelist-container 2014-01-15 12:45:16 -08:00
Stephen Birarda
0b52b8266e don't return an iterator from killNodeAtHashIterator 2014-01-15 12:44:46 -08:00
Brad Hefta-Gaub
f1e98720d0 added option to disable local cache file 2014-01-15 12:29:54 -08:00
ZappoMan
dfb70ee397 Merge pull request #1527 from PhilipRosedale/master 
New voxelBird example script
 2014-01-15 12:07:39 -08:00
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
Philip Rosedale
a702c6a868 merge fix 2014-01-14 17:24:24 -08:00
Philip Rosedale
7f09aff297 Added voxelBird example script 2014-01-14 17:12:14 -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
7d6316ebb0 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-14 15:05:29 -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