Search for high-mass diphoton resonances in proton-proton collisions at 13 TeV and combination with 8 TeV search