Nissim Hadar
|
d69297c02e
|
Replace evalGlobalLightingAlphaBlended with evalGlobalLightingAlphaBlendedWithHaze in all shaders.
|
2017-12-16 00:22:26 -08:00 |
|
Nissim Hadar
|
8bf517b2f8
|
Merge branch 'master' into hazeOnTransparent
|
2017-12-15 13:45:31 -08:00 |
|
Bradley Austin Davis
|
a3ef4ce976
|
Merge pull request #11946 from ElderOrb/FB8992_2
8992 Login window is small in tablet
|
2017-12-15 09:10:49 -08:00 |
|
Nissim Hadar
|
82b94eaacd
|
Reduced size of parameters in (shader) function call.
|
2017-12-14 18:50:41 -08:00 |
|
Nissim Hadar
|
76af59e331
|
Merge branch 'master' into hazeOnTransparent
|
2017-12-14 16:31:13 -08:00 |
|
Nissim Hadar
|
c352d5fc23
|
Passed light direction instead of light object into computeHazeColorKeyLightAttenuation.
|
2017-12-14 16:23:14 -08:00 |
|
Nissim Hadar
|
026b19d770
|
Set 4th position component from 0.0 to 1.0
|
2017-12-14 16:17:50 -08:00 |
|
Nissim Hadar
|
05e47ae668
|
Removed unneeded 'mix'.
Defined EPSILON.
|
2017-12-14 16:14:08 -08:00 |
|
Nissim Hadar
|
d5d4c22a3d
|
Removed dual calls to getViewInverse().
|
2017-12-14 15:55:31 -08:00 |
|
Alexander Ivash
|
32acc8ad47
|
8992 Login window is small in tablet
|
2017-12-14 23:53:33 +00:00 |
|
Nissim Hadar
|
00a2013b60
|
Added missing space before {
|
2017-12-14 15:38:07 -08:00 |
|
Zach Fox
|
94bd8d8673
|
Merge pull request #11991 from zfox23/commerce_fixBrokenBuyButtons
Fix broken Buy buttons on main Marketplace page
|
2017-12-14 12:48:09 -08:00 |
|
Nissim Hadar
|
7b35d99a63
|
Merge branch 'RC-61' of https://github.com/highfidelity/hifi into hazeOnTransparent
|
2017-12-14 12:10:20 -08:00 |
|
Zach Fox
|
74a5f0881f
|
Fix broken Buy buttons on Marketplace
|
2017-12-14 11:56:36 -08:00 |
|
NissimHadar
|
df34103895
|
Merge pull request #11980 from NissimHadar/crashFix10537
Protect against use of null HazePointer.
|
2017-12-14 11:45:49 -08:00 |
|
Nissim Hadar
|
409eade006
|
Merge branch 'master' into hazeOnTransparent
|
2017-12-14 11:41:53 -08:00 |
|
Stephen Birarda
|
fa75320acf
|
Merge pull request #11984 from birarda/bug/macdeployqt-for-oven
fix rpath for oven on OS X
|
2017-12-14 10:26:13 -08:00 |
|
Ryan Downe Karpf
|
68177c7e71
|
Merge pull request #11981 from sethalves/pr-11960-for-rc-61
Pr 11960 for rc 61
|
2017-12-14 09:11:34 -08:00 |
|
Stephen Birarda
|
88831ff08a
|
don't trigger unix step on apple for oven
|
2017-12-13 18:39:19 -08:00 |
|
Stephen Birarda
|
0b598ea948
|
fix RPATH for oven so it loads things from macdeployqt
|
2017-12-13 18:39:19 -08:00 |
|
Stephen Birarda
|
1c83d7a1ef
|
Merge pull request #11983 from birarda/bug/macdeployqt-for-oven
fix rpath for oven so it can load things placed by macdeployqt
|
2017-12-13 18:36:16 -08:00 |
|
Stephen Birarda
|
1f57ac6081
|
don't trigger unix step on apple for oven
|
2017-12-13 18:08:39 -08:00 |
|
Zach Fox
|
ed5082e5d4
|
Merge pull request #11974 from birarda/feat/staging-env-or-cl
allow custom metaverse URL to be used with env var
|
2017-12-13 17:29:45 -08:00 |
|
Stephen Birarda
|
553e4e2449
|
fix RPATH for oven so it loads things from macdeployqt
|
2017-12-13 17:26:23 -08:00 |
|
Seth Alves
|
aa0d581236
|
Merge branch 'FB10334' of https://github.com/elderorb/hifi into pr-11960-for-rc-61
|
2017-12-13 15:29:27 -08:00 |
|
Nissim Hadar
|
79f0124244
|
Protect against use of null HazePointer.
|
2017-12-13 15:02:03 -08:00 |
|
Zach Fox
|
f0507e1608
|
Merge pull request #11972 from zfox23/commerce_fixWalletStatus1
Set Wallet Status to 'Ready' after correctly authenticating wallet
|
2017-12-13 13:19:54 -08:00 |
|
Nissim Hadar
|
b4df115507
|
Protect against use of null HazePointer.
|
2017-12-13 12:53:01 -08:00 |
|
Zach Fox
|
efd5c0ccb7
|
Add comment as per CR
|
2017-12-13 11:53:26 -08:00 |
|
Sam Gateau
|
a75010fb94
|
Merge pull request #11938 from Zvork/csm
Cascaded Shadow Maps and bug fix
|
2017-12-14 00:32:43 +07:00 |
|
Sam Gateau
|
4e68663cfc
|
Merge pull request #11970 from SamGondelman/circleFix
Fix Circle3DOverlays uninitialized member variables, cloning, getProperty
|
2017-12-14 00:30:18 +07:00 |
|
Seth Alves
|
d3e24d3629
|
Merge pull request #11960 from ElderOrb/FB10334
10334 Unable to type in Go To app search bar after UI reappears from …
|
2017-12-13 09:06:53 -08:00 |
|
Brad Hefta-Gaub
|
9bbe696a87
|
Merge pull request #11971 from sethalves/possible-fix-for-tablet-freezing
possible fix for tablet freezing
|
2017-12-13 08:59:17 -08:00 |
|
Ryan Downe Karpf
|
d0f088164b
|
Merge pull request #11975 from luiscuenca/webPrivacyFixRC61
Fix web entities accessing the webcam RC-61
|
2017-12-13 08:44:50 -08:00 |
|
Olivier Prat
|
19e240460d
|
Slightly optimized matrix operations in LightStage as samcake's remark
|
2017-12-13 15:30:57 +01:00 |
|
luiscuenca
|
a1f1e7b587
|
Fix web entities accessing the webcam RC61
|
2017-12-12 18:20:29 -07:00 |
|
MiladNazeri
|
8a28d04322
|
Merge pull request #11885 from ctrlaltdavid/21624
Overlays JSDoc
|
2017-12-12 17:04:46 -08:00 |
|
Seth Alves
|
4956978c76
|
Merge pull request #11973 from luiscuenca/webPrivacyFix
Fix web entities accessing the webcam
|
2017-12-12 17:01:38 -08:00 |
|
Stephen Birarda
|
7a81c3e8e7
|
allow passing of custom URL on env
|
2017-12-12 16:32:43 -08:00 |
|
Stephen Birarda
|
139976d8bb
|
allow staging METAVERSE_SERVER_URL to be toggled by env
|
2017-12-12 16:22:08 -08:00 |
|
Ken Cooke
|
55ad42c40b
|
Merge pull request #11967 from ctrlaltdavid/21638
Reduce communications load of making user connection
|
2017-12-12 16:03:28 -08:00 |
|
luiscuenca
|
2d21f4d364
|
Fix web entities accessing the webcam
|
2017-12-12 16:00:17 -07:00 |
|
Sam Gondelman
|
e5a4f077c9
|
Merge pull request #11964 from SamGondelman/memFix
Remove unneeded getDedicatedMemory
|
2017-12-12 14:43:15 -08:00 |
|
David Rowe
|
92be33da31
|
Web3d overlay's "resolution" property has been removed
|
2017-12-13 11:40:44 +13:00 |
|
David Rowe
|
650e7e1922
|
Document that getProperty() only works for 3D overlays
|
2017-12-13 10:34:33 +13:00 |
|
SamGondelman
|
16f545a9e8
|
fix circle3d overlays
|
2017-12-12 13:25:47 -08:00 |
|
Zach Fox
|
623e6395be
|
Set Wallet Status to 'Ready' after correctly authenticating wallet
|
2017-12-12 13:01:14 -08:00 |
|
Seth Alves
|
3a00d31c15
|
oops
|
2017-12-12 12:59:35 -08:00 |
|
David Rowe
|
578c42b4ea
|
Merge branch 'master' into 21624
|
2017-12-13 09:41:09 +13:00 |
|
Seth Alves
|
dba05ae8e2
|
try harder to keep setTimeout loop going in controller-dispatcher
|
2017-12-12 12:38:01 -08:00 |
|