Marvel v DC: Superhero rivals battle at Comic-Con

Any comic book or superhero fan knows there are two major universes: DC and Marvel.

For DC, think Superman, Batman, Wonderwoman.

Marvel's universe is home to Ironman, Thor, Hulk and the rest of the Avengers.

Both made major announcements at Comic-Con in San Diego.

We've broken down the biggies. Get comfy. They had a lot to say.

Let's start with DC. Ladies first.

Wonder Woman first appeared in All Star Comics in 1941.

Now the warrior Princess of the Amazons/demi-god is 75 and starring in her own movie.

It's coming out next summer, and shows her trying to stop the First World War.

The trailer shows her getting to grips with an actual human man, played by Chris Pine.

You can watch it here.

Third party content may contain adverts.

Israeli actress Gal Gadot was visibly trembling as she spoke to fans.

She said her character has 'the heart of a human and the strength of a goddess'.

Suicide Squad is out soon, and DC took this chance to show the final trailer.

This one focuses on Margot Robbie's bubblegum-popping baddie Harley Quinn.

She did many of her own stunts and said: "What everyone did in this film, I did in heels."

Jared Leto plays her boyfriend, the Joker.

They bantered their way through the panel, telling how he sent her a rat as a "gift." Nice.

This is a biggie for DC.

A team of superheroes uniting against a common enemy. Sound familiar?

It's basically DC's version of the Avengers. And it needs to do well.

Its latest blockbuster attempt Batman v Superman came out in March and had a strong start, but then broke records for falling box office numbers.

The dark, serious tone came in for major criticism.

The same director, Zack Snyder, is in charge of Justice League.

He came on stage and showed fans a surprise trailer full of jokes and humour.

Check it out.

Third party content may contain adverts.

It's worth watching just to see how much Aquaman looks like he's in an aftershave advert.

The film comes out in November 2017.

Last year Marvel didn't bother with Comic-Con.

This time around, Studio President Kevin Feige explained "We only want to come when we have a lot to show you."

"We actually have a lot today."

He wasn't kidding.

This is being described as a 'left-turn in the Marvel Universe'.

Doctor Strange is more about magic than technology.

Benedict Cumberbatch emerged on a misty stage to talk about his new character.

Check out the trailer.

Third party content may contain adverts.

He says: "He doesn't know anything -- he's just at the beginning of figuring out what reality is."

Guardians of the Galaxy fans found out who is going to play Star Lord's father.

Actor Kurt Russell turned up on stage to confirm he will be James Gunn in Guardians of the Galaxy Volume 2.

A sneak peek at a trailer showed that Sylvester Stallone will be in the film too.

But the biggest cheers were for a CG character.

A particularly adorable Baby Groot stole the show.

Spider-Man: Homecoming is only ten days into shooting, so fans weren't expecting much.

But they got an early peek at what Hollywood likes to call 'a sizzle reel'.

Director Jon Watts says this is basically a high school movie.

The teen comedy will show 15-year-old Peter Parker trying to deal with girls, puberty and schoolwork at the same time as hiding his superhero identity.

Thor: Ragnarok director Taika Waititi is best known for his vampire spoof What We Do in the Shadows.

It showed a group of vampire roommates living in modern day New Zealand and being hilariously mundane.

So instead of showing off an action-packed trailer, he sent a mockumentary where Thor had moved in with a random Kiwi called Darryl.

He goes for coffee with the Hulk, emails Captain America and Iron Man and makes a tiny bed for his hammer Mjolnir. As you do.

It's got very little to do with the actual film but got huge laughs.

Marvel is making its first movie focusing on a female character.

Captain Marvel is a about a pilot who gets special powers after a run-in with an alien.

It's not coming out until 2019 so details are sparse.

But Oscar-winning Brie Larson got a standing ovation when it was announced that she will play the title character.

Audiences got to meet Black Panther in Captain America: Civil War, but now he's got his own movie.

Chadwick Boseman is in the the title role as the King of Wakanda.

It doesn't start shooting til January, but the cast were brought out on stage.

Lupita Nyong'o and Michael B. Jordan are on board.

Now it's been announced that The Walking Dead's Danai Gurira has also joined the project.

Find us on Instagram at BBCNewsbeat and follow us on Snapchat, search for bbc_newsbeat