With so many panels, trailers and chats going on, it's difficult to know where to begin. Well, look no further, because Digital Spy has picked out the top ten TV treats from the event that either made us giggle or made us gasp in anticipation.
But what made the cut? Read on to find out!
10. Beavis & Butt-head are back!
Call us immature. Call us nostalgic. Call us whatever you like. But if you're not even the tiniest, weeniest bit excited about the return of Beavis & Butt-head, you've really got to ask yourselves some questions. Creator Mike Judge unveiled a five-minute teaser video at Comic-Con, and after watching it, we wondered how on Earth we survived for so long without the cartoon duo. This is a world of Jersey Shore - this is a world that needs Beavis and Butt-head.
9. Mark Hamill signs up for a Chuck guest role
Mark Hamill. Chuck. Now put those two together, and yes, you get greatness. To hear that the Star Wars legend will be starring in the final season of Chuck made us very, very happy indeed. And as if that wasn't enough, he'll be playing a villain - hurrah! While we're speaking of Chuck, by the way, we have to mention Zachary Levi's tearful thank you speech to the fans (which you can watch in the clip below). What a touching moment.
8. Sarah Michelle Gellar's coming to our screens again, and we've got the video to prove it
It's been a while, but finally Sarah Michelle Gellar's coming back to television, baby! There has been so much hype around her new show Ringer, and it's probably a safe bet that the trailer released at Comic-Con will get fans' hearts beating even faster. Of course, it helped that SMG was truly charming during the Ringer panel - can you believe that it was only her second Comic-Con appearance? And we know she was joking when she said that Michelle Trachtenberg was hassling the producers for a role... but can that please happen?
7. Zombies are all the rage - the season two Walking Dead trailer is released
After that amazing unofficial trailer, and then the tantalising tease, zombie fans finally got something to sink their teeth into! Yes, the official trailer for the second season of The Walking Dead was unveiled at Comic-Con, and boy, is it something. From these four minutes and 40 seconds of pure atmosphere, it looks like we can expect tension, drama, screams and, of course, lots of those pesky zombies. We even got a premiere date to mark on our calendars - start the countdown to October 16 now.
6. Justin Bieber wants a role on The Vampire Diaries - but won't get one
This isn't the biggest bit of news to come out of Comic-Con this year, but it made us laugh. According to the wonderful Nina Dobrev, Justin Bieber is angling for a role on her show The Vampire Diaries. No word on what character he'd play, but luckily it doesn't seem like he's going to get the chance. After Nina's revelation was met with a chorus of boos from the crowd, exec producer Kevin Williamson reassured us that "casting a star doesn't really interest" him. You could almost hear the sigh of relief from the assembled Mystic Falls devotees. Oh, and we got a new season three trailer, too. Alright, so it was basically just a rehash of season two footage, but it did heighten our anticipation for September 15...
5. Everyone's favourite serial killer is back - Dexter season six gets a trailer
So the fifth season of Dexter got a bit of a mixed reception, but after seeing the trailer for the new episodes, all that was forgotten. Set to a thumping Marilyn Manson track, the video made us insanely excited about what'll be coming up in season six. Dexter's back to his old self, Edward James Olmos and Colin Hanks are in Miami, and it's all about faith. Now this is how you put together an intriguing and exciting trailer, people. "He'll make you a believer"...
4. Rachel, Kurt and Finn might not be leaving Glee after all...
This was one of the weirdest moments of Comic-Con. After all that palaver about Lea Michele, Cory Monteith and Chris Colfer leaving Glee after season three, exec producer Brad Falchuk appeared to claim that his colleague Ryan Murphy had been misquoted, and the trio are staying after all (although they are graduating). Is anyone else's head spinning? We don't know if this was a genuine misunderstanding or a sharp U-turn, but in the end, we're pretty glad we don't have to say goodbye to Rachel, Finn and Kurt too soon. Bad news for Sam fans, though - he turned down the chance to stay on the show.
3. Merlin gets to cast its magic for a fifth season
We're still gasping in anticipation for the fourth season of Merlin, but now we have even more reason to be excited - the show has already been renewed for a fifth season! This is the sort of announcement that Comic-Con is made for, and we're pleased that the show will get the "creative space" exec producer Johnny Capps wants. As if that wasn't exciting enough, we got all sorts of season four gossip as well - Lancelot will meet the dragon, Morgana's a "ticking time bomb" and there'll be an Arthur-Uther battle for power. Eee!
2. Joshua Jackson makes a surprise visit to the Fringe panel
This is just sweet. After that insane Fringe finale, fans weren't expecting Joshua Jackson to show up to Comic-Con. We love a surprise appearance here at Tube Talk, and this one was superb - coming after a funny spoof audition tape where various actors audition for Joshua's role. It was even better when Joshua got a standing ovation from the fans. Fringe is a show that has survived thanks to a small but loyal band of followers, and to reward them like this was lovely.
1. Doctor Who mayhem
There was so much Doctor Who scoop at Comic-Con that it's honestly difficult to know where to begin. For one thing, we got a brand new trailer to obsess over for hours. Then there was all the chat from the Doctor Who panel. And, very excitingly, at another panel Matt Smith teased that we could be seeing a Doctor reunion! OK, everyone, take a deep breath. As if that wasn't enough, Matt also dropped some solid gold gossip - the Doctor's getting a new hat and coat next season...
And an extra one...
OK, so we just wanted an excuse to stick this video in again, but isn't it great? Comic-Con attracts all types of fans - some more dedicated than others - but there's nothing like seeing people dressed up. The effort some of them went to is truly astounding, so let's celebrate them in all their glory.
Of course, this isn't all that happened at Comic-Con. In fact, there was loads of other stuff going on as well - everything from Lost star Jorge Garcia chatting about his new show Alcatraz to new Spartacus star Liam McIntyre being unveiled to Jensen Ackles dropping hints about new Supernatural.
Digital Spy has been bringing you photos, interviews and blogs all weekend, and you can check out all our coverage here!
What was your favourite TV moment from Comic-Con? Leave your comments below!