Anthony Thibault
8d06cd2447
Merge pull request #7539 from huffman/fix-asset-request-cancel
...
Fix asset resource request not properly cleaning up
2016-04-01 10:58:31 -07:00
Seth Alves
0f288247a7
include script in default script location
2016-04-01 10:50:22 -07:00
Leonardo Murillo
946a292cfb
Updating defaultAvatar_full.fbx to fixed version
2016-04-01 11:49:45 -06:00
Ryan Huffman
0948c8cefb
Fix format of long lines
2016-04-01 10:11:32 -07:00
Ryan Huffman
8e375fd076
Fix asset resource request not properly cleaning up
2016-04-01 10:08:44 -07:00
Anthony J. Thibault
5e81cccc6c
Merge branch 'master' into tony/culling-fixes
2016-04-01 09:29:46 -07:00
Brad Hefta-Gaub
5a665f9aef
Merge pull request #7482 from huffman/extra-logging
...
Add system information to log file
2016-04-01 09:10:21 -07:00
Brad Hefta-Gaub
c36a5370e6
whitespace
2016-04-01 09:02:16 -07:00
Brad Hefta-Gaub
d5ecb99b16
switch to HMD preferred audio when mounting the HMD
2016-04-01 09:00:57 -07:00
Ryan Huffman
03f9a02857
Update env var logging to only include certain keys
2016-03-31 22:49:22 -07:00
David Rowe
b9054897f7
Merge branch 'master' into 20855
2016-04-01 17:32:47 +13:00
David Rowe
7d36ec9520
Miscellaneous fixes
2016-04-01 17:30:22 +13: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
Eric Levin
8176852503
removed extra space
2016-03-31 18:50:24 -07:00
Eric Levin
e0f843d6eb
removes extra space
2016-03-31 18:49:51 -07:00
David Rowe
1f0529b5ea
Miscellaneous fixes
2016-04-01 14:13:38 +13:00
Stephen Birarda
fc8707dc05
add suppression for unreasonable sequence number messages
2016-03-31 18:04:13 -07:00
Anthony J. Thibault
3d43f73a88
Application: don't call Model::simulate on network thread.
...
This can cause a crash.
On startup the Application::processOctreeStats method on the network thread will call into entities entity->isReadyToComputeShape() (without a tree lock) and trigger Model::simulate. Model is NOT thread safe. This was leading to a single model to be initialized on two threads simultaneously.
This might be somewhat rare, I only caught it because I was running a debug build.
2016-03-31 17:57:20 -07:00
Stephen Birarda
5ab59fe770
suppress overflown AudioRingBuffer debug
2016-03-31 17:53:39 -07:00
Seth Alves
7a509447cf
Merge branch 'master' of github.com:highfidelity/hifi into equip-via-thumb
2016-03-31 17:21:17 -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
David Rowe
b900fcbbf0
Back out attempt at fixing OSX styling
2016-04-01 12:43:30 +13:00
Seth Alves
e8d58483aa
fix typo
2016-03-31 16:37:08 -07:00
Atlante45
0409479a12
CR
2016-03-31 16:36:34 -07:00
Seth Alves
0e643a1555
debugging prints
2016-03-31 16:26:54 -07:00
Anthony J. Thibault
d670853941
AnimDebugDraw: enable bound now that culling works. :)
2016-03-31 16:10:04 -07:00
Atlante45
31942d9a73
Code cleanup
2016-03-31 16:09:54 -07:00
Brad Hefta-Gaub
bbca1ba6db
only do depth reticle depth check when the reticle is visible
2016-03-31 15:58:37 -07:00
Brad Davis
27406f5b21
Add texture stress test
2016-03-31 15:13:04 -07:00
Anthony J. Thibault
bc967f0ab0
Model: update renderItems when items are added to the scene.
...
* Renamed enqueueLocationChange to updateRenderItems
* Call updateRenderItems when models are added to the scene.
This will fix entity render bounds being incorrect when they are first added to the scene,
then later being correct after a position update.
* Renamed getMeshPartBound to getRenderableMeshBound.
* Avatar now uses getRenderableMeshBound() to do boundingRadius vs frustum check.
* Model::getRenderableMeshBound now returns a more accurate bound, because it is the same one used for rendering.
This will fix avatar freezing, when they are in the corner of your frustum.
This was due to matrices not being updated because the avatar had to a small bounding sphere.
2016-03-31 14:59:27 -07:00
Anthony J. Thibault
635f58629a
MeshPartPayload: remove dead code
2016-03-31 14:58:25 -07:00
David Rowe
a2953595a5
Tweak spinbox fields for large values
2016-04-01 10:23:39 +13:00
Ryan Huffman
1c1158b761
Add Windows manifest to interface.exe
2016-03-31 14:20:19 -07:00
Seth Alves
63595e196e
fix batch-loaded local scripts
2016-03-31 14:02:47 -07:00
David Rowe
048865fb09
Style spin buttons
2016-04-01 09:55:27 +13:00
Seth Alves
a8b4d1a379
ray follows controller
2016-03-31 13:46:00 -07:00
Seth Alves
a89735cb76
integrate Philip's changes to distance grabbing
2016-03-31 13:29:31 -07:00
Brad Davis
97e96f7b67
PR comments
2016-03-31 13:19:26 -07:00
Seth Alves
6dec015b85
Merge branch 'master' of github.com:highfidelity/hifi into equip-via-thumb
2016-03-31 13:18:47 -07:00
Zach Pomerantz
bc2901aa96
Fix model fetch delay
2016-03-31 12:54:23 -07:00
David Rowe
dbd6b9e90b
Use monospace font for textarea fields
2016-04-01 08:50:11 +13: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
