Commit graph

63871 commits

Author SHA1 Message Date
Brad Davis
d087530423 Add nvtt to android build 2018-02-02 13:42:26 -08:00
Brad Davis
3e3a585b92 Fixing compile warnings 2018-01-30 21:54:29 -08:00
Brad Davis
87a41ef176 Force the forward pipelines to setup the lighting data 2018-01-28 14:56:15 -08:00
Brad Davis
07aee1ef68 Ensure the fragment normal is noramlized 2018-01-28 14:55:28 -08:00
Brad Davis
7565e08657 Make ambient light header GLES safe 2018-01-28 14:40:25 -08:00
Brad Davis
29d6813963 Fixing header ordering 2018-01-28 14:39:51 -08:00
Brad Davis
f3d451c2ef Fix GLES compilation for shader 2018-01-25 19:33:42 -08:00
Brad Davis
1b35ff9b85 Use a distinct KTX cache location for GLES 2018-01-25 19:32:45 -08:00
Brad Davis
361b767586 Merge branch 'fix/render_config' into android 2018-01-25 14:50:41 -08:00
Brad Davis
ab4e2d99f1 Don't try to set the current directory to a QRC path 2018-01-25 13:04:54 -08:00
Brad Davis
867bb99b51 Fix help screen URL 2018-01-25 13:04:08 -08:00
Brad Davis
d4aef1ea88 Fix URLs in QSS files to use QRC base path 2018-01-25 13:03:42 -08:00
Brad Davis
ac94327ec7 Fix loading of the context overlay information icon 2018-01-25 12:44:55 -08:00
Brad Davis
bde5282541 Fix loading of the render config JSON 2018-01-25 12:43:49 -08:00
Bradley Austin Davis
00538c69cd
Merge pull request #12257 from jherico/source_tree_qml
Fix resource loading from source tree
2018-01-25 12:29:24 -08:00
Andrew Meadows
289356dfe7
Merge pull request #12227 from ZappoMan/sendDataDescription
some settings cleanup
2018-01-25 11:30:14 -08:00
Brad Davis
3915a2d4ba Fix resource loading from source tree 2018-01-25 11:07:39 -08:00
ZappoMan
cb01bd14b9 Merge branch 'master' of https://github.com/highfidelity/hifi into sendDataDescription 2018-01-25 10:39:43 -08:00
Seth Alves
e3f859329d
Merge pull request #12245 from sethalves/fix-asan-build
fix asan build
2018-01-25 10:15:29 -08:00
John Conklin II
5ac2e9da15
Merge pull request #12251 from zfox23/commerce_fixMacSecurityPic
Fix MacOS Security Pic visibility; fix incorrect button state when changing pic
2018-01-25 09:42:32 -08:00
John Conklin II
1865432b47
Merge pull request #12180 from Zvork/locallights
Local lights on translucent objects
2018-01-25 09:36:58 -08:00
Seth Alves
7c09b210c6
Merge pull request #12253 from hyperlogic/bug-fix/avatar-eye-offset
Bug fix for incorrect positioned eyes on other peoples avatars
2018-01-25 07:51:35 -08:00
Anthony J. Thibault
a252e90f96 Bug fix for incorrect positioned eyes on other peoples avatars
There was a bug in writeBitVector(), where the last byte was not consistantly written into the destination buffer.
A unit test was added to verify that writeBitVector() and readBitVector() are correct.
2018-01-24 18:58:08 -08:00
Zach Fox
94e1c425ab Fix MacOS Security Pic visibility; fix incorrect button state when changing pic 2018-01-24 17:03:16 -08:00
John Conklin II
049cf43de0
Merge pull request #12242 from hyperlogic/bug-fix/twisted-knees
Bug fix for twisted knees on some avatars.
2018-01-24 16:19:49 -08:00
Zach Fox
6f54921cb1
Merge pull request #12236 from zfox23/commerce_fixSecurityImageSelectionClear
Fix security image index clear after back nav
2018-01-24 13:43:49 -08:00
Andrew Meadows
a0e07a2c4b
Merge pull request #12232 from luiscuenca/showHelp
Fix Interface first launch should show help
2018-01-24 12:11:34 -08:00
MiladNazeri
3da8e5249c
Merge pull request #12226 from kencooke/audio-options-pitch
Add "pitch" property to allow pitch shifting an audio effect
2018-01-24 10:38:24 -08:00
Sam Gateau
b27047f1fc
Merge pull request #12244 from NissimHadar/newAutoTester
Implemented new recursive functionality.
2018-01-24 09:04:57 -08:00
Zach Fox
6566c5c5e6
Merge pull request #12238 from zfox23/commerce_fixPurchasesFilter
Fix the text filter in My Purchases
2018-01-24 08:42:55 -08:00
Olivier Prat
c92a9975ba Merged with master 2018-01-24 09:53:38 +01:00
Seth Alves
64a55f1393 fix asan build 2018-01-23 20:36:11 -08:00
Nissim Hadar
f9e0c724ce Added '?raw=true' suffices where needed. 2018-01-23 18:09:45 -08:00
Nissim Hadar
6bb325f6a2 Implemented new recursive functionality. 2018-01-23 17:25:02 -08:00
Anthony J. Thibault
991ba7f195 Bug fix for twisted knees on some avatars.
The FBXReader inverse bind pose calculation can sometimes introduce floating point fuzz into
the bottom row of the matrix.  The Transform class checks this bottom row before doing decomposition
into translation, rotation and scale.  If it detects that this row is not exactly (0, 0, 0, 1) it aborts.
And returns identity.  To guarantee that it preforms the decomposition correctly slam the row to (0, 0, 0, 1),
before conversion to a Transform instance.
2018-01-23 16:05:43 -08:00
Brad Davis
4d6538edf7 Merge branch 'android_new' into android 2018-01-23 14:46:23 -08:00
Sam Gateau
7fe4f8480a
Merge pull request #12172 from highfidelity/android
Android updates
2018-01-23 14:41:35 -08:00
Zach Fox
1920bedaf3 Fix the text filter in My Purchases 2018-01-23 13:42:38 -08:00
Brad Davis
fb559f3e4a Use custom default location for android and GLES/Windows 2018-01-23 13:30:36 -08:00
Brad Davis
8cb0d0f8fd Don't use the KTX cache for local files 2018-01-23 13:30:07 -08:00
Brad Davis
d0be19ab41 Add prototype KTX manipulation tool 2018-01-23 12:27:29 -08:00
Brad Davis
4eb77b1970 Disable procedural surfaces on GLES 2018-01-23 12:25:43 -08:00
Brad Davis
5049bac6ff Add helper function for QFileSelector 2018-01-23 12:25:22 -08:00
Brad Davis
3ad6084b37 Fixing mannequin GLES KTX files 2018-01-23 12:24:53 -08:00
Zach Fox
86ce9766f3 Fix security image index clear after back nav 2018-01-23 10:11:23 -08:00
Brad Davis
5bf2bda96d Merge branch 'android' into android_new 2018-01-23 08:17:46 -08:00
Olivier Prat
8985514a31 Merge branch 'master' of http://github.com/highfidelity/hifi into locallights 2018-01-23 09:51:17 +01:00
Anthony Thibault
a1009f3332
Merge pull request #12231 from hyperlogic/bug-fix/scripted-avatar-overflow
Fix for assignment-client scripted-agent crashes
2018-01-22 17:47:34 -08:00
Brad Davis
288e753eea Fix font loading from non-QRC html 2018-01-22 16:48:00 -08:00
luiscuenca
6d6950deca Fix Interface first launch should show help 2018-01-22 16:25:58 -07:00