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
Zach Fox
776fa9a76f
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_inspectionCertRedesign
2018-01-30 14:31:59 -08:00
Zach Fox
d13d0e6ba2
Minor fixes
2018-01-30 14:30:50 -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
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
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
Dante Ruiz
08511a2a2e
fix new model path
2018-01-29 15:27:55 -08:00
Zach Fox
b60a45d358
Inspection Certificate Redesign
2018-01-29 15:14:29 -08: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
Dante Ruiz
264aa7f4d2
Merge pull request #12191 from druiz17/entity-attachment-bookmark
...
Bookmark avatar entities
2018-01-29 12:55:35 -08:00
Liv Erickson
634bc83ed5
fix elses
2018-01-29 12:54:52 -08:00
John Conklin II
1220ad6b50
Merge pull request #12281 from zfox23/400ConnectionsPerPage
...
400 connections per page for Wallet and PAL
2018-01-29 12:49:05 -08:00
Liv Erickson
f8f76d6757
changing back to avatar only and making some changes to avoid multiple calls to dependency manager
2018-01-29 12:46:00 -08:00
Seth Alves
98e0e663e7
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-29 12:36:37 -08:00
Seth Alves
8d57979db5
Merge pull request #15 from samcake/seth-branch
...
Seth branch
2018-01-29 12:35:42 -08:00
Seth Alves
ae4aa41da4
Merge pull request #14 from Atlante45/interface-backtrace
...
Don't run settings preroutine when not initialized
2018-01-29 12:34:21 -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
samcake
1fd4c5c1a4
Integrating the tag flags to the render item key and adding configration of the render pipelien with the Tag information
2018-01-29 12:20:51 -08:00
Atlante45
061f9ea359
Don't run settings preroutine when not initialized
2018-01-29 12:09:16 -08:00
Zach Fox
00555250a0
400 connections per page for Wallet and PAL
2018-01-29 12:07:07 -08:00
