samcake
fd501cf3af
Addressing review comments
2018-02-01 10:37:54 -08:00
Sam Gateau
351f619555
Fixing a shader error on android
2018-01-31 23:35:16 -08:00
Sam Gateau
60238fa644
Fixing the android build
2018-01-31 23:15:19 -08:00
Sam Gateau
d4a3932549
Merge branch 'master' of https://github.com/highfidelity/hifi into pastel
2018-01-31 21:53:09 -08:00
Sam Gateau
edb416d24e
Fixing the program map sorting, good to go
2018-01-31 21:32:22 -08:00
samcake
89f4fe1c04
Adding the map of existing shaders and programs and ways to identify them to avoid recompiling them
2018-01-31 17:28:45 -08:00
John Conklin II
453d0038d6
Merge pull request #12297 from hyperlogic/bug-fix/hair-freakout
...
Fix avatars with extra joints during mirrored animations
2018-01-31 15:33:34 -08:00
John Conklin II
fd92ef226a
Merge pull request #12274 from samcake/flash
...
FIxing the dark ambient lighting on scattering surface
2018-01-31 15:32:29 -08:00
samcake
0885b00ab8
Merge branch 'master' of https://github.com/highfidelity/hifi into pastel
2018-01-31 14:18:38 -08:00
Brad Hefta-Gaub
f5614618b9
Merge pull request #12288 from ctrlaltdavid/21729
...
Add location.domainID as a synonym for location.domainId
2018-01-31 13:50:48 -08:00
Bradley Austin Davis
f40d83381d
Merge pull request #12300 from jherico/fix/amd_crash
...
Trying to fix AMD crash in QML rendering
2018-01-31 13:24:50 -08:00
samcake
582ef2a8a2
MErging with master
2018-01-31 11:00:23 -08:00
Bradley Austin Davis
b97c938544
Merge pull request #12216 from thoys/feat/js-script-console-auto-complete
...
JS scripting console auto-complete
2018-01-31 10:39:51 -08:00
Brad Davis
ef699c2a78
Better fix for AMD crashing (hopefully
2018-01-31 10:38:20 -08:00
Sam Gateau
9a131cfab6
Merge pull request #12265 from SamGondelman/resourceCache
...
Remove unnecessary invokeMethod from ResourceCache::getResource
2018-01-31 09:35:05 -08:00
John Conklin II
ece72501b9
Merge pull request #12279 from druiz17/fix-parenting-crash
...
fix entity parenting crash
2018-01-31 09:32:52 -08:00
Brad Davis
9893273d33
Trying to fix AMD crash in QML rendering
2018-01-31 08:36:52 -08:00
samcake
062bfbd7b6
Merging with master
2018-01-30 18:33:34 -08:00
samcake
f044cf76d6
add the count of compilations of shaders to avoid recompiling them if ot needed
2018-01-30 18:31:30 -08:00
samcake
63371ff59c
Fix the android build
2018-01-30 17:17:22 -08:00
Anthony J. Thibault
ed67a5b408
Fix avatars with extra joints during mirrored animations
...
When the avatar is rotated it will play a mirrored and non mirrored versions of the rotation animation.
The mirrored version would also mirror extra joints on the model, yielding unexpected results.
This refines the logic that determines which joints are NOT mirrored, so that extra joints
remain unaffected by the mirrored animation playback.
2018-01-30 16:51:39 -08:00
Atlante45
bc819c698e
Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back
2018-01-30 16:09:30 -08:00
John Conklin II
215d03c4ce
Merge pull request #12269 from sethalves/backtrace-for-rc-63
...
Backtrace for rc 63
2018-01-30 15:13:01 -08:00
samcake
f078ff611a
Refining the declaraion signatures and adding the binary capture
2018-01-30 15:10:52 -08:00
John Conklin II
eebbb7e563
Merge pull request #12276 from jherico/RC63_haze_hotfix
...
RC63 Hotfix: Fix haze parameters uniform buffer size
2018-01-30 15:04:07 -08:00
samcake
d5e52834ef
cherry picking Tony's fix for shader compilation time not taking soo long and adding better feedback from shader compilation
2018-01-30 13:07:20 -08:00
samcake
2dcedf9f39
cherry picking Tony's fix for shader compilation time not taking soo long and adding better feedback from shader compilation
2018-01-30 12:52:05 -08:00
Atlante45
db08f1dda6
Move backtrace to interface
2018-01-30 11:39:48 -08:00
Anthony Thibault
b3798553ed
Merge pull request #12287 from Atlante45/fix/mac-builds
...
Fix Mac dev builds
2018-01-30 10:50:54 -08:00
Seth Alves
c146a231fa
Merge pull request #12284 from ctrlaltdavid/21717
...
FBX reader fixes
2018-01-30 10:49:02 -08:00
Anthony Thibault
1e8a5485c1
8x shader compilation optimization and watchdog disable
...
addPlumberPipeline in RenderPipelines.cpp would recompile
a single program 7 more times then necessary. This was
causing startup times on Mac OS X to trigger the deadlock
watchdog.
Even with this fix, compiling shaders is still too slow,
As a workaround, we disable the watchdog thread during
rendering pipeline setup.
2018-01-30 10:27:06 -08:00
Dante Ruiz
4c0a173287
trying another solution
2018-01-30 10:23:19 -08:00
Dante Ruiz
bed2ea052d
better solution
2018-01-30 09:44:49 -08:00
Seth Alves
7d1eb5fef8
Merge branch 'RC63' of github.com:highfidelity/hifi into backtrace-for-rc-63
2018-01-30 09:13:02 -08:00
Dante Ruiz
eef2f656be
Merge branch 'master' of github.com:highfidelity/hifi into fix-parenting-crash
2018-01-30 08:43:35 -08:00
David Rowe
280264d7ed
Add location.domainID as a synonym for location.domainId
...
And deprecate location.domainId.
2018-01-30 20:46:27 +13:00
Atlante45
cb6bebd824
Fix Mac dev builds
2018-01-29 19:47:36 -08:00
David Rowe
cadd4e61ad
Fix indent
2018-01-30 14:36:53 +13:00
David Rowe
09b92b93aa
Handle geometric offsets in FBX mesh extents calculations
2018-01-30 14:36:34 +13:00
MiladNazeri
3585bead96
Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes
...
Leopoly_Phase1_004_RayPick-Changes
2018-01-29 14:02:38 -08:00
John Conklin II
e01bbcf10b
Merge pull request #12264 from sethalves/warn-for-head-position-nan
...
print warnings if head position contains not-a-number
2018-01-29 12:25:23 -08:00
Atlante45
061f9ea359
Don't run settings preroutine when not initialized
2018-01-29 12:09:16 -08:00
MiladNazeri
9baf02b7a1
Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request
...
Leopoly_Phase1_003_Asset-Request
2018-01-29 11:40:41 -08:00
John Conklin II
92b9290294
Merge pull request #12267 from hyperlogic/bug-fix/rc63-neck-cauterization
...
RC63: Bug fix for avatar neck cauterization
2018-01-29 10:52:10 -08:00
Dante Ruiz
68fd9eafa8
fix entity parenting crash
2018-01-29 10:23:24 -08:00
David Rowe
d334f1c35c
Don't append trailing FBX root nodes to the tail of the tree
2018-01-29 13:45:39 +13:00
Brad Davis
206927d72a
Fix haze parameters uniform buffer size
2018-01-27 12:05:29 -08:00
Brad Davis
08df262474
Fix haze parameters uniform buffer size
2018-01-27 11:42:17 -08:00
Sam Gateau
221475d7d9
FIxing the dark ambient lighting on scattering surface
2018-01-27 10:37:32 -08:00
Sam Gateau
3d9985fa67
FIx the scattering ambient lighting diffuse which was too dark (got divided by PI) comparedd to non scattering
2018-01-27 08:48:19 -08:00
