John Conklin II
2ae9395283
Merge pull request #12299 from highfidelity/stable
...
Merge stable back into master
2018-01-30 20:03:06 -08:00
John Conklin II
399c24bf06
Merge pull request #12298 from Atlante45/hotfix/crashpad-packaging
...
Beta Release 63.1 - hotfix
2018-01-30 18:40:16 -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
John Conklin II
db255719db
Merge pull request #12296 from Atlante45/merge-back
...
Merge stable back into master
2018-01-30 18:09:38 -08:00
Zach Fox
05fe33e417
Initial work
2018-01-30 18:01:46 -08:00
samcake
7aa5ef3de7
Merge branch 'pastel' of https://github.com/samcake/hifi into pastel
2018-01-30 17:18:10 -08:00
samcake
63371ff59c
Fix the android build
2018-01-30 17:17:22 -08:00
Atlante45
97729e8f41
Cleanup bad install
2018-01-30 17:10:06 -08:00
Atlante45
d155d19198
Fix cmake install cmd
2018-01-30 17:08:10 -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
Dante Ruiz
9c81909be5
restructures _dirtyFlags name and bits
2018-01-30 16:42:08 -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
408189763b
Merge pull request #12229 from highfidelity/RC63
...
Beta Release 63 - includes up to Developer Release 7741
2018-01-30 15:54:56 -08:00
Sam Gateau
9ea6c78ac2
fix stupid copy paste
2018-01-30 15:31:34 -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
David Back
3bbe821aba
Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab
2018-01-30 14:08:27 -08:00
Liv Erickson
d0a0120dfe
removing old game sample from script-archive
2018-01-30 13:34:38 -08:00
John Conklin II
0b03632437
Merge pull request #12289 from hyperlogic/bug-fix/mac-os-shader-compile-too-slow-rc63
...
RC63: 8x shader compilation optimization and watchdog disable
2018-01-30 13:26:49 -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
Seth Alves
bc014214fe
Merge pull request #17 from Atlante45/interface-backtrace
...
Fix spaces
2018-01-30 12:24:07 -08:00
Atlante45
019a2d346c
Fix spaces
2018-01-30 12:04:01 -08:00
Seth Alves
3a57324cef
Merge pull request #16 from Atlante45/interface-backtrace
...
Move crashpad out of shared
2018-01-30 11:55:12 -08:00
Atlante45
edfffc575a
Handle multiple targets for add_crashpad
2018-01-30 11:48:01 -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
Seth Alves
ead16004fc
Merge pull request #12285 from misslivirose/fix-recursive-delete
...
Fix deleting entities with children depth > 1
2018-01-30 10:48:10 -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
2a6ff80911
fix indentation
2018-01-30 09:13:47 -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 Back
e679b75e99
fix degree display position
2018-01-29 19:02:36 -08:00
David Back
3a8e17173e
Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab
2018-01-29 18:53:18 -08:00
David Back
2f0d92c3cd
ctrl 22.5 snapping
2018-01-29 18:15:01 -08:00
Liv Erickson
3aa12eb7df
pass in deletedIDs so can delete children depth > 1
2018-01-29 17:51:26 -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
David Back
9ee7153641
fix scale speed, fix stretch panels, fix scale cube highlight
2018-01-29 16:53:02 -08:00
Liv Erickson
8b7c989508
move emit signals to wallet interface
2018-01-29 16:34:44 -08:00
John Conklin II
dc3823374a
Merge pull request #12282 from druiz17/RC63
...
fix new model path(RC63)
2018-01-29 16:28:58 -08:00
John Conklin II
180d09f901
Merge pull request #12278 from AndrewMeadows/adjust-low-lod-threshold
...
RC63 Hotfix: HMD low LOD threshold changed: 45 --> 34
2018-01-29 16:09:56 -08:00
Liv Erickson
ce8159340b
fix vs autoformatting
2018-01-29 15:51:09 -08:00
