Brad Davis
|
02189812da
|
Merge pull request #9867 from zzmp/ktx/manifest
Remove manifest from FileCache
|
2017-03-13 13:21:03 -07:00 |
|
Zach Pomerantz
|
a27d88da1a
|
update TextureCache to use FileCache
|
2017-03-13 13:41:44 -04:00 |
|
Zach Pomerantz
|
a0c56618b3
|
update FileCache to rm manifest
|
2017-03-13 13:41:44 -04:00 |
|
Zach Pomerantz
|
3624d7a6ee
|
Merge pull request #9848 from jherico/smarter_textures
Smarter Textures - Fix OSX link failure
|
2017-03-13 13:06:26 -04:00 |
|
Brad Davis
|
43d8433d9a
|
Removing unused include
|
2017-03-10 09:19:00 -08:00 |
|
Bradley Austin Davis
|
8a438948b9
|
Fix OSX link failure
|
2017-03-09 10:42:56 -08:00 |
|
Brad Davis
|
ae4ab3d86c
|
Merge pull request #9834 from zzmp/ktx/use-stored-metadata
Use stored Usage(Type), Sampler for KTX
|
2017-03-08 13:00:11 -08:00 |
|
Zach Pomerantz
|
ffdaa09072
|
use stored Usage(Type), Sampler for KTX
|
2017-03-08 15:54:32 -05:00 |
|
Brad Davis
|
9d56001341
|
Fix rebase
|
2017-03-08 12:14:45 -08:00 |
|
Brad Davis
|
e46302e5da
|
Merge pull request #9791 from zzmp/2-27
Add a FileCache, derived KTXCache, and use it as a member of TextureCache
|
2017-03-08 12:10:49 -08:00 |
|
Brad Davis
|
a871b1cabc
|
Merge branch 'smarter_textures' into 2-27
|
2017-03-08 11:33:38 -08:00 |
|
samcake
|
e730847a1e
|
Merge pull request #9827 from jherico/smarter_textures
|
2017-03-08 09:07:22 -08:00 |
|
Brad Davis
|
9b8a531439
|
Fix iteration
|
2017-03-08 09:04:00 -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 |
|
Seth Alves
|
a67f8ac0ed
|
Merge pull request #9807 from Menithal/21166-remove-limit
#9761 Cloneable Improvement
|
2017-03-08 07:15:06 -08:00 |
|
samcake
|
109988c621
|
Merge pull request #9821 from samcake/texmex
Implement the ktx keyvalue feature for read/write
|
2017-03-07 17:30:22 -08:00 |
|
Brad Hefta-Gaub
|
1e51ae62b1
|
Merge pull request #9804 from jherico/oculus_update
Update Oculus SDK to 1.11
|
2017-03-07 15:00:44 -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 |
|
Thijs Wenker
|
d2c3b0b706
|
Fix coding standards link
|
2017-03-07 22:37:54 +01:00 |
|
Seth Alves
|
cd91d6ff3c
|
Merge pull request #9824 from sethalves/fix-tablet-qml-overlay-in-hmd
fix -- restore missing shading pipeline for simple opaque in deferred
|
2017-03-07 13:25:44 -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 |
|
Howard Stearns
|
2b117407d4
|
Merge pull request #9805 from howard-stearns/fix-ban-remove-from-pal
fix 'banned user doesn't disappear from pal until refresh'
|
2017-03-07 12:27:41 -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 |
|
howard-stearns
|
cb41b9135b
|
fix broken merge
|
2017-03-07 12:10:52 -08:00 |
|
Seth Alves
|
694fc58374
|
restore missing shading pipeline for simple opaque in deferred
|
2017-03-07 12:07:24 -08:00 |
|
samcake
|
4b4f573f8e
|
Removing the comments to work in debug
|
2017-03-07 11:44:40 -08:00 |
|
howard-stearns
|
8a489f36f4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-ban-remove-from-pal
|
2017-03-07 10:49:53 -08:00 |
|
Andrew Meadows
|
1e9623e2f2
|
Merge pull request #9813 from druiz17/multipule-audio-fix
removed duplicated audio devices
|
2017-03-07 10:00:48 -08:00 |
|
Brad Hefta-Gaub
|
d8b7076a9e
|
Merge pull request #9816 from AndrewMeadows/sphere-means-sphere
ModelEntityItems that use 'sphere' for shapeType should collide as true spheres
|
2017-03-07 09:53:52 -08:00 |
|
Howard Stearns
|
f0fd29abd3
|
Merge pull request #9815 from davidkelly/dk/3377
Retain selection in PAL when sorting or reloading
|
2017-03-07 09:38:07 -08:00 |
|
Brad Hefta-Gaub
|
69a8ea99ca
|
Merge pull request #9823 from vladest/qml_js_in_qtcreator
Adding ability for QML/JS file to be visible in QtCreator. Also chang…
|
2017-03-07 09:20:51 -08:00 |
|
David Kelly
|
b760e86226
|
rest of cr feedback
|
2017-03-07 10:17:32 -07:00 |
|
David Kelly
|
c6dbfc85f0
|
cr feedback
|
2017-03-07 09:54:00 -07:00 |
|
Vladyslav Stelmakhovskyi
|
2d2b2094fd
|
Adding ability for QML/JS file to be visible in QtCreator. Also changed files will be installed to destination
|
2017-03-07 10:11:09 +01:00 |
|
sam
|
1b036b7225
|
Implement the ktx keyvalue feature for read and write and use it with gpu::Texture to store meat data required for full serialization
|
2017-03-07 00:58:22 -08:00 |
|
Andrew Meadows
|
8c773483cf
|
Merge pull request #9820 from Atlante45/fix/avatar-lean
Fix avatar lean
|
2017-03-06 22:18:34 -08:00 |
|
Brad Hefta-Gaub
|
b111bcb826
|
Merge pull request #9818 from ctrlaltdavid/21205
Remove Developer > Network > Bandwith Details dialog
|
2017-03-06 22:02:33 -08:00 |
|
Brad Hefta-Gaub
|
87934ee82d
|
fix bugs in some meshes
|
2017-03-06 21:50:32 -08:00 |
|
Atlante45
|
ff9d6d657c
|
Remove weighted offset, special case downward pressure
|
2017-03-06 19:41:08 -08:00 |
|
samcake
|
c267b5cd09
|
Adding KeyValues read/write, work in progress
|
2017-03-06 18:26:31 -08:00 |
|
David Rowe
|
51739f2f99
|
Remove Developer > Network > Bandwith Details dialog
|
2017-03-07 15:02:26 +13:00 |
|
Zach Pomerantz
|
170df4a1f4
|
Merge branch 'smarter_textures' of github.com:highfidelity/hifi into 2-27
|
2017-03-06 17:14:11 -07:00 |
|
Brad Davis
|
f9dcfa54aa
|
Add debug/release builds to oculus lib
|
2017-03-06 16:08:21 -08:00 |
|
Andrew Meadows
|
d749c0c8be
|
use fabsf() rather than fabs()
|
2017-03-06 15: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 |
|
David Kelly
|
3d39aae35b
|
minor tweak - just in case
|
2017-03-06 15:52:33 -07:00 |
|
David Kelly
|
f23f882595
|
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3377
|
2017-03-06 15:26:21 -07:00 |
|