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
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
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
Liv Erickson
6a971e1362
remove restriction to be avatar only
2018-01-29 11:27:30 -08:00
Dante Ruiz
a637bac2fe
remove debug statement
2018-01-29 11:26:28 -08:00
Dante Ruiz
a670a0b9a2
Merge branch 'master' of github.com:highfidelity/hifi into entity-attachment-bookmark
2018-01-29 11:25:26 -08:00
Liv Erickson
a10f7932bd
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/expose-identity-verification
2018-01-29 11:07:38 -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
samcake
04efaa0f92
Merge branch 'master' of https://github.com/highfidelity/hifi into seth-branch
2018-01-29 10:28:45 -08:00
Dante Ruiz
68fd9eafa8
fix entity parenting crash
2018-01-29 10:23:24 -08:00
Liv Erickson
0e3a01f1e8
it's working! removed my null pointer and just get it from the dependency manager when required
2018-01-29 10:20:16 -08:00
Andrew Meadows
c2817fc091
HMD low LOD threshold changed: 42 --> 34
2018-01-29 10:18:08 -08:00
Andrew Meadows
6acec39e92
HMD low LOD threshold changed: 45 --> 42
2018-01-29 10:05:23 -08:00
John Conklin II
97d9fe0ea7
Merge pull request #12273 from samcake/RC63-fix-lighting
...
RC63 hotfix: fixing lighting on scattering skin bug 11802
2018-01-29 09:26:11 -08:00
Sam Gateau
8e3097d94c
Merge pull request #12275 from jherico/fix/haze_uniform
...
Fix haze parameters uniform buffer size
2018-01-29 08:50:50 -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
