Commit graph

61527 commits

Author SHA1 Message Date
Andrew Meadows
f47185b2f6 remove tabs from indentation 2017-11-14 15:57:17 -08:00
Andrew Meadows
c6bccb3de3 avoid adding null renderables to list 2017-11-14 15:57:17 -08:00
Andrew Meadows
809ff7928e sort and throttle UpdateRenderables 2017-11-14 15:57:17 -08:00
Andrew Meadows
5050a554a2 remove warning about signed/unsigned comparison 2017-11-14 15:57:17 -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
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
Thijs Wenker
788514adb0
Merge pull request #11806 from highfidelity/misslivirose-patch-1
Update .eslintrc.js
2017-11-14 01:21:27 +00:00
Liv
94b925d9d5
Update .eslintrc.js 2017-11-13 15:53:33 -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
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
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
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
Anthony Thibault
08c12a1ced
Merge pull request #11704 from AndrewMeadows/shape-manager-key
cleanup ShapeInfo hash generation
2017-11-10 11:31:46 -08:00
Melissa Brown
f7eb57a54c
Merge pull request #11653 from vladest/fix_sriptslog_multiply_window
Fix scriptslog multiply window
2017-11-10 11:11:46 -08:00
Anthony J. Thibault
ba4c0f189e code review feedback
removed discontinuity in safeDeltaTime, which is used to prevent division by zero.
2017-11-10 10:25:29 -08:00
beholder
5fcde1186a hide keyboard before showing to solve clearing 'mirrorText' on jumping between input fields without hiding keyboard 2017-11-10 21:20:00 +03:00
beholder
d1969d649a fix not collapsing keyboard 2017-11-10 21:20:00 +03:00
beholder
0bc95998c4 a few more adjustments based on discussion with Mukul 2017-11-10 21:20:00 +03:00
beholder
4d11f9a434 increase font pixel size for 'collapse keyboard' to 34px 2017-11-10 21:20:00 +03:00
beholder
db3ed81513 adjust to changed requirements:
1. The keyboard collapse button is moved to the lower right, replacing the keys there
2. The button next to m is a hyphen instead of a underscore, it turns to a underscore when the user clicks on shift
3. The input text at the top occupies the full width and is center aligned, when you start typing the text moves in both directions the left and the right
2017-11-10 21:20:00 +03:00
beholder
eb4214fb4c add API for unfocusing input fields in HTML, unfocus WebEngine-based QML items on lowering keyboard 2017-11-10 21:20:00 +03:00
beholder
fb14e4dc4d Fixed programmatical lowering of 'TabletAddressDialog' 2017-11-10 21:20:00 +03:00
beholder
a9fe3596cf 4684 Add collapse button on the virtual keyboard 2017-11-10 21:20:00 +03:00
Anthony J. Thibault
4169e11e77 Merge branch 'master' into bug-fix/div-by-zero 2017-11-10 10:15:26 -08:00
luiscuenca
055fe16677 Allow script to change to mirror camera in HMD 2017-11-09 18:27:16 -07:00
Sam Gondelman
9010a02bee
Merge pull request #11790 from SamGondelman/overlayFlash
Fix laser end not disappearing
2017-11-09 17:10:07 -08:00
Anthony Thibault
38cc56db7f
Merge pull request #11785 from luiscuenca/case6944
6944 Avatar scale is preserved across domains
2017-11-09 16:38:45 -08:00
SamGondelman
9188ae9fb5 fix laser end not disappearing 2017-11-09 16:26:37 -08:00
luiscuenca
355b465109 make leaveDomain slot private 2017-11-09 16:05:53 -07:00
Anthony Thibault
de9eeff7d2
Merge pull request #11783 from hyperlogic/bug-fix/rig-skeleton-dangling-pointer
Fix for address sanitizer warning
2017-11-09 14:19:03 -08:00
David Kelly
31dc140ea6
Merge pull request #11771 from zfox23/commerce_seedingFrontend
Commerce: Seeding Frontend
2017-11-09 14:45:10 -07:00
Ken Cooke
c324f342b4 Fix to check ANDROID before UNIX 2017-11-09 13:39:13 -08:00
Sam Gondelman
d1e41e6bf0
Merge pull request #11786 from SamGondelman/overlayFlash
Fix overlay flash on visibility and position change
2017-11-09 13:36:49 -08:00