Commit graph

41516 commits

Author SHA1 Message Date
Brad Hefta-Gaub
d5ecb99b16 switch to HMD preferred audio when mounting the HMD 2016-04-01 09:00:57 -07:00
Brad Hefta-Gaub
1e7a69fb90 Merge pull request #7523 from zzmp/fix/tex-load-fixup
Render alpha textures immediately
2016-03-31 21:04:04 -07:00
Brad Hefta-Gaub
7f041ec18e Merge pull request #7529 from jherico/texture_stress_test
Add texture stress test
2016-03-31 21:01:39 -07:00
Brad Hefta-Gaub
16f249ce6c Merge pull request #7524 from jherico/oculus_audio
Allow display plugins to expose a preferred audio device
2016-03-31 19:09:46 -07:00
Brad Davis
ef7febfcaf Merge pull request #7533 from zzmp/fix/model-release-texs
Release textures from cache
2016-03-31 18:58:01 -07:00
Zach Pomerantz
809b489146 Don't cache 0-sized Resources 2016-03-31 17:15:20 -07:00
Clément Brisset
588a5da3ca Merge pull request #7525 from sethalves/fix-load-from-disk
Fix load from disk
2016-03-31 17:04:33 -07:00
Zach Pomerantz
33d56d974e Set texture size in cache post-proc 2016-03-31 17:02:40 -07:00
Zach Pomerantz
b80f0fc8a6 Add actual byte size to Resource 2016-03-31 17:02:40 -07:00
Zach Pomerantz
9d3abe5513 Release texs when models are cached 2016-03-31 17:02:40 -07:00
Clément Brisset
dc1d3a8ff5 Merge pull request #7527 from zzmp/fix/model-cache-delay
Fix model fetch delay
2016-03-31 16:59:27 -07:00
Brad Davis
27406f5b21 Add texture stress test 2016-03-31 15:13:04 -07:00
Seth Alves
63595e196e fix batch-loaded local scripts 2016-03-31 14:02:47 -07:00
Brad Davis
97e96f7b67 PR comments 2016-03-31 13:19:26 -07:00
Zach Pomerantz
bc2901aa96 Fix model fetch delay 2016-03-31 12:54:23 -07:00
Seth Alves
aea06914b4 Merge branch 'master' of github.com:highfidelity/hifi into fix-load-from-disk 2016-03-31 11:45:48 -07:00
Zach Pomerantz
e4cba14333 Avoid recreating model items when adding to scene 2016-03-31 10:46:51 -07:00
Zach Pomerantz
377a20e983 Use default texs for empty json 2016-03-31 10:46:51 -07:00
Zach Pomerantz
984bacdae3 Rearrange model entity render to reduce flicker 2016-03-31 10:46:51 -07:00
Zach Pomerantz
3de5f73a1f Fixup model on tex load 2016-03-31 10:46:51 -07:00
Brad Davis
b53968fd64 Add automatic switching the Oculus headphones and mic when activating the plugin 2016-03-31 10:33:11 -07:00
Andrew Meadows
74633ca8c8 Merge pull request #7522 from ZappoMan/optimizeFindZones
optimize checkEnterLeaveEntities() to do distance check and stationary checks less frequently
2016-03-31 10:14:32 -07:00
Seth Alves
cfa847ba54 don't put empty folders at end of scripts tree. allow /~/ to work from outside scripts 2016-03-31 09:45:28 -07:00
Seth Alves
8299041997 Merge branch 'master' of github.com:highfidelity/hifi into fix-load-from-disk 2016-03-31 09:44:56 -07:00
Brad Hefta-Gaub
2e129a398f add example script for testing 2016-03-31 09:37:03 -07:00
Brad Hefta-Gaub
03f9a2b46f more optimization in find best zone 2016-03-31 09:36:51 -07:00
Brad Hefta-Gaub
a7f93aa75c Merge pull request #7519 from zzmp/fix/avatar-crash
Fix crash from updating/resetting avatar
2016-03-30 21:31:17 -07:00
Seth Alves
ae971c0f30 Merge branch 'master' of github.com:highfidelity/hifi into fix-load-from-disk 2016-03-30 20:58:44 -07:00
Brad Hefta-Gaub
30cb62f1aa Merge pull request #7517 from zzmp/fix/qml-renderer
Check for valid qml gl context creation
2016-03-30 19:52:03 -07:00
Brad Hefta-Gaub
b76f8509aa Merge branch 'master' of https://github.com/highfidelity/hifi into optimizeFindZones 2016-03-30 19:29:28 -07:00
Brad Hefta-Gaub
32a90b4709 Merge pull request #7521 from sethalves/fix-load-from-disk
fix script load from disk on windows
2016-03-30 19:29:11 -07:00
Seth Alves
c3b95e8284 Merge branch 'master' of github.com:highfidelity/hifi into fix-load-from-disk 2016-03-30 19:12:31 -07:00
Brad Hefta-Gaub
28978c8adb optimize checkEnterLeaveEntities() to do distance check and stationary checks less frequently 2016-03-30 17:49:30 -07:00
Brad Hefta-Gaub
f0cc8c0dd3 Merge pull request #7491 from jherico/oculus_release
Update to latest Oculus SDK, add input device support
2016-03-30 17:42:32 -07:00
Brad Hefta-Gaub
89d41c55ea Merge pull request #7520 from hyperlogic/tony/octree-tests
OctreeTests: added unit tests for EntityTreeElement child accessors
2016-03-30 17:30:12 -07:00
Clément Brisset
be07426d5a Merge pull request #7515 from birarda/console-to-sandbox
rename the Server Console to Sandbox
2016-03-30 17:29:15 -07:00
Seth Alves
651d2c8954 fix script load from disk on windows 2016-03-30 17:27:36 -07:00
Clément Brisset
14934678fc Merge pull request #7513 from birarda/ice-server-lockup
use NetworkAccessManager in IceServer for single QNAM instance
2016-03-30 17:05:13 -07:00
Stephen Birarda
d8b0dbf3bf fix indentation for last inactive check timestamp 2016-03-30 16:58:35 -07:00
Anthony Thibault
26b9469df5 Merge pull request #7516 from hyperlogic/tony/show-collision-geometry-crash-fix
Model: fix for crash when displaying collision mesh
2016-03-30 16:48:07 -07:00
Anthony J. Thibault
f4d834b07b OctreeTests: added unit tests for EntityTreeElement child accessors 2016-03-30 16:15:29 -07:00
Seth Alves
d9909fb7da Merge pull request #7518 from hyperlogic/tony/model-hand-grab-fix
Model: Fix for equipped models not updating their matrices
2016-03-30 16:10:21 -07:00
samcake
c13e24438c Merge pull request #7512 from zzmp/fix/light-buf-fmt
Correctly represent lighting framebuffer
2016-03-30 16:10:10 -07:00
Zach Pomerantz
6e0d6ee45b Guard updateClusterMatrices from unloaded geo 2016-03-30 16:04:00 -07:00
Zach Pomerantz
00db095306 Guard against reset model geo on scene update 2016-03-30 15:49:45 -07:00
Brad Hefta-Gaub
84bbeef72b Merge pull request #7511 from zzmp/guard/gl
Add GL checks
2016-03-30 15:47:16 -07:00
Brad Hefta-Gaub
eb61a4fee9 Merge pull request #7514 from zzmp/guard/model-tex
Add lock on model texs
2016-03-30 15:46:52 -07:00
Brad Hefta-Gaub
4a1e82892a Merge pull request #7494 from sethalves/use-local-scripts
Use local scripts
2016-03-30 15:46:32 -07:00
Brad Hefta-Gaub
2381ab1cba Merge pull request #7496 from kencooke/master
make self-reverb depend on wetDryMix
2016-03-30 15:44:20 -07:00
Brad Hefta-Gaub
e31546e172 Merge pull request #7509 from samcake/orange
Avoid the spot lights flickering in Home
2016-03-30 15:44:08 -07:00