Brad Davis
|
bb2e061d77
|
Fixing global declarations in JS
|
2017-11-15 12:00:52 -08:00 |
|
Brad Davis
|
26a745be6f
|
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
|
2017-11-15 11:59:06 -08:00 |
|
Brad Davis
|
1167be4102
|
Reverting tablet API rename, cleaning up duplicated code
|
2017-11-15 11:52:55 -08:00 |
|
Brad Davis
|
64592d66d7
|
Fix relative path for tablet login dialog
|
2017-11-15 11:46:56 -08:00 |
|
Dante Ruiz
|
d83f3152dd
|
Merge pull request #11809 from ElderOrb/FB8984
8984 Opening tablet with "Enter" key displays the audio menu
|
2017-11-15 11:16:49 -08:00 |
|
Sam Gateau
|
2c51e516eb
|
Merge pull request #11744 from Zvork/shadow
Shadow caster culling fix
|
2017-11-15 09:49:39 -08:00 |
|
John Conklin II
|
8592f3fd4d
|
Merge pull request #11764 from luiscuenca/case7587
7587 Lasers resize with avatar
|
2017-11-15 09:31:45 -08:00 |
|
Zach Fox
|
8f855c6c95
|
Update QUrls
|
2017-11-15 09:21:10 -08:00 |
|
Olivier Prat
|
14275b1cf3
|
Added asserts in LightStage to catch shadow disappearance when domain is automatically reloaded
|
2017-11-15 15:42:04 +01:00 |
|
Olivier Prat
|
f47a3e7d2c
|
Moved draw frustum job to render DrawTask and made generic. A couple of fixes as requested by @samcake
|
2017-11-15 09:42:57 +01:00 |
|
Olivier Prat
|
bf46ccefaf
|
Merge branch 'master' of git://github.com/highfidelity/hifi into shadow
|
2017-11-15 08:59:36 +01:00 |
|
Howard Stearns
|
1c293c4c48
|
Merge pull request #11813 from zfox23/commerce_removeEditJSDependency
Remove Marketplace's dependency on Edit.js for REZ/WEAR
|
2017-11-14 16:33:35 -08:00 |
|
Zach Fox
|
d6c244d1d5
|
Remove incorrect logic
|
2017-11-14 14:54:03 -08:00 |
|
Zach Fox
|
f5994375cf
|
Remove Marketplace's dependency on Edit.js for rez
|
2017-11-14 14:29:49 -08:00 |
|
Zach Fox
|
c42003a374
|
Merge pull request #11794 from ElderOrb/FB4684_3
4684 Add collapse button on the virtual keyboard
|
2017-11-14 12:22:42 -08:00 |
|
Alexander Ivash
|
e201e203b8
|
8984 Opening tablet with "Enter" key displays the audio menu
|
2017-11-14 22:18:48 +03:00 |
|
David Back
|
4b8021bc4a
|
Merge pull request #11802 from dback2/mirrorfanciness2
prevent rendering HUD elements in secondary camera
|
2017-11-14 10:49:18 -08:00 |
|
Zach Fox
|
23ff842bc6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
|
2017-11-14 10:07:59 -08:00 |
|
Zach Fox
|
5290ee3b4e
|
Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist
|
2017-11-14 10:07:44 -08:00 |
|
luiscuenca
|
489e244342
|
More accurate scale from SensorToWorldScale
|
2017-11-14 09:56:23 -07:00 |
|
Thijs Wenker
|
788514adb0
|
Merge pull request #11806 from highfidelity/misslivirose-patch-1
Update .eslintrc.js
|
2017-11-14 01:21:27 +00:00 |
|
Brad Davis
|
d71fd151c5
|
Fixing button model exposure
|
2017-11-13 16:45:27 -08:00 |
|
Liv
|
94b925d9d5
|
Update .eslintrc.js
|
2017-11-13 15:53:33 -08:00 |
|
Zach Fox
|
a3332e15b7
|
Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist
|
2017-11-13 15:01:26 -08:00 |
|
Brad Davis
|
69029b49f3
|
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
|
2017-11-13 14:29:49 -08:00 |
|
Brad Davis
|
8f85c7650b
|
Make sure loaded components get the right parent context
|
2017-11-13 14:16:04 -08:00 |
|
Zach Fox
|
0b6cc6ba2e
|
Merge pull request #11803 from zfox23/commerce_fixCertDisappearing
Fix bug with disappearing certificate info
|
2017-11-13 12:13:45 -08:00 |
|
Stephen Birarda
|
21e49d1504
|
Merge pull request #11798 from Atlante45/feat/wizard-tweaks
Wizard tweaks
|
2017-11-13 12:07:22 -08:00 |
|
Zach Fox
|
641c4656c4
|
Fix bug with disappearing certificate info
|
2017-11-13 10:53:16 -08:00 |
|
Brad Davis
|
5cf9c1bb33
|
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
|
2017-11-13 10:48:21 -08:00 |
|
Seth Alves
|
9df11fb11a
|
Merge pull request #11787 from elisa-lj11/musvis
Second fix to null file path return (specific to music visualizer)
|
2017-11-13 09:44:47 -08:00 |
|
Sam Gateau
|
4b14a7a820
|
Merge pull request #11799 from NissimHadar/hazeUIFix
Removed Keylight attenuation from .js (as well as .html).
|
2017-11-13 09:18:29 -08:00 |
|
Ryan Downe Karpf
|
3ea6ecf104
|
Merge pull request #11747 from luiscuenca/case8495
8495 No mirror camera in HMD mode
|
2017-11-13 09:09:34 -08:00 |
|
Olivier Prat
|
dd6b7b04c2
|
Merged with master
|
2017-11-13 14:33:59 +01:00 |
|
luiscuenca
|
d75c176fef
|
clean up unused lastmode
|
2017-11-13 06:10:17 -07:00 |
|
Ryan Downe Karpf
|
9ff4541ee3
|
Merge pull request #11782 from hyperlogic/remove-vs2010-inttypes-hack
Remove hack for missing inttypes.h header on VS2010
|
2017-11-12 10:59:19 -08:00 |
|
Ryan Downe Karpf
|
f8b1c7978c
|
Merge pull request #11772 from 1P-Cusack/FogBugz/Case_6569
[Case 6569]: Silent failure is possible during Model Creation
|
2017-11-12 08:36:10 -08:00 |
|
Nissim Hadar
|
f629357ded
|
Removed Keylight attenuation from .js (as well as .html).
|
2017-11-11 18:58:12 -08:00 |
|
Ken Cooke
|
89dbbb44ed
|
Merge pull request #11780 from kencooke/audio-codec-update
Audio codec update for all platforms (includes Android)
|
2017-11-11 11:33:33 -08:00 |
|
Atlante45
|
8f133fc7fa
|
Congratulation page styling fixes
|
2017-11-10 18:12:43 -08:00 |
|
Atlante45
|
067436a743
|
CR
|
2017-11-10 18:12:33 -08:00 |
|
David Back
|
163de649bf
|
prevent rendering HUD elements in secondary camera
|
2017-11-10 17:44:09 -08:00 |
|
Atlante45
|
9cd8f372f2
|
Fix race condition
|
2017-11-10 16:21:06 -08:00 |
|
Atlante45
|
796909d366
|
Permissions page tweaks
|
2017-11-10 16:19:49 -08:00 |
|
Atlante45
|
2782ae03c5
|
Add back buttons
|
2017-11-10 15:48:44 -08:00 |
|
Atlante45
|
c047a1d0a4
|
Rework perms wizard page
|
2017-11-10 15:48:44 -08:00 |
|
Sam Gateau
|
ecf67cc331
|
Merge pull request #11650 from Zvork/outline
Multiple Outline Groups
|
2017-11-10 15:45:03 -08:00 |
|
Brad Davis
|
7bf1b176d7
|
Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem
|
2017-11-10 14:21:24 -08:00 |
|
Andrew Meadows
|
469b68011c
|
Merge pull request #11566 from hyperlogic/bug-fix/div-by-zero
div by zero fixes, detected by address sanitizer
|
2017-11-10 13:47:40 -08:00 |
|
Sam Gateau
|
f857b37d2e
|
Merge pull request #11758 from NissimHadar/hazeUIFix
Improved Haze UI in Create menu
|
2017-11-10 11:58:06 -08:00 |
|