howard-stearns
|
e6746acf4c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into discovery
|
2016-08-11 15:40:26 -07:00 |
|
Brad Hefta-Gaub
|
ea1e090053
|
Merge pull request #8383 from AndrewMeadows/faster-is-better
faster image processing on load
|
2016-08-11 13:10:44 -07:00 |
|
James B. Pollack
|
6da2ea1932
|
Merge pull request #8409 from SamGondelman/loadingFade
Fix procedural entity transparency
|
2016-08-11 12:02:57 -07:00 |
|
David Kelly
|
5c15b52040
|
expose getPlaceName() as placename
Nice for scripts to get the placename. Nice for us, anyways.
|
2016-08-10 14:54:29 -07:00 |
|
SamGondelman
|
d8545bc7a3
|
fix procedural transparency
|
2016-08-10 13:49:35 -07:00 |
|
Brad Hefta-Gaub
|
a714f325fe
|
Merge pull request #8333 from SamGondelman/miscFixes
Miscellaneous cmake and render engine improvements
|
2016-08-10 11:06:50 -07:00 |
|
SamGondelman
|
e35d453b37
|
...missing space
|
2016-08-10 10:36:37 -07:00 |
|
SamGondelman
|
9e20d92241
|
CR changes
|
2016-08-10 10:35:18 -07:00 |
|
Brad Hefta-Gaub
|
7503a495fd
|
Merge pull request #8401 from ctrlaltdavid/21026
Fix crash when adding new attachment
|
2016-08-10 09:18:17 -07:00 |
|
Brad Hefta-Gaub
|
d736857ecb
|
Merge pull request #8391 from AlexanderOtavka/qml-atp
Add support for ATP protocol to QML
|
2016-08-10 09:16:20 -07:00 |
|
David Rowe
|
afe76c69d2
|
Fix crash when adding new attachment
|
2016-08-10 10:41:16 +12:00 |
|
SamGondelman
|
9b27f8bc0f
|
Merge remote-tracking branch 'upstream/master' into loadingFade
|
2016-08-09 14:55:14 -07:00 |
|
SamGondelman
|
5a4d15dd5b
|
fix warning
|
2016-08-09 14:02:42 -07:00 |
|
SamGondelman
|
36d9f92101
|
performance optimization to minimize calling usecTimestampNow
|
2016-08-09 13:10:02 -07:00 |
|
Zander Otavka
|
51fb52977e
|
Generalize atp handling in network access managers
|
2016-08-09 11:46:08 -07:00 |
|
Brad Hefta-Gaub
|
d8f1847fde
|
Merge pull request #8365 from huffman/feat/default-skybox
Default skybox change
|
2016-08-09 11:17:36 -07:00 |
|
Andrew Meadows
|
85d87fe13f
|
Merge pull request #8218 from huffman/feat/load-improvements
Speed up gamma correction in cube map processing
|
2016-08-09 11:10:36 -07:00 |
|
SamGondelman
|
ae9fb3768c
|
CR notes
|
2016-08-08 17:45:25 -07:00 |
|
Ryan Huffman
|
6854f9fda4
|
Remove stars shaders and renderable
|
2016-08-08 16:03:03 -07:00 |
|
Ryan Huffman
|
36744d72d6
|
Fix warning using init list for QVariantMap
|
2016-08-08 16:03:03 -07:00 |
|
Ryan Huffman
|
5b69ca03f0
|
Move default skybox out of global and make irradiance gen optional
|
2016-08-08 16:03:03 -07:00 |
|
Ryan Huffman
|
35ea9908cd
|
Add default skybox
|
2016-08-08 16:00:58 -07:00 |
|
Ryan Huffman
|
43c1472b36
|
Move srgbToLinear lookup table to external cpp
|
2016-08-08 15:47:53 -07:00 |
|
Ryan Huffman
|
b800aa793d
|
Fix gamma correction adjusting uchar to float when unnecessary
|
2016-08-08 15:45:05 -07:00 |
|
Zander Otavka
|
cb153f2a29
|
Fix file header comments
|
2016-08-08 15:17:42 -07:00 |
|
Zander Otavka
|
aebd18db7f
|
Add EOF newlines
|
2016-08-08 15:12:17 -07:00 |
|
Zander Otavka
|
246a8457e1
|
Add some asserts
|
2016-08-08 15:12:17 -07:00 |
|
Zander Otavka
|
43bbe790d6
|
Add atp support to qml
|
2016-08-08 15:12:17 -07:00 |
|
SamGondelman
|
de900e85c0
|
remove duplicate include
|
2016-08-08 14:10:47 -07:00 |
|
SamGondelman
|
328d3128fa
|
merge from master
|
2016-08-08 13:30:39 -07:00 |
|
Ryan Huffman
|
2ee511bae0
|
Fix syntax error
|
2016-08-08 12:30:11 -07:00 |
|
Ryan Huffman
|
28b3ff9bca
|
Update generation of srgb to linear lookup to include python script
|
2016-08-08 12:04:06 -07:00 |
|
SamGondelman
|
f311907982
|
fix merge mistake
|
2016-08-08 11:08:01 -07:00 |
|
Ryan Huffman
|
2a071c4329
|
Fix improperly formatted floats
|
2016-08-08 10:39:06 -07:00 |
|
Ryan Huffman
|
d367583426
|
Clean up priority loading implementation
|
2016-08-08 08:53:06 -07:00 |
|
Ryan Huffman
|
4f9be2ae72
|
Fix camera position not being set for angular loading
|
2016-08-08 08:53:06 -07:00 |
|
Ryan Huffman
|
77e993510e
|
Cleanup implementation of angular loading
|
2016-08-08 08:53:05 -07:00 |
|
Ryan Huffman
|
c594dcdf9f
|
Add priority loading for model entities
|
2016-08-08 08:52:29 -07:00 |
|
Andrew Meadows
|
4e23ecfb2c
|
count the _translucent_ pixels and fix break logic
|
2016-08-07 10:50:25 -07:00 |
|
Andrew Meadows
|
f759fd1033
|
early exit when determining if alpha mask possible
also don't bother scanning for alpha for cube maps
|
2016-08-07 08:54:20 -07:00 |
|
Andrew Meadows
|
4f2c00af46
|
faster TextureUsage::process2DImageColor()
|
2016-08-05 23:38:45 -07:00 |
|
SamGondelman
|
b23d3cd35a
|
fixed messed up transparency on edit selection of shapes
|
2016-08-05 18:35:16 -07:00 |
|
SamGondelman
|
dd51e0e38f
|
merge from master
|
2016-08-05 17:04:45 -07:00 |
|
SamGondelman
|
771e105fa2
|
Merge remote-tracking branch 'upstream/master' into loadingFade
|
2016-08-05 16:52:01 -07:00 |
|
Sam Gondelman
|
debda37567
|
Merge pull request #8379 from SamGondelman/loadingFade
fixed procedural entity fade
|
2016-08-05 16:48:51 -07:00 |
|
Brad Hefta-Gaub
|
452c0218da
|
Merge pull request #8358 from AlexanderOtavka/inline-e-script
Fix parsing of embedded entity scripts
|
2016-08-05 16:46:02 -07:00 |
|
Brad Hefta-Gaub
|
3f3dda6356
|
Merge pull request #8360 from sethalves/no-accidental-fly
don't accidently fly
|
2016-08-05 16:45:48 -07:00 |
|
SamGondelman
|
b794259b7d
|
fixed procedural entity fade
|
2016-08-05 16:15:10 -07:00 |
|
Chris Collins
|
1e2d77a99b
|
Merge pull request #8346 from sethalves/default-when-av-fails
use default avatar when avatar-url is bogus
|
2016-08-05 15:13:58 -07:00 |
|
Sam Gondelman
|
84b7f9b186
|
Merge pull request #8375 from SamGondelman/loadingFade
remove polyvox fade, fix web fade, add light fade
|
2016-08-05 11:53:15 -07:00 |
|