Commit graph

65820 commits

Author SHA1 Message Date
John Conklin II
5bd3d0fab9
Merge pull request #12647 from birarda/feat/client-only-installer
add a CLIENT_ONLY build option and handle for installer
2018-03-21 11:20:36 -07:00
John Conklin II
3937f43fa5
Merge pull request #12648 from SimonWalton-HiFi/serversExist-crash
EntityScriptServer should wait for script engine to complete for deleting itself
2018-03-21 11:19:50 -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
cfdf8c2588 handle launch client option for client only 2018-03-20 14:22:37 -07:00
Stephen Birarda
45d16731c3 fix abort of setup options page for express client 2018-03-20 14:22:37 -07:00
Stephen Birarda
9a664f25dc setup custom or express label correctly in installer 2018-03-20 14:22:37 -07:00
Stephen Birarda
38606f83c8 add SERVER_ONLY handling for installer generation 2018-03-20 14:22:37 -07:00
Stephen Birarda
932c55ca08 handle client section in component-less install 2018-03-20 14:22:37 -07:00
Stephen Birarda
6ee6f88087 only add components to cmake for multi-component installer 2018-03-20 14:22:12 -07:00
Stephen Birarda
f93935f5f6 change PR build compression to bzip2 2018-03-20 14:21:52 -07:00
Stephen Birarda
c743bfcf27 templatize conditional for selection of server component 2018-03-20 14:21:52 -07:00
Stephen Birarda
1405c8fcb3 add a client only option to cmake 2018-03-20 14:20:58 -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
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
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
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
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
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
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
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
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
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
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