Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 07:17:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
52328 commits 69 branches 56 tags 1.2 GiB
Commit graph

52328 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
samcake
ea2f1359bc Expose rendering in wireframe mode 2017-03-15 12:23:44 -07:00
Stephen Birarda
0c657a1d55 add parameter to unload to remove entityID from map 2017-03-15 10:57:12 -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
Stephen Birarda
d13752a7c6 use the correct property name for useAdvancedMovementControls 2017-03-15 10:34:43 -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
Zach Pomerantz
789bb7c855 rename audio(Mic)OutboundPPS 2017-03-15 13:30:39 -04:00
Zach Pomerantz
2d0e11e2d1 add AudioNoiseGate to recording 2017-03-15 13:30:39 -04: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
Stephen Birarda
bfc51d8222 use property not function for advanced movement controls 2017-03-15 10:25:06 -07:00
Seth Alves
7afe091c52 quiet warnings 2017-03-14 19:47:30 -07:00
Seth Alves
0785172398 quiet warnings 2017-03-14 19:01:13 -07:00
Stephen Birarda
7ddb5ff770 use correct boolean when changing AMC 2017-03-14 18:09:17 -07:00
Seth Alves
08ad56d254 quiet warnings 2017-03-14 18:05:53 -07:00
Seth Alves
40b87171a9 quiet warnings 2017-03-14 17:49:39 -07:00
Stephen Birarda
188530590a add missing curly brace to script 2017-03-14 17:16:49 -07:00
Zach Pomerantz
e6fbdf8f06 add isNoiseGateEnabled to Agent 2017-03-15 00:15:49 +00:00
Zach Pomerantz
b1e5e43faa mv AudioNoiseGate to audio 2017-03-15 00:15:33 +00:00
Atlante45
a9658ce9fb Revert "Trivial PR to trigger build" 
This reverts commit a0befa7f95.
 2017-03-14 17:15:23 -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
Seth Alves
3f142b7290 Merge branch 'master' of github.com:highfidelity/hifi into model-scripting 2017-03-14 16:41:39 -07:00
Brad Davis
fc21c6bbd8 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-14 15:57:25 -07:00
Brad Davis
ff89a5c8c4 Merge pull request #9889 from samcake/brown 
Fix the unsupported KTX file format
 2017-03-14 15:56:15 -07:00
samcake
900615fcd5 Fix the unsupported ktx format, it was coming from the BUmp map case 2017-03-14 15:53:29 -07:00
samcake
e0f0cc2102 Fix the unsupported ktx format, it was coming from the BUmp map case 2017-03-14 15:49:44 -07:00
Stephen Birarda
490cb83489 move advanced movement control changes to MyAvatar 2017-03-14 15:03:01 -07:00
samcake
0fa5d1808a Merge pull request #9888 from jherico/smarter_textures 
Protect against missing texture cache on shutdown
 2017-03-14 14:46:55 -07:00
Stephen Birarda
1fe02477b0 fix LX behaviour in snap/advanced/basic 2017-03-14 14:21:21 -07:00
Brad Davis
5e716f15b5 Protect against missing texture cache on shutdown 2017-03-14 13:48:24 -07:00
Atlante45
b14a4faf61 Guard against script loading before avatar 2017-03-14 10:54:22 -08:00
Seth Alves
5b28f3a3c4 cleanups 2017-03-14 10:08:34 -07:00
Brad Hefta-Gaub
a8d18adf83 Merge pull request #9872 from ZappoMan/fadeInWhenOpeningNoiseGate 
code review changes
 2017-03-14 09:26:14 -07:00
Zach Pomerantz
a41146451b Merge pull request #9883 from jherico/smarter_textures 
Don't crash when failing to convert a texture to KTX format
 2017-03-14 12:14:56 -04:00
Brad Davis
1ccf715e3b Don't crash when failing to convert a texture to KTX format 2017-03-14 09:09:14 -07:00
Seth Alves
4a1be69be4 writeOBJToString 2017-03-14 07:11:38 -07:00
Atlante45
9e6312ba0e Make sit script more stable. 2017-03-13 18:06:32 -08:00
Atlante45
f0d971fc6f Put avatar in front of chair on situp to avoid infinite collisions 2017-03-13 18:06:32 -08:00
Atlante45
1a375432e0 Only grab primary clicks 2017-03-13 18:06:32 -08:00
Atlante45
34889d38c9 Override all roles instead of just fly 2017-03-13 18:06:32 -08:00
Seth Alves
1eedce9825 unmangle merge 2017-03-13 18:18:26 -07:00
Seth Alves
e8a9ff867d merge from upstream 2017-03-13 17:57:01 -07:00
humbletim
db73c80ba1 remove unused meta property adapter 2017-03-13 19:16:00 -04:00
Brad Davis
eab91d061d Merge pull request #9868 from zzmp/ktx/local-not-roaming 
Use Local for WIN32 FileCache
 2017-03-13 15:52:11 -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
Atlante45
0b237fa644 Revert "Revert "don't blend animations for otherAvatars"" 
This reverts commit 8bf9b70915.
 2017-03-13 15:17:35 -07:00
Ryan Huffman
8246dbafab Update particle explorer to work outside of entity list 2017-03-13 15:15:36 -07:00