Seth Alves
4033af9b11
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-21 11:11:43 -07:00
Ken Cooke
f5f4e2a780
Merge pull request #12635 from ctrlaltdavid/21776
...
Fix Window hasFocus(), setFocus(), and raiseMainWindow()
2018-03-21 09:27:51 -07:00
Sam Gateau
4341347148
Merge pull request #12639 from SamGondelman/aa
...
Use correct platform-specific gpu library
2018-03-20 14:47:26 -07:00
Sam Gateau
a7533e5287
Merge pull request #12675 from SamGondelman/hotfix
...
Model behaves correctly if missing material
2018-03-20 14:27:21 -07:00
Sam Gateau
5cc0e24921
Merge pull request #12666 from jherico/fix/web_overlay_crash
...
Fix invalid QML surface cache interaction
2018-03-20 14:26:39 -07:00
Sam Gateau
e59eed64fb
Merge pull request #12680 from SamGondelman/relative
...
Support relative paths for material images
2018-03-20 14:24:50 -07:00
Stephen Birarda
0074c0470d
Merge pull request #12524 from birarda/feat/runtime-beside-exe
...
switch back to app-local VC runtimes and UCRT
2018-03-20 14:07:27 -07:00
John Conklin II
afcfbfe721
Merge pull request #12644 from Atlante45/feat/ga-installer
...
Add Google Analytics to installer
2018-03-20 12:07:29 -07:00
John Conklin II
de5ff20968
Merge pull request #12664 from gcalero/android_websurface_check_nocrash
...
Android - Prevent crash when setting the url property to _webSurface.
2018-03-20 11:40:08 -07:00
Seth Alves
585a523823
unmangle merge
2018-03-20 11:17:56 -07:00
John Conklin II
40d6e51da8
Merge pull request #12597 from ElderOrb/FB12956
...
Fix for broken 'toggle audio meter' button
2018-03-20 11:03:32 -07:00
Seth Alves
bd10cd6fa9
'disconnect' from serverless domain when transitioning from a serverless-domain to a DNS name (rather than a place name)
2018-03-20 10:53:17 -07:00
Stephen Birarda
cd887b5faf
Merge pull request #12654 from huffman/feat/content-zip-upload
...
Add support for .content.zip content uploads
2018-03-20 10:07:53 -07:00
Seth Alves
f61504b814
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-19 14:59:18 -07:00
Seth Alves
bc527d5ae8
try again on expandToLocalDataAbsolutePath
2018-03-19 14:59:10 -07:00
Atlante45
0117179fe4
Pull GA ID from env variables
2018-03-19 14:49:19 -07:00
John Conklin II
47437c9564
Merge pull request #12651 from ctrlaltdavid/21799
...
Fix "text" overlay not clipping to right and bottom margins
2018-03-19 14:12:20 -07:00
John Conklin II
91db0ab00f
Merge pull request #12650 from ctrlaltdavid/21798
...
Messages API JSDoc
2018-03-19 13:56:57 -07:00
Seth Alves
a623ba7499
expandToLocalDataAbsolutePath now expands to a file:// url rather than a qrc:// url
2018-03-19 13:48:31 -07:00
Cristian Luis Duarte
17fddd9e0e
RenderableWebEntityItem root item check moved to hasWebSurface and buildWebSurface
2018-03-19 15:33:14 -03:00
SamGondelman
8ddf360c79
support relative paths for material images
2018-03-19 09:59:11 -07:00
Seth Alves
af42b5e93f
trying to fix expandToLocalDataAbsolutePath
2018-03-19 09:42:03 -07:00
Seth Alves
a6a2d24dda
Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains
2018-03-19 09:03:26 -07:00
Seth Alves
b33f47e540
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-18 17:33:10 -07:00
Seth Alves
a4599fe7ce
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-16 20:07:35 -07:00
Seth Alves
a144b738e5
fix ACs
2018-03-16 22:39:43 -04: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
444534f4ff
model behaves correctly if missing material
...
(cherry picked from commit 1e89debc4e
2018-03-16 15:51:37 -07:00
Brad Davis
2f59283053
Fix initialization of QML overlay surfaces
2018-03-16 14:48:08 -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
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
Brad Davis
1dfde86680
Fix typo
2018-03-16 11:11:08 -07: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
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
Stephen Birarda
283eccd043
remove unneeded ANDROID block, revert removed line in NSIS
2018-03-15 16:21: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
