Commit graph

1517 commits

Author SHA1 Message Date
John Conklin II
6def70791e
Merge pull request #12864 from sethalves/backtrace-annotations
switch to backtrace's newer crashpad blob
2018-04-13 15:34:05 -07:00
Clement
157ca8cd68 Update docs with correct qt version 2018-04-12 16:21:26 -07:00
Stephen Birarda
16f6ac5295 use serverless content with baked skybox and help textures 2018-04-11 13:53:13 -07:00
John Conklin II
005b55f997
Merge pull request #12853 from birarda/new-serverless-tutorial
RC66: fix unreadable baked textures in serverless tutorial
2018-04-11 13:44:21 -07:00
Seth Alves
625905007f use new filename for new blob 2018-04-11 11:49:53 -07:00
Seth Alves
366498c6d3 switch to backtrace's newer crashpad blob 2018-04-11 11:44:49 -07:00
Stephen Birarda
7ec65e8c0c fix unreadable baked textures in serverless tutorial 2018-04-10 17:02:37 -07:00
Stephen Birarda
0d237f84b0 remove the installer information file during uninstall 2018-04-10 14:56:47 -07:00
John Conklin II
f6721d4ad0
Merge pull request #12802 from birarda/client-only-installer-name
66 fix - installer changes for client only name and clean install
2018-04-06 11:53:22 -07:00
Stephen Birarda
a2250a2a6d write an install info ini file to the installation dir 2018-04-05 18:52:07 -07:00
Stephen Birarda
2e3db99f7e update to serverless tutorial with RC66 fixes 2018-04-05 17:17:00 -07:00
Stephen Birarda
16335a3b4b only remove selected components on clean install, leave wallet 2018-04-05 17:09:38 -07:00
Stephen Birarda
55a3dc3a49 make client/server only installers have special naming 2018-04-05 13:55:37 -07:00
Seth Alves
60ed033667 new content md5 2018-03-26 14:33:08 -07:00
Stephen Birarda
b52a877d8d optionally grab serverless tutorial, on for installers 2018-03-26 14:32:11 -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
Atlante45
0117179fe4 Pull GA ID from env variables 2018-03-19 14:49:19 -07:00
Stephen Birarda
283eccd043 remove unneeded ANDROID block, revert removed line in NSIS 2018-03-15 16:21:49 -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
Stephen Birarda
10dd16ae8d remove VS redist handling from NSIS template 2018-03-14 17:59:04 -07:00
Atlante45
2fe9f6df6f Add google analytics to installer 2018-03-14 14:17:38 -07:00
Seth Alves
3ee41c71e4
Merge pull request #12529 from Atlante45/fix/nvtt-mac
Fix NVTT for mac
2018-03-13 11:28:42 -07:00
Atlante45
2067c95931 Fix NVTT for mac 2018-03-01 18:05:05 -08:00
Stephen Birarda
0d7d382540 pass additional exclusions to windeployqt 2018-02-28 16:42:25 -08:00
Stephen Birarda
e1421f2e3a switch back to app-local VC runtimes and UCRT 2018-02-28 10:45:08 -08:00
Brad Davis
6254e2b569 PR feedback 2018-02-27 09:11:40 -08:00
Brad Davis
aeb29db37d Merge remote-tracking branch 'upstream/stable' into android_stable 2018-02-22 17:35:00 -08:00
Bradley Austin Davis
fd007e845d Squashed scribe changes 2018-02-07 10:29:29 -08:00
Bradley Austin Davis
6092f1503e Fixing android build 2018-02-06 17:22:06 -08:00
Brad Davis
d087530423 Add nvtt to android build 2018-02-02 13:42:26 -08:00
Olivier Prat
ac92b3c130 Merge branch 'master' of http://github.com/highfidelity/hifi into scribe 2018-02-02 14:01:59 +01:00
Bradley Austin Davis
b97c938544
Merge pull request #12216 from thoys/feat/js-script-console-auto-complete
JS scripting console auto-complete
2018-01-31 10:39:51 -08:00
John Conklin II
2ae9395283
Merge pull request #12299 from highfidelity/stable
Merge stable back into master
2018-01-30 20:03:06 -08:00
Atlante45
97729e8f41 Cleanup bad install 2018-01-30 17:10:06 -08:00
Atlante45
d155d19198 Fix cmake install cmd 2018-01-30 17:08:10 -08:00
Atlante45
bc819c698e Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back 2018-01-30 16:09:30 -08:00
Atlante45
019a2d346c Fix spaces 2018-01-30 12:04:01 -08:00
Atlante45
edfffc575a Handle multiple targets for add_crashpad 2018-01-30 11:48:01 -08:00