Bradley Austin Davis
6c0ca1b7b8
Use version IDs in scribe tool downloads
2018-02-07 08:31:26 -08:00
Brad Hefta-Gaub
0b6dea3d10
Merge pull request #12350 from ctrlaltdavid/21743
...
Fix the spectator camera
2018-02-06 19:55:02 -08:00
Brad Hefta-Gaub
2bb119037a
Merge pull request #12351 from samcake/RC63.2
...
Restore FPS threshold for increasing LOD after it decreased in heavy scenes
2018-02-06 19:54:40 -08:00
samcake
72749e139a
changing the Increase LOD gap to 10 to start upping earlier
2018-02-06 16:00:49 -08:00
samcake
3ed633ebea
FIxing the get***LODIncreaseFPS functions evaluation of the threshold FPS for starting increasing LOD again
2018-02-06 15:52:32 -08:00
David Rowe
665bd6825f
Fix the spectator camera
2018-02-07 12:27:56 +13:00
John Conklin II
d37e9af7d4
Merge pull request #12307 from jherico/hotfix/amd_crash
...
Fix for AMD crashes in QML rendering
2018-01-31 16:30:53 -08:00
Brad Davis
e5559fa865
Better fix for AMD crashing (hopefully
2018-01-31 12:10: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
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
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
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
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
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
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
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
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
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
Dante Ruiz
08511a2a2e
fix new model path
2018-01-29 15:27:55 -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
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
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
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
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
Brad Davis
206927d72a
Fix haze parameters uniform buffer size
2018-01-27 12:05:29 -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
Seth Alves
c2b1c4250c
Merge pull request #13 from Atlante45/backtrace-for-rc-63
...
Fix settings init in all exe
2018-01-26 15:57:35 -08:00
Atlante45
314c51ab3b
Fix settings init in all exe
2018-01-26 15:53:08 -08:00
John Conklin II
00773b4b12
Merge pull request #12270 from sethalves/warn-for-head-position-nan-for-rc-63
...
Warn for head position nan for rc 63
2018-01-26 14:16:30 -08:00
Anthony J. Thibault
3be857567b
updated Skinning.slh comment and constant.
...
(cherry picked from commit 43eaa02ef0
2018-01-26 14:02:18 -08:00
Seth Alves
78a5f535c1
Merge branch 'RC63' of github.com:highfidelity/hifi into backtrace-for-rc-63
2018-01-26 12:09:38 -08:00
Seth Alves
d73538f233
oops
2018-01-26 12:08:19 -08:00
Seth Alves
1237749628
oops
2018-01-26 12:05:26 -08:00
Seth Alves
b7303414f2
unmangle merges
2018-01-26 11:57:30 -08:00
Seth Alves
19409cc6ce
fix merge/cherry-pick error
2018-01-26 10:45:18 -08:00
Seth Alves
503175cd28
Merge branch 'RC63' of github.com:highfidelity/hifi into warn-for-head-position-nan-for-rc-63
2018-01-26 10:34:51 -08:00
Seth Alves
b8f3d8140d
add breaks in case statements that used to have returns
2018-01-26 10:34:43 -08:00
Seth Alves
2962c8979c
print warnings if head position contains not-a-number
2018-01-26 09:49:21 -08:00
John Conklin II
dd628a4d95
Merge pull request #12268 from hyperlogic/bug-fix/rc63-twisted-knees
...
RC63: Bug fix for twisted knees on some avatars.
2018-01-26 09:42:24 -08:00
Seth Alves
cb5ca26600
quiet warnings
2018-01-26 09:23:34 -08:00
