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
51948 commits 71 branches 56 tags 1.2 GiB
Commit graph

51948 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Kelly
2552e572a7 Merge pull request #9882 from davidkelly/dk/newMessageStuff 
updated messaging for friends gesture
 2017-03-16 10:25:03 -07:00
David Kelly
f0fad5981a Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into dk/newMessageStuff 2017-03-16 09:01:13 -07:00
David Kelly
4f6123ee29 more messaging rework - dealing with edges 2017-03-15 16:41:07 -07:00
Howard Stearns
278138a7f0 Merge pull request #9913 from howard-stearns/PAL_v2 
Pal v2
 2017-03-15 16:40:27 -07:00
howard-stearns
84fd17bd88 use location.metaverseServerUrl instead of hardcoded value. 2017-03-15 16:33:23 -07:00
howard-stearns
f662571cab send credentials to private data-webs as well 2017-03-15 15:46:25 -07:00
howard-stearns
155e1b8e85 Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-15 15:45:36 -07:00
howard-stearns
c0c92fd8d1 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-15 15:20:28 -07:00
Brad Hefta-Gaub
ed380a7738 Merge pull request #9895 from zzmp/clean/noise-gate 
Strip AudioNoiseGate of dead code
 2017-03-15 13:21:56 -07:00
Zach Fox
786180291b Bugfixes and improvements 2017-03-15 11:46:33 -07:00
David Kelly
d8719ac3a9 cleanup, switch to overlays with texture swapping, move overlay to between hands 2017-03-15 11:15:58 -07:00
Anthony Thibault
495deba771 Merge pull request #9877 from hyperlogic/bug-fix/debug-draw-races 
Fixes for race conditions in DebugDraw
 2017-03-15 10:38:26 -07:00
Seth Alves
dc82895feb Merge pull request #9870 from Atlante45/fix/js-exceptions 
Fix JS exception messages formatting
 2017-03-15 09:32:04 -08:00
Seth Alves
94e2cd6e68 Merge pull request #9845 from AndrewMeadows/fix-rare-physics-crash 
fix rare physics crash
 2017-03-15 09:30:29 -08:00
howard-stearns
6c88bc98b4 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-15 09:24:30 -07:00
Zach Pomerantz
f43706dfe1 clean AudioNoiseGate 2017-03-15 00:14:55 +00:00
Zach Pomerantz
0abcda86a8 mv AudioNoiseGate to audio 2017-03-15 00:14:55 +00:00
Brad Hefta-Gaub
a38ab4ff80 Merge pull request #9884 from Atlante45/old-stable 
Merge Stable back into Master.
 2017-03-14 16:59:41 -07:00
Zach Fox
0a6bcd7fca Massive performance boost 2017-03-14 16:24:06 -07:00
David Kelly
0a35fa34f9 some reworking, cleaning, bug fixing... 2017-03-14 14:22:44 -07:00
Zach Fox
5da0dfc4ac Merging from Pal_v2_Zach 2017-03-14 14:05:50 -07:00
David Kelly
f821ccc8c3 fix typo - doh! 2017-03-14 10:00:19 -07:00
Brad Hefta-Gaub
a8d18adf83 Merge pull request #9872 from ZappoMan/fadeInWhenOpeningNoiseGate 
code review changes
 2017-03-14 09:26:14 -07:00
David Kelly
246d2f4017 fix comments at top 2017-03-14 08:58:14 -07:00
David Kelly
9daa94ce73 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into dk/newMessageStuff 2017-03-14 08:55:02 -07:00
David Kelly
7765daf382 handle cleanup, race, etc..., more to come 2017-03-13 18:57:01 -07:00
Zach Fox
e3d0842ddc Implement browser in PAL 2017-03-13 18:39:47 -07:00
David Kelly
fa7283a6e2 initial new messaging - working but needs cleanup 2017-03-13 18:33:36 -07:00
Anthony J. Thibault
6747f553bf Add DebugDraw to .eslintrc config file 
(cherry picked from commit c7cd0fdc38)
 2017-03-13 15:23:22 -07:00
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
David Kelly
b65125157e Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-13 13:11:06 -07:00
David Kelly
515e6fd34e map Controller.Standard.RB so xbox controller works. whee. 2017-03-13 13:10:05 -07:00
Zach Fox
d04b1da1c2 Merging from PAL_v2_Zach 2017-03-13 12:54:01 -07: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
howard-stearns
db06c2650f Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-13 11:53:48 -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
howard-stearns
ee3ca736fd Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-13 11:51:39 -07:00
David Kelly
e2e7573e93 handle stopping handshake part-way through 2017-03-13 11:04:51 -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
Zach Fox
beb848373b Update from zfox23/PALv2 branch 2017-03-13 10:15:06 -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
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