To me it was easily Nintendo. The only new things that Sony announced that got my attention was Shadow of the Colossus remake and the Uncharted spin-off. Nintendo on the other hand fired the big guns announcing Metroid 4 being in the works, Pokemon for Switch in the works, a Metroid remake on 3DS, and a new Kirby game.