Seth Alves
a144b738e5
fix ACs
2018-03-16 22:39:43 -04:00
John Conklin II
0934a7d467
Merge pull request #12673 from huffman/fix/ie-edge-ds-settings-failure
...
Fix DS settings issues on IE and Edge
2018-03-16 17:35:56 -07:00
Sam Gondelman
b96f398274
Merge pull request #12593 from gcalero/android_joystick_rotate_move
...
Android joystick rotate move
2018-03-16 17:24:15 -07:00
SamGondelman
06c0b3afd3
disable IK on android, input recorder doesn't do anything if off
2018-03-16 16:52:12 -07:00
SamGondelman
444534f4ff
model behaves correctly if missing material
...
(cherry picked from commit 1e89debc4e
2018-03-16 15:51:37 -07:00
Ryan Huffman
fdca6e0832
Update direct _requestHeaders access to be consistent with other reads
2018-03-16 15:28:27 -07:00
John Conklin II
1bf2da5119
Merge pull request #12670 from SamGondelman/modelCrash
...
RC65 Hotfix: Model behaves correctly if missing material
2018-03-16 15:00:29 -07:00
Brad Davis
2f59283053
Fix initialization of QML overlay surfaces
2018-03-16 14:48:08 -07:00
Stephen Birarda
debea3791d
Fix DS content backups not loading on IE
...
IE does not support Object.assign
2018-03-16 14:30:03 -07:00
Ryan Huffman
3a98cf284f
Fix DS not handling lowercase header keys
2018-03-16 14:30:03 -07:00
Seth Alves
7a7a9e9af0
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-16 16:55:47 -04:00
Stephen Birarda
472e7c003f
Merge pull request #11860 from huffman/feat/obj-baker-update
...
OBJ Baking
2018-03-16 13:54:07 -07:00
SamGondelman
984a48316d
CR
2018-03-16 13:51:29 -07:00
SamGondelman
1e89debc4e
model behaves correctly if missing material
2018-03-16 13:38:45 -07:00
Zach Fox
a792bcc3d3
Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1
2018-03-16 13:24:17 -07:00
Zach Fox
eb8cfcd8e9
Bugfix
2018-03-16 13:13:38 -07:00
Cristian Luis Duarte
e29fc9b461
Android - Rotate View control increased sensitivity
2018-03-16 16:28:58 -03:00
Seth Alves
50b9716a17
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-16 14:45:49 -04:00
Zach Fox
ad33e775f1
Fix bottom anchor for listView when banner is showing
2018-03-16 11:28:03 -07:00
Cristian Luis Duarte
e6a8b322b1
Android bottom bar - remove extra semicolon
2018-03-16 15:15:00 -03:00
Brad Davis
1dfde86680
Fix typo
2018-03-16 11:11:08 -07:00
Cristian Luis Duarte
18682d854c
Android bottom bar - Put height up at the top of the Item definition it's clearer where relocateAndResize gets its height from
2018-03-16 15:06:12 -03:00
Brad Davis
ca38b9fe34
Fix invalid QML surface cache interaction
2018-03-16 10:53:59 -07:00
Seth Alves
98e9f1168a
allow href to be set to a serverless domain
2018-03-16 10:50:03 -07:00
John Conklin II
652ca98ebf
Merge pull request #12655 from hyperlogic/bug-fix/hand-ik-glitch
...
Fix for hand IK jitter
2018-03-16 10:43:16 -07:00
Brad Hefta-Gaub
634e642db3
Merge pull request #12634 from sethalves/overlay-visible-in-2nd-cam
...
Overlays visible in 2nd cam
2018-03-16 10:07:26 -07:00
Seth Alves
4f72503d2d
put default home back to sandbox
2018-03-16 09:39:42 -07:00
Seth Alves
e3022da787
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-16 09:34:38 -07:00
Dante Ruiz
8cf4e653df
making networktexture handled /~/
2018-03-16 09:04:35 -07:00
Cristian Luis Duarte
79ff2df860
Android - Resize bottombar after window size changes (to always fill the screen horizontally)
2018-03-16 13:03:50 -03:00
Cristian Luis Duarte
ee6c65c1ac
Android - Prevent crash when setting the url property to _webSurface.
2018-03-16 12:03:26 -03:00
John Conklin II
7789697243
Merge pull request #12658 from Atlante45/new-master
...
Stable merge back into master
2018-03-15 21:51:32 -07:00
Dante Ruiz
05134dc0b9
adding content to resources
2018-03-15 16:29:14 -07:00
Stephen Birarda
283eccd043
remove unneeded ANDROID block, revert removed line in NSIS
2018-03-15 16:21:49 -07:00
SamGondelman
0fa73c73ce
stats
2018-03-15 16:05:46 -07:00
Zach Fox
eb2f8aa169
New notification flow for item updates
2018-03-15 16:03:49 -07:00
Atlante45
d96f7553d9
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
2018-03-15 15:22:43 -07:00
Ryan Huffman
d140ccb790
Fix constexpr compile error on Windows
2018-03-15 14:52:15 -07:00
John Conklin II
0d343ee827
Merge pull request #12522 from highfidelity/RC65
...
Beta Release 65 - includes up to Developer Release 7911
2018-03-15 14:30:55 -07:00
Stephen Birarda
f8df90e36d
disable the sixense plugin by default
2018-03-15 13:53:10 -07:00
Cristian Luis Duarte
03cbadece5
Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move
2018-03-15 17:11:40 -03:00
Cristian Luis Duarte
f8f5655561
Android view control sensitivity increased. Constant replaced for a private value member.
2018-03-15 17:10:14 -03:00
Anthony J. Thibault
f6c4f6b9c4
Fix for arm IK jitter
...
When in HMD mode, holding your hand controller in front of your face, would often result in a 1-2 mm pop in wrist position.
This was due to a problem in the IK elbow constraint.
When the swing rotation out of the elbow's reference frame was close to but not exactly identity it would not be properly constrainted.
But when the magnitude of that swing became big enough the constraint would engage.
This small change in swing rotation was noticable as a 1-2 mm movement in the wrist.
2018-03-15 13:06:27 -07:00
Ryan Huffman
03c8c14f61
Fix content replacement being allowed from all URLs
2018-03-15 12:49:22 -07:00
Ryan Huffman
9275fe1f7d
Update backup downloads to use .content.zip extension
2018-03-15 12:47:51 -07:00
Atlante45
bbe98f61a6
Pull GUID storage in Registry for now.
2018-03-15 12:20:19 -07:00
Stephen Birarda
499defe77e
grab VS2013 redistributables that are needed by externals
2018-03-15 12:20:07 -07:00
Ryan Huffman
6552aeac4d
Fix quazip not building with correct build type
2018-03-15 12:17:35 -07:00
Ryan Huffman
bee8899c46
Add support for uploading .content.zip files
2018-03-15 12:17:21 -07:00
Seth Alves
a64f0d2779
if tablet wasn't visible when wallet passphrase screen hid it, don't show it when passphrase page is done.
2018-03-15 11:39:05 -07:00
