Zach Fox
0b810c3aa8
Various fixes
2018-03-19 14:39:50 -07:00
Zach Fox
18aa95e0bb
New Checkout flow for updating specific Editions
2018-03-19 13:35:27 -07:00
Zach Fox
daa68768b9
Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1
2018-03-19 12:18:10 -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
Stephen Birarda
472e7c003f
Merge pull request #11860 from huffman/feat/obj-baker-update
...
OBJ Baking
2018-03-16 13:54:07 -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
Zach Fox
ad33e775f1
Fix bottom anchor for listView when banner is showing
2018-03-16 11:28: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
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
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
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
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
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
Seth Alves
8a0b8aa034
make tablet invisible in secondary-camera if wallet passphrase page is up
2018-03-15 11:01:13 -07:00
Seth Alves
a5b94f22fa
works now
2018-03-15 10:31:55 -07:00
John Conklin II
a7dc2cd12e
Merge pull request #12645 from sethalves/rename-getpos3
...
Rename getpos3
2018-03-15 10:02:00 -07:00
Seth Alves
bb370caccc
Merge branch 'overlay-visible-in-2nd-cam' of github.com:sethalves/hifi into overlay-visible-in-2nd-cam
2018-03-15 09:56:07 -07:00
Seth Alves
72d2253297
Merge branch 'master' of github.com:highfidelity/hifi into overlay-visible-in-2nd-cam
2018-03-15 09:55:48 -07:00
Seth Alves
b22e0f6209
use TAG_BITS_1 for cam rather than TAG_BITS_ALL
2018-03-15 09:55:42 -07:00
Seth Alves
f1b81731c1
Merge branch 'master' of github.com:highfidelity/hifi into overlay-visible-in-2nd-cam
2018-03-15 09:52:37 -07:00
Bradley Austin Davis
b25beeb10b
Merge pull request #12640 from jherico/fix/web_process
...
Don't leave trash web processes when changing web entity urls
2018-03-14 19:40:13 -07:00
Ken Cooke
b1dd63cfd3
Merge pull request #12619 from kencooke/audio-src-kernel-128
...
Improved audio quality for streaming music
2018-03-14 18:30:23 -07:00
Zach Fox
2d57c444b6
Don't auto apply 'updatable' filter
2018-03-14 16:02:33 -07:00
Sam Gondelman
46bbfc2680
Merge pull request #12643 from gcalero/keyboard_crashing
...
Possible fix for keyboard crash
2018-03-14 15:53:17 -07:00
Zach Fox
cc4726b24b
Some bugfixes
2018-03-14 15:47:19 -07:00
Gabriel Calero
d0f1aa9020
Refactor fix for keyboard crash
2018-03-14 19:18:42 -03:00
Cristian Luis Duarte
379fa9783f
No touch responsibility for KeyboardMouseDevice when TouchscreenVirtualPadDevice is initialized
2018-03-14 19:09:21 -03:00
Seth Alves
ee515a44e7
Merge branch 'master' of github.com:highfidelity/hifi into rename-getpos3
2018-03-14 14:56:50 -07:00
Zach Fox
f3efdda6b0
Fix content set filter
2018-03-14 14:34:15 -07:00
Gabriel Calero
e744edc6a0
Possible fix for keyboard crash
2018-03-14 18:11:23 -03:00
Stephen Birarda
0c0ce1d6b8
Merge pull request #12508 from SimonWalton-HiFi/server-script
...
Stop server-script URLs when deleted from entity properties (case 11244)
2018-03-14 14:01:01 -07:00
Sam Gondelman
815260933a
Merge pull request #12642 from gcalero/android_change_default_mode
...
Change default mode to My View in Android
2018-03-14 13:47:16 -07:00
Gabriel Calero
04decfa89c
Merge remote-tracking branch 'upstream/master' into android_change_default_mode
2018-03-14 16:49:41 -03:00
Sam Gondelman
ba0c273614
Merge pull request #12641 from SamGondelman/android
...
Update gpu-gles based on TAA PR
2018-03-14 12:41:24 -07:00
Cristian Luis Duarte
80abe1865a
Remove unused variable thisPointConsumed
2018-03-14 16:22:24 -03:00
SamGondelman
e59af8892a
make same changes to gles backend from taa pr
2018-03-14 12:09:59 -07:00
Brad Davis
baa4dc3383
Don't leave trash web processes when changing web entity urls
2018-03-14 11:38:46 -07:00
Zach Fox
6647475f5c
Wrong sign
2018-03-14 11:19:55 -07:00
Zach Fox
74e24ec289
Final touches?
2018-03-14 10:58:18 -07:00
Gabriel Calero
884da98466
Change default mode to My View (android)
2018-03-14 14:50:44 -03:00
Seth Alves
2fd6bc4130
rename Mesh api getPos3 to getPos, deprecate but still support getPos3
2018-03-14 10:24:44 -07:00
Zach Fox
6d45d69ed8
Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1
2018-03-14 09:54:16 -07:00
Zach Fox
70b3d0fe5f
Merge branch 'filterBar' into commerce_upgrades_1
2018-03-14 09:53:02 -07:00
Zach Fox
98cdbbb3e6
Small update to dot before merging in filterBar
2018-03-14 09:45:42 -07:00
