Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-17 03:57:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
52072 commits 76 branches 59 tags 1.2 GiB
Commit graph

52072 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony J. Thibault
d38b994f4c Fix for potential crash due to DebugDraw data race. 
(cherry picked from commit 1b8a624edb)
 2017-03-13 15:23:16 -07:00
Anthony J. Thibault
efc7fbacb1 Bug fix for potential crash when getting DebugDraw::instance 
(cherry picked from commit b0ad9a8110)
 2017-03-13 15:23:10 -07:00
Atlante45
0b237fa644 Revert "Revert "don't blend animations for otherAvatars"" 
This reverts commit 8bf9b70915.
 2017-03-13 15:17:35 -07:00
Stephen Birarda
0926b2df2a add LX snap turn to standard mapping 2017-03-13 15:14:20 -07:00
Atlante45
203325fd2a Revert "Revert "expand avatar update time budget"" 
This reverts commit 9a9f07df71.
 2017-03-13 14:38:09 -07:00
Atlante45
031d144c04 Revert "Revert "minor cleanup"" 
This reverts commit 188287e345.
 2017-03-13 14:38:08 -07:00
Atlante45
71eb24386b Revert "Revert "remove unnecessary context brackets"" 
This reverts commit a68674adcc.
 2017-03-13 14:38:06 -07:00
Atlante45
4637fcefe9 Revert "Revert "remove unused variable"" 
This reverts commit 50288bd4ba.
 2017-03-13 14:38:04 -07:00
Atlante45
1bba59a459 Revert "Revert "avoid unnecessary copy of priority_queue"" 
This reverts commit 97c376a09c.
 2017-03-13 14:38:02 -07:00
humbletim
075574b428 log cleanup per CR; add more specific hints (instead of relying on __FUNCTION__) 2017-03-13 16:33:42 -04:00
ZappoMan
956fdd0933 CR feedback 2017-03-13 12:06:38 -07:00
ZappoMan
099ee1db7f CR feedback 2017-03-13 12:05:42 -07:00
ZappoMan
f5e434bc40 Merge branch 'master' of https://github.com/highfidelity/hifi into fadeInWhenOpeningNoiseGate 2017-03-13 11:59:38 -07:00
ZappoMan
3e020ede78 CR feedback 2017-03-13 11:58:43 -07:00
Andrew Meadows
546f32431d Merge pull request #9862 from ZappoMan/fadeInWhenOpeningNoiseGate 
Various noise gate, scope, and audio stats improvements
 2017-03-13 11:52:16 -07:00
ZappoMan
81d01da21d Merge branch 'master' of https://github.com/highfidelity/hifi into fadeInWhenOpeningNoiseGate 2017-03-13 10:55:09 -07:00
Andrew Meadows
6e7f4b0418 Merge pull request #9829 from ZappoMan/addDoubleClick 
Add double click message support to entities and overlays
 2017-03-13 10:44:54 -07:00
Atlante45
b67b17d3c0 Fix JS exception messages formatting 2017-03-13 09:11:20 -08:00
Brad Hefta-Gaub
a38965d628 add more audio stats 2017-03-11 09:50:30 -08:00
Brad Hefta-Gaub
6ce50269ac add audio mixer in/out stats to the client stats 2017-03-10 18:42:18 -08:00
Andrew Meadows
bde2222dfd actually use worldTrans 2017-03-10 18:30:56 -08:00
Brad Hefta-Gaub
aa65f03509 fix mac warning and remove accidentally added whitespace 2017-03-10 18:14:00 -08:00
Brad Hefta-Gaub
23e47f2fdc added icons to the audioScope app 2017-03-10 18:13:35 -08:00
Brad Hefta-Gaub
7eb4b8f5f7 expose AudioScope to QML 2017-03-10 17:38:13 -08:00
Brad Hefta-Gaub
b8a2525f9e add auto pause/resume to the Audio Scope App 2017-03-10 17:38:00 -08:00
Brad Hefta-Gaub
5f3ee2e98f add a basic tablet app for the audio scope 2017-03-10 17:08:54 -08:00
Brad Hefta-Gaub
eaea718de1 add various scriping interfaces for managing the audio scope and detecting noise gate transitions 2017-03-10 17:08:19 -08:00
Chris Collins
49efd8ad42 Merge pull request #9841 from AndrewMeadows/fix-crash-copying-joint-data 
fix crash when unpacking too many joints
 2017-03-10 14:39:27 -08:00
Andrew Meadows
9c9eb87925 sync RigidBody on deactivation 2017-03-10 12:55:16 -08:00
kunalgosar
a974282bdf bolding timestamps on log 2017-03-10 11:55:36 -08:00
Brad Hefta-Gaub
69fdea3621 fix typo in comment 2017-03-10 11:44:53 -08:00
Brad Hefta-Gaub
a4eac3cbc0 Merge branch 'master' of https://github.com/highfidelity/hifi into fadeInWhenOpeningNoiseGate 
Conflicts:
	libraries/audio-client/src/AudioNoiseGate.cpp
 2017-03-10 11:43:30 -08:00
Seth Alves
494b602d4c Merge pull request #9850 from druiz17/toolbar-MIA-afetr-snapshot 
toolbar becomes visible after taking a snapshot
 2017-03-10 10:20:01 -08:00
Seth Alves
cef4c988c4 Merge pull request #9835 from druiz17/toolbar-window-dont-close 
Close toolbar windows when reloading scripts
 2017-03-10 10:19:07 -08:00
Andrew Meadows
2c141fd555 more correct comment 2017-03-10 09:18:29 -08:00
Andrew Meadows
a16760278e remove debug code 2017-03-09 17:58:53 -08:00
Andrew Meadows
be3012181f force local deactivation on remote deactivation 2017-03-09 17:53:17 -08:00
Andrew Meadows
8ddcae2a15 restore transform of deactivated entities 2017-03-09 17:26:53 -08:00
Andrew Meadows
d4abdcb6c8 comments, namechange, and temporary debug code 2017-03-09 17:26:53 -08:00
Dante Ruiz
d54005b62e no more duplicate snapshot buttons after taking reloading scripts 2017-03-10 00:17:44 +00:00
Dante Ruiz
c6c0c6d382 toolbar becomes visible after taking a snapshot 2017-03-09 22:54:22 +00:00
Brad Hefta-Gaub
95776c2e51 Merge pull request #9830 from zzmp/fix/audio-silent-check 
better detection of silent samples in audio-mixer
 2017-03-09 14:11:46 -08:00
Zach Pomerantz
7e2f1a6455 check for silent samples befor limiting 2017-03-09 14:31:54 -05:00
Zach Pomerantz
e69d6d8b5f track silent listeners in audio-mixer 2017-03-09 14:31:41 -05:00
Brad Hefta-Gaub
45efb235e3 Merge pull request #9842 from ZappoMan/tellCodecAboutSilence 
improved noise gate
 2017-03-09 11:04:22 -08:00
druiz17
007ed9fe81 Merge pull request #9836 from druiz17/2-tablets-fix 
Fixed having more than one tablet when reloading scripts
 2017-03-09 09:13:14 -08:00
druiz17
840e29c8b9 Merge pull request #9840 from druiz17/close-tablet-during-switch 
Close tablet when switching from HMD to desktop and vice versa
 2017-03-09 09:12:29 -08:00
Brad Hefta-Gaub
bdab24d9bf fix spelling 2017-03-09 08:25:56 -08:00
Brad Hefta-Gaub
79d8d90581 CR feedback 2017-03-08 20:35:24 -08:00
Brad Hefta-Gaub
2d595c1f87 CR feedback 2017-03-08 20:29:32 -08:00