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

52308 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Stephen Birarda
0926b2df2a add LX snap turn to standard mapping 2017-03-13 15:14:20 -07:00
Ryan Huffman
8a1bd781f0 Fix overlay findRayIntersection not properly handing multiple drawInFront overlays 2017-03-13 14:44:14 -07:00
Ryan Huffman
9880d40cfb Update edit.js light icons to now use the name entityIcon 2017-03-13 14:38:56 -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
Brad Davis
3bef5ad528 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-13 14:30:25 -07:00
Zach Pomerantz
808973d7d2 use QStandardPaths instead of hardcoded paths 2017-03-13 17:26:42 -04:00
Zach Pomerantz
463f6454f8 use Local instead of Roaming for FileCache 2017-03-13 17:26:38 -04:00
Zach Pomerantz
172a638ef0 move resource paths to PathUtils 2017-03-13 17:26:34 -04:00
humbletim
075574b428 log cleanup per CR; add more specific hints (instead of relying on __FUNCTION__) 2017-03-13 16:33:42 -04:00
Brad Davis
02189812da Merge pull request #9867 from zzmp/ktx/manifest 
Remove manifest from FileCache
 2017-03-13 13:21:03 -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
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
Ryan Huffman
d4ade8278c Fix js linting errors in entityIconOverlayManager.js 2017-03-13 11:27:12 -07:00