diff --git a/2015/chapters/Clubroom.tex b/2015/chapters/Clubroom.tex index 989036eb5a710d60af1f97da88a44abdc8cee022..ffa539bf741f8c02d8a7f2472a8646b1a5e89392 100644 --- a/2015/chapters/Clubroom.tex +++ b/2015/chapters/Clubroom.tex @@ -1,6 +1,5 @@ \chapter{UCC::Clubroom} -\begin{mdframed} \null The clubroom is usually open from about 9am until 11pm (staying later than this requires \emph{a good reason} and giving notice to UWA security). It is also sometimes open on weekends, and most days during university holidays. There is a map to the clubroom in Chapter \ref{FindClubroom}. If you want to check the clubroom is open and who is there, check out \url{http://webcam.ucc.asn.au} @@ -14,6 +13,3 @@ We don't have cleaners, so look after the clubroom! There is always a door group \caption{\url{http://webcam.ucc.asn.au}} \label{webcam.jpg} \end{figure} - - -\end{mdframed} diff --git a/2015/chapters/Games.tex b/2015/chapters/Games.tex index 7965322d53b2711069771942e65f27bdf9eb7302..22dc6392735324ba94fc905842235b108707d96d 100644 --- a/2015/chapters/Games.tex +++ b/2015/chapters/Games.tex @@ -2,36 +2,36 @@ Do you like Steam? Of course you do! Join UCC's Steam Group: \url{http://steamcommunity.com/groups/UCC} -\noindent UCC runs its own TF2, WolfET and Minecraft servers. +\noindent UCC runs its own TF2, WolfET and Minecraft servers. They generally work but occasionally do not. There's also a range of other games that members enjoy playing in the clubroom. \section{Minecraft} Minecraft is a game where you mine blocks and craft things out of them. It is more exciting than it sounds - within 5 minutes you will be addicted. Our (modded) Minecraft server is at \shell{minecraft.ucc.asn.au}. The modpack changes every three to six months, so you will never get bored! -For more instructions, visit \url{http://minecraft.ucc.asn.au/ucc}. You can also find maps of the world there. \figref{minecraft_pigmap.png}. -\begin{figure}[H] - \centering - \includegraphics[width=0.5\textwidth]{figures/minecraft_pigmap.png} - \caption{Part of the UCC Minecraft world} - \label{minecraft_pigmap.png} -\end{figure} +For more instructions, visit \url{http://minecraft.ucc.asn.au/ucc}. \section{WolfET} -Wolfenstein: Enemy Territory, (or just ET) is an old game but is still incredibly popular at LANs. There is a scholarship \seeref{camp_scholarship} available for the camp which requires playing ET. The ET server is at \server{heathred.ucc.asn.au}. -\pagebreak -\section{TF2} -Team Fortress 2, also known as Hat Fortress 2. The TF2 server is located at \shell{heathred.ucc.asn.au}. +Wolfenstein: Enemy Territory, (or just ET) is an old game but is still incredibly popular at LANs. One of the scholarships available for the camp requires playing ET. + +The ET server is at \server{heathred.ucc.asn.au}. + +\section{Team Fortress 2} +Team Fortress 2, also known as Hat Simulator 2 is a game where the aim is to collect all the hats. + +The TF2 server is located at \shell{heathred.ucc.asn.au}. +\if01 \begin{figure}[H] \centering \includegraphics[width=0.5\textwidth]{figures/tf2_hat.png} \caption{The ultimate goal of TF2 is to aquire these} \label{tf2_hat.png} \end{figure} +\fi \section{DotA} -DotA is a game that involves a lot of clicking and people yelling about 'Q's and 'W's and 'alties'. Apparently it's fun. UCC doesn't run its own server but it is the most popular game in the clubroom. Unless that's LoL. I can't tell the difference. +DotA is a game that involves a lot of clicking and people yelling about 'Q's and 'W's and 'alties'. Apparently it's fun. UCC doesn't run its own server but it is the most popular game in the clubroom. Unless that's LoL. I can't tell the difference. If you want to have a game with people, it is best to ask around, because there are always people looking to play. \section{LoL} LoL is a game similar to DoTa but not the same because it is different. diff --git a/2015/chapters/Introduction.tex b/2015/chapters/Introduction.tex index 7cf4582db9315521aefc1befa2ffb188e0179605..8735b5481ca33355c31681578a6687b5afd35b3c 100644 --- a/2015/chapters/Introduction.tex +++ b/2015/chapters/Introduction.tex @@ -17,6 +17,8 @@ \noindent Welcome to UCC and our Survival Guide! +\textbf{TL;DR;} We have computers, play games, toy with technology and are self proclaimed cool people to be around. + We are a combination of students interested in computers and people in the workplace who have failed to escape the clubs grasp. Our club is a no knowledge needed place where you can come to meet friends, work on your own projects or play games and socialise. The events we run range in skill level to make sure everyone is catered for. @@ -39,4 +41,14 @@ UCC President 2014 %\end{welcome} +\begin{itemize} +\item IRC: \url{irc.ucc.asn.au/\#ucc} +\item UCC Website: \url{https://www.ucc.asn.au/} +\item UCC Facebook Group: \\ \noindent \url{https://www.facebook.com/groups/universitycomputerclub/} +\item UCC Steam Group: \url{http://steamcommunity.com/groups/UCC} +\item UCC Status Twitter Account: \url{https://twitter.com/ucc_status} +\item GitHub: \url{https://github.com/ucc} + +\end{itemize} + diff --git a/2015/figures/compiling.png b/2015/figures/compiling.png new file mode 100644 index 0000000000000000000000000000000000000000..1577dcf313cbfaf45511712177447afe74f16995 Binary files /dev/null and b/2015/figures/compiling.png differ diff --git a/2015/fresher_guide-gs.pdf b/2015/fresher_guide-gs.pdf new file mode 100644 index 0000000000000000000000000000000000000000..34451238e5b62bf45b352b94d6dc67a6713178ba Binary files /dev/null and b/2015/fresher_guide-gs.pdf differ diff --git a/2015/fresher_guide.pdf b/2015/fresher_guide.pdf index af28717623c1b94469f7add5a06fcf226f15e13e..6456ce6554becf94037ce2b848057c1376999bb2 100644 Binary files a/2015/fresher_guide.pdf and b/2015/fresher_guide.pdf differ diff --git a/2015/fresher_guide.tex b/2015/fresher_guide.tex index 0a173ad851f75d5e5e2ffb8135b9bbc24f81ea0f..454222c1bf3856bbf207335408b3253839d5e055 100644 --- a/2015/fresher_guide.tex +++ b/2015/fresher_guide.tex @@ -21,7 +21,7 @@ %\usepackage{natbib} \usepackage{makeidx} \usepackage{graphicx} -\usepackage{caption} +\usepackage[labelformat=empty]{caption} %\usepackage{subfigure} \usepackage{rotating} %\usepackage{lscape} @@ -242,7 +242,18 @@ \include{chapters/Glossary} % ETC -\afterpage{\blankpage} +\blankpage + +\newpage + +\begin{figure}[H] + \centering + \includegraphics[width=0.75\textwidth]{figures/compiling.png} + \caption{\url{http://xkcd.com/303}} + \label{compiling} +\end{figure} + +\cfoot{this document was prepared by your friendly neighborhood overlord} %--------------------------------------------------------- %\renewcommand{\bibname}{References}