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

34623 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
dbd74dc9e2 Merge pull request #6411 from jherico/chiana 
A couple fixes for windows 64 bit builds
 2015-11-17 18:36:57 -08:00
Brad Davis
68c6718d1c Fixes for windows 64 bit builds 2015-11-17 18:22:00 -08:00
Brad Hefta-Gaub
733d93039f Merge pull request #6403 from jherico/rec3 
Recording fixes
 2015-11-17 17:52:15 -08:00
Brad Davis
4e57c9114c Avatar has no dependency on audio or recording anymore 2015-11-17 17:13:53 -08:00
James B. Pollack
b340a99d69 Merge pull request #6290 from zzmp/examples/growth 
Add growth script to examples
 2015-11-17 17:01:28 -08:00
Brad Davis
d87b8a749f Merge pull request #6405 from ZappoMan/messaging 
Messaging Improvements
 2015-11-17 16:41:35 -08:00
Brad Hefta-Gaub
293914b84f added NodeActivated signal to make it easier for users to know when a recently added node has an active socket 2015-11-17 16:31:34 -08:00
Brad Hefta-Gaub
073215d067 handle socketActivated 2015-11-17 15:55:41 -08:00
Brad Hefta-Gaub
9c4286b6ca Merge branch 'master' of https://github.com/highfidelity/hifi into messaging 2015-11-17 15:50:54 -08:00
Brad Hefta-Gaub
4ef04f4080 Merge pull request #6406 from birarda/peer-active-signal 
add socketActivated signal to NetworkPeer for punch success
 2015-11-17 15:50:47 -08:00
Stephen Birarda
f5ec458a5e make activeSocket checks more consistent 2015-11-17 15:38:03 -08:00
Stephen Birarda
3906a747b8 fix a couple of bad checks 2015-11-17 15:33:57 -08:00
Brad Davis
48b0465e56 Fixing race condition on seek, correcting some issues with frame timing 2015-11-17 15:18:32 -08:00
Brad Davis
900f425f35 Recording fixes 2015-11-17 15:18:31 -08:00
Stephen Birarda
34b8fca83b add socketActivated signal to NetworkPeer for punch success 2015-11-17 15:04:31 -08:00
Stephen Birarda
7dfdb3c72e protect LNL packet sending without active socket 2015-11-17 15:04:14 -08:00
Brad Hefta-Gaub
3efbcb7062 debug the late connect case 2015-11-17 14:47:59 -08:00
Brad Hefta-Gaub
d8a3927311 debug the late connect case 2015-11-17 14:43:06 -08:00
Andrew Meadows
2b07daa976 Merge pull request #6404 from hyperlogic/tony/bugfixes-for-avatars-with-no-eyes 
Bug fixes for avatars with no eyes
 2015-11-17 14:29:20 -08:00
Brad Hefta-Gaub
85aa3b3f83 handle subscribe when messages mixer is not available 2015-11-17 14:28:51 -08:00
Brad Hefta-Gaub
6dfcc53c27 properly handle removing subscribers from channels when the subscriber node disconnects 2015-11-17 14:19:13 -08:00
Brad Hefta-Gaub
8112b3b57e add senderUUID to the messageReceived signal 2015-11-17 14:16:22 -08:00
Brad Davis
6664d8d919 Merge pull request #6398 from ZappoMan/messaging 
messages-mixer
 2015-11-17 14:03:03 -08:00
Anthony J. Thibault
e93b5c5838 Bug fixes for avatars with no eyes 
Changed default eye position to 1.9 meters because
the hifi_team avatars are 2.0 meters tall.

Also, prevent array access with negative indices when eye bones are missing.

ಠ_ಠ
 2015-11-17 14:02:27 -08:00
Brad Hefta-Gaub
f54374b66a remove unused settings 2015-11-17 13:40:04 -08:00
Brad Hefta-Gaub
2f142eb088 add a receiver example 2015-11-17 13:33:30 -08:00
Brad Hefta-Gaub
2d3fe497e4 fix typo 2015-11-17 13:29:28 -08:00
Brad Hefta-Gaub
32bf81ef0d move MessagesClient to agent 2015-11-17 12:59:12 -08:00
Leonardo Murillo
c3d882e849 Merge pull request #6399 from birarda/qt-5.5 
change BUILD guides for Qt 5.5.1 and default homebrew recommendation
 2015-11-17 14:41:00 -06:00
Stephen Birarda
46c8d7b3f8 fix for release build undeclared identifier 2015-11-17 12:32:45 -08:00
Brad Hefta-Gaub
5b9791d800 add message received signal 2015-11-17 11:50:10 -08:00
Brad Hefta-Gaub
e7a8df306c fix warnings 2015-11-17 11:18:36 -08:00
Brad Hefta-Gaub
1c2c37ff44 more cleanup work 2015-11-17 11:10:12 -08:00
Brad Hefta-Gaub
60ae1259fa more cleanup work 2015-11-17 11:06:27 -08:00
Brad Hefta-Gaub
034debc483 cleanup 2015-11-17 10:59:53 -08:00
Clément Brisset
198f1452cf Merge pull request #6396 from ctrlaltdavid/20738 
Fix particle aging
 2015-11-17 10:47:41 -08:00
Brad Hefta-Gaub
c27a127739 add example script 2015-11-17 10:41:26 -08:00
Brad Hefta-Gaub
1f7c70a0d1 implement proper sending 2015-11-17 10:28:50 -08:00
Brad Hefta-Gaub
f9a674bca5 implement subscribe/unsubscribe in MessagesClient 2015-11-17 10:01:31 -08:00
Brad Hefta-Gaub
6b61ec569c more work on channels 2015-11-17 09:47:50 -08:00
ZappoMan
f6953f2496 Merge branch 'messaging' of https://github.com/ZappoMan/hifi into messaging 2015-11-17 08:58:06 -08:00
ZappoMan
f712fae4d2 more hacking 2015-11-17 08:56:21 -08:00
samcake
9a651c6194 Merge pull request #6400 from jherico/rec3 
Fixing recording interface times
 2015-11-16 21:54:14 -08:00
Brad Hefta-Gaub
eb4bb1cc03 more work 2015-11-16 19:34:53 -08:00
Brad Hefta-Gaub
5f04e4a167 more work 2015-11-16 19:29:54 -08:00
Brad Hefta-Gaub
1e0b66a68f more work 2015-11-16 19:23:39 -08:00
samcake
ba952581d0 Merge pull request #6389 from AlessandroSigna/groupRecording 
added group recording feature
 2015-11-16 17:57:11 -08:00
samcake
d66049f323 Merge pull request #6386 from AlessandroSigna/recorder 
added examples for messages synchronization
 2015-11-16 17:55:32 -08:00
samcake
e6d0b93703 Merge pull request #6394 from EdgarPironti/record_branch 
ControlledAC.js refactoring
 2015-11-16 17:53:38 -08:00
AlessandroSigna
f40ff69c75 added scripts for group recording 2015-11-16 17:27:00 -08:00