Commit graph

3099 commits

Author SHA1 Message Date
Brad Davis
14c8c3f4db Return existing textures when matching hash for a previously found live texture 2017-03-20 09:39:29 -07: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
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
172a638ef0 move resource paths to PathUtils 2017-03-13 17:26:34 -04: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
Brad Hefta-Gaub
a38965d628 add more audio stats 2017-03-11 09:50:30 -08:00
Brad Davis
399270d243 Still trying to fix OSX build 2017-03-08 09:03:59 -08:00
Bradley Austin Davis
62fcd238ae Fix shared pointer usage in storage abstraction 2017-03-08 09:03:58 -08:00
Brad Davis
e94f803b84 Merge remote-tracking branch 'upstream/master' into HEAD 2017-03-08 09:03:21 -08:00
Brad Hefta-Gaub
8ae6f2727d add support for double click messages to overlays and entities 2017-03-07 17:52:55 -08:00
Seth Alves
71c2b4215d Merge pull request #9811 from ZappoMan/triangleSet
Cleanup how Models do ray-picking and determination of point inside of convex hull
2017-03-07 14:12:56 -08:00
Ryan Huffman
a744e0d11c Merge pull request #9685 from humbletim/21114-part2
CR-2 21114 -- BaseScriptEngine.cpp, order-of-operations fixes, reworked JS Exceptions
2017-03-07 13:25:25 -08:00
Brad Hefta-Gaub
f7e824e47c Merge branch 'master' of https://github.com/highfidelity/hifi into triangleSet 2017-03-07 12:18:36 -08:00
Brad Hefta-Gaub
87934ee82d fix bugs in some meshes 2017-03-06 21:50:32 -08:00
Brad Davis
8782fe1d93 Merge branch 'master' into smarter_textures
Conflicts:
	libraries/model-networking/src/model-networking/TextureCache.cpp
2017-03-06 15:29:41 -08:00
Andrew Meadows
10b3e7fc67 sphere shapeType for models means 'sphere' 2017-03-06 15:14:51 -08:00
Brad Hefta-Gaub
f27475613f Merge branch 'master' of https://github.com/highfidelity/hifi into triangleSet 2017-03-06 12:53:59 -08:00
ZappoMan
faba160331 more CR feedback 2017-03-06 11:10:04 -08:00
ZappoMan
af97e9bdd9 CR feedback 2017-03-06 10:49:38 -08:00
ZappoMan
87bcced409 cleanup use of triangleSet for picking 2017-03-05 19:23:55 -08:00
Ken Cooke
0bababf1f5 Safe replacement of glm_mat4_mul() for unaligned arguments instead of __m128 2017-03-04 14:53:07 -08:00
ZappoMan
9908723bb9 fist cut at basic TriangleSet class 2017-03-03 22:27:38 -08:00
Anthony J. Thibault
bc256f3e8f Fix for multi-threaded access to maps in DebugDraw. 2017-03-02 14:42:06 -08:00
Bradley Austin Davis
fa5b315e09 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-01 15:16:18 -08:00
Anthony J. Thibault
01abb4bdb6 Exposed DebugDraw interface to Java Script 2017-03-01 13:14:29 -08:00
Seth Alves
88c850afa2 voxel-paint paints with capsules rather than spheres 2017-02-26 12:56:17 -08:00
samcake
e8835b34f4 fix issues while testing the ktxStorage 2017-02-22 19:05:20 -08:00
samcake
262d7c3b79 Merging with upstream smarter_textures and Austin's pr 2017-02-22 17:54:38 -08:00
Brad Davis
c6b72dfe3c Make memory storage mutable 2017-02-22 13:29:08 -08:00
samcake
6938948501 Merge branch 'master' of https://github.com/highfidelity/hifi into texmex 2017-02-22 12:00:11 -08:00
Brad Hefta-Gaub
a526db1779 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements 2017-02-21 14:18:36 -08:00
Brad Davis
27e8750b9b Adding new storage backing for gpu::Texture, moving mip format into Storage abstraction 2017-02-19 18:11:56 -08:00
Brad Davis
285222d490 Add view storage 2017-02-17 12:49:55 -08:00
Brad Davis
d1b91cb436 Adding abstracted storage for in-memory or file backed data 2017-02-17 10:13:08 -08:00
Stephen Birarda
78301fd947 call getParentPointer when parent ID changes to update children 2017-02-16 16:46:09 -08:00
humbletim
b15956278c separate out supporting changes into 21114-part2 branch 2017-02-16 07:40:19 -05:00
Brad Hefta-Gaub
faa8e629a0 checkpoint 2017-02-15 20:28:32 -08:00
Seth Alves
bc5f563f57 make _parentID and _parentJointIndex private to avoid accidental direct access 2017-02-12 11:37:29 -08:00
Atlante45
2962dd6dc2 Factor LogDialog 2017-02-09 13:04:43 -08:00
Brad Hefta-Gaub
74f10a1e7f Merge pull request #9603 from huffman/feat/trace-thread-script
Add thread names and scripts to chrome traces
2017-02-09 13:00:05 -08:00
Andrew Meadows
a871613f84 make Settings::remove() work for groups 2017-02-08 11:49:40 -08:00
Anthony Thibault
caefb6c711 Merge pull request #9620 from hyperlogic/bug-fix/find-entity-bug
Fix for findEntities not returning some entities that are within range.
2017-02-06 20:22:34 -08:00
Anthony J. Thibault
a14dcbd513 Fix for findEntities not returning some entities that are within range.
This bug has been around a long time... introduced by commit 39ed7f7b in 2014.
This became apparent to me when testing the tablet-ui, there was a case where the
hand styluses were not appearing when close to a web entity.  Because findEntities
is such a fundamental feature used by handControllerGrab, this fix should make all
grabbing feel more consistent and predictable.

I added a unit test that reproduces the issue.
2017-02-06 15:13:25 -08:00
Seth Alves
ad83f20199 make findAncestorOfType understand AVATAR_SELF_ID 2017-02-03 16:43:36 -08:00
Seth Alves
c7200d2d3a make hasAncestorOfType understand AVATAR_SELF_ID 2017-02-03 16:14:15 -08:00
Ryan Huffman
55df6f8f76 Add tracing to ScriptEngine and EntitiesScriptingInterface 2017-02-03 09:45:33 -08:00
Ryan Huffman
a5e61184bf Add support for adding thread names to a trace 2017-02-03 09:18:51 -08:00
Brad Hefta-Gaub
3bbb57599b Merge pull request #9565 from kencooke/cpudetect-gcc-bugfix
Fix bug that causes GCC not to detect AVX2
2017-01-31 11:11:35 -08:00
Brad Hefta-Gaub
cff49ea5f3 Merge pull request #9556 from samcake/blue
Adding support for disabling texturing from the material
2017-01-31 10:39:44 -08:00